diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs
index a98fd146322..0b51feb177c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs
@@ -114,31 +114,29 @@ public InferenceConfigContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private InferenceConfigContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the InferenceConfigContainerDescriptor. Only a single InferenceConfigContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private InferenceConfigContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the InferenceConfigContainerDescriptor. Only a single InferenceConfigContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Classification(Ml.ClassificationInferenceOptions variant) => Set(variant, "classification");
-		public void Classification(Action<Ml.ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
-		public void Regression(Ml.RegressionInferenceOptions variant) => Set(variant, "regression");
-		public void Regression(Action<Ml.RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+		public InferenceConfigContainerDescriptor<TDocument> Classification(Ml.ClassificationInferenceOptions variant) => Set(variant, "classification");
+		public InferenceConfigContainerDescriptor<TDocument> Classification(Action<Ml.ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
+		public InferenceConfigContainerDescriptor<TDocument> Regression(Ml.RegressionInferenceOptions variant) => Set(variant, "regression");
+		public InferenceConfigContainerDescriptor<TDocument> Regression(Action<Ml.RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -177,32 +175,30 @@ public InferenceConfigContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private InferenceConfigContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the InferenceConfigContainerDescriptor. Only a single InferenceConfigContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private InferenceConfigContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the InferenceConfigContainerDescriptor. Only a single InferenceConfigContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Classification(Ml.ClassificationInferenceOptions variant) => Set(variant, "classification");
-		public void Classification(Action<Ml.ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
-		public void Regression(Ml.RegressionInferenceOptions variant) => Set(variant, "regression");
-		public void Regression(Action<Ml.RegressionInferenceOptionsDescriptor> configure) => Set(configure, "regression");
-		public void Regression<TDocument>(Action<Ml.RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+		public InferenceConfigContainerDescriptor Classification(Ml.ClassificationInferenceOptions variant) => Set(variant, "classification");
+		public InferenceConfigContainerDescriptor Classification(Action<Ml.ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
+		public InferenceConfigContainerDescriptor Regression(Ml.RegressionInferenceOptions variant) => Set(variant, "regression");
+		public InferenceConfigContainerDescriptor Regression(Action<Ml.RegressionInferenceOptionsDescriptor> configure) => Set(configure, "regression");
+		public InferenceConfigContainerDescriptor Regression<TDocument>(Action<Ml.RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldSuggester.g.cs
index 5adb594292a..16fe89e87b5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldSuggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldSuggester.g.cs
@@ -191,25 +191,23 @@ public FieldSuggesterDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private FieldSuggesterDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the FieldSuggesterDescriptor. Only a single FieldSuggester variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private FieldSuggesterDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the FieldSuggesterDescriptor. Only a single FieldSuggester variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		private string? PrefixValue { get; set; }
@@ -236,12 +234,12 @@ public FieldSuggesterDescriptor<TDocument> Text(string? text)
 			return Self;
 		}
 
-		public void Completion(CompletionSuggester variant) => Set(variant, "completion");
-		public void Completion(Action<CompletionSuggesterDescriptor<TDocument>> configure) => Set(configure, "completion");
-		public void Phrase(PhraseSuggester variant) => Set(variant, "phrase");
-		public void Phrase(Action<PhraseSuggesterDescriptor<TDocument>> configure) => Set(configure, "phrase");
-		public void Term(TermSuggester variant) => Set(variant, "term");
-		public void Term(Action<TermSuggesterDescriptor<TDocument>> configure) => Set(configure, "term");
+		public FieldSuggesterDescriptor<TDocument> Completion(CompletionSuggester variant) => Set(variant, "completion");
+		public FieldSuggesterDescriptor<TDocument> Completion(Action<CompletionSuggesterDescriptor<TDocument>> configure) => Set(configure, "completion");
+		public FieldSuggesterDescriptor<TDocument> Phrase(PhraseSuggester variant) => Set(variant, "phrase");
+		public FieldSuggesterDescriptor<TDocument> Phrase(Action<PhraseSuggesterDescriptor<TDocument>> configure) => Set(configure, "phrase");
+		public FieldSuggesterDescriptor<TDocument> Term(TermSuggester variant) => Set(variant, "term");
+		public FieldSuggesterDescriptor<TDocument> Term(Action<TermSuggesterDescriptor<TDocument>> configure) => Set(configure, "term");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -298,25 +296,23 @@ public FieldSuggesterDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private FieldSuggesterDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the FieldSuggesterDescriptor. Only a single FieldSuggester variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private FieldSuggesterDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the FieldSuggesterDescriptor. Only a single FieldSuggester variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		private string? PrefixValue { get; set; }
@@ -343,15 +339,15 @@ public FieldSuggesterDescriptor Text(string? text)
 			return Self;
 		}
 
-		public void Completion(CompletionSuggester variant) => Set(variant, "completion");
-		public void Completion(Action<CompletionSuggesterDescriptor> configure) => Set(configure, "completion");
-		public void Completion<TDocument>(Action<CompletionSuggesterDescriptor<TDocument>> configure) => Set(configure, "completion");
-		public void Phrase(PhraseSuggester variant) => Set(variant, "phrase");
-		public void Phrase(Action<PhraseSuggesterDescriptor> configure) => Set(configure, "phrase");
-		public void Phrase<TDocument>(Action<PhraseSuggesterDescriptor<TDocument>> configure) => Set(configure, "phrase");
-		public void Term(TermSuggester variant) => Set(variant, "term");
-		public void Term(Action<TermSuggesterDescriptor> configure) => Set(configure, "term");
-		public void Term<TDocument>(Action<TermSuggesterDescriptor<TDocument>> configure) => Set(configure, "term");
+		public FieldSuggesterDescriptor Completion(CompletionSuggester variant) => Set(variant, "completion");
+		public FieldSuggesterDescriptor Completion(Action<CompletionSuggesterDescriptor> configure) => Set(configure, "completion");
+		public FieldSuggesterDescriptor Completion<TDocument>(Action<CompletionSuggesterDescriptor<TDocument>> configure) => Set(configure, "completion");
+		public FieldSuggesterDescriptor Phrase(PhraseSuggester variant) => Set(variant, "phrase");
+		public FieldSuggesterDescriptor Phrase(Action<PhraseSuggesterDescriptor> configure) => Set(configure, "phrase");
+		public FieldSuggesterDescriptor Phrase<TDocument>(Action<PhraseSuggesterDescriptor<TDocument>> configure) => Set(configure, "phrase");
+		public FieldSuggesterDescriptor Term(TermSuggester variant) => Set(variant, "term");
+		public FieldSuggesterDescriptor Term(Action<TermSuggesterDescriptor> configure) => Set(configure, "term");
+		public FieldSuggesterDescriptor Term<TDocument>(Action<TermSuggesterDescriptor<TDocument>> configure) => Set(configure, "term");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SmoothingModelContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SmoothingModelContainer.g.cs
index 13849a80db3..50119265104 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SmoothingModelContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SmoothingModelContainer.g.cs
@@ -125,33 +125,31 @@ public SmoothingModelContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private SmoothingModelContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the SmoothingModelContainerDescriptor. Only a single SmoothingModelContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private SmoothingModelContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the SmoothingModelContainerDescriptor. Only a single SmoothingModelContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Laplace(LaplaceSmoothingModel variant) => Set(variant, "laplace");
-		public void Laplace(Action<LaplaceSmoothingModelDescriptor> configure) => Set(configure, "laplace");
-		public void LinearInterpolation(LinearInterpolationSmoothingModel variant) => Set(variant, "linear_interpolation");
-		public void LinearInterpolation(Action<LinearInterpolationSmoothingModelDescriptor> configure) => Set(configure, "linear_interpolation");
-		public void StupidBackoff(StupidBackoffSmoothingModel variant) => Set(variant, "stupid_backoff");
-		public void StupidBackoff(Action<StupidBackoffSmoothingModelDescriptor> configure) => Set(configure, "stupid_backoff");
+		public SmoothingModelContainerDescriptor<TDocument> Laplace(LaplaceSmoothingModel variant) => Set(variant, "laplace");
+		public SmoothingModelContainerDescriptor<TDocument> Laplace(Action<LaplaceSmoothingModelDescriptor> configure) => Set(configure, "laplace");
+		public SmoothingModelContainerDescriptor<TDocument> LinearInterpolation(LinearInterpolationSmoothingModel variant) => Set(variant, "linear_interpolation");
+		public SmoothingModelContainerDescriptor<TDocument> LinearInterpolation(Action<LinearInterpolationSmoothingModelDescriptor> configure) => Set(configure, "linear_interpolation");
+		public SmoothingModelContainerDescriptor<TDocument> StupidBackoff(StupidBackoffSmoothingModel variant) => Set(variant, "stupid_backoff");
+		public SmoothingModelContainerDescriptor<TDocument> StupidBackoff(Action<StupidBackoffSmoothingModelDescriptor> configure) => Set(configure, "stupid_backoff");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -190,33 +188,31 @@ public SmoothingModelContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private SmoothingModelContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the SmoothingModelContainerDescriptor. Only a single SmoothingModelContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private SmoothingModelContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the SmoothingModelContainerDescriptor. Only a single SmoothingModelContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Laplace(LaplaceSmoothingModel variant) => Set(variant, "laplace");
-		public void Laplace(Action<LaplaceSmoothingModelDescriptor> configure) => Set(configure, "laplace");
-		public void LinearInterpolation(LinearInterpolationSmoothingModel variant) => Set(variant, "linear_interpolation");
-		public void LinearInterpolation(Action<LinearInterpolationSmoothingModelDescriptor> configure) => Set(configure, "linear_interpolation");
-		public void StupidBackoff(StupidBackoffSmoothingModel variant) => Set(variant, "stupid_backoff");
-		public void StupidBackoff(Action<StupidBackoffSmoothingModelDescriptor> configure) => Set(configure, "stupid_backoff");
+		public SmoothingModelContainerDescriptor Laplace(LaplaceSmoothingModel variant) => Set(variant, "laplace");
+		public SmoothingModelContainerDescriptor Laplace(Action<LaplaceSmoothingModelDescriptor> configure) => Set(configure, "laplace");
+		public SmoothingModelContainerDescriptor LinearInterpolation(LinearInterpolationSmoothingModel variant) => Set(variant, "linear_interpolation");
+		public SmoothingModelContainerDescriptor LinearInterpolation(Action<LinearInterpolationSmoothingModelDescriptor> configure) => Set(configure, "linear_interpolation");
+		public SmoothingModelContainerDescriptor StupidBackoff(StupidBackoffSmoothingModel variant) => Set(variant, "stupid_backoff");
+		public SmoothingModelContainerDescriptor StupidBackoff(Action<StupidBackoffSmoothingModelDescriptor> configure) => Set(configure, "stupid_backoff");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs
index 17363bb7641..ceed7fb3bd7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs
@@ -191,45 +191,43 @@ public InferenceConfigCreateContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private InferenceConfigCreateContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the InferenceConfigCreateContainerDescriptor. Only a single InferenceConfigCreateContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private InferenceConfigCreateContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the InferenceConfigCreateContainerDescriptor. Only a single InferenceConfigCreateContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
-		public void Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
-		public void FillMask(FillMaskInferenceOptions variant) => Set(variant, "fill_mask");
-		public void FillMask(Action<FillMaskInferenceOptionsDescriptor> configure) => Set(configure, "fill_mask");
-		public void Ner(NerInferenceOptions variant) => Set(variant, "ner");
-		public void Ner(Action<NerInferenceOptionsDescriptor> configure) => Set(configure, "ner");
-		public void PassThrough(PassThroughInferenceOptions variant) => Set(variant, "pass_through");
-		public void PassThrough(Action<PassThroughInferenceOptionsDescriptor> configure) => Set(configure, "pass_through");
-		public void QuestionAnswering(QuestionAnsweringInferenceOptions variant) => Set(variant, "question_answering");
-		public void QuestionAnswering(Action<QuestionAnsweringInferenceOptionsDescriptor> configure) => Set(configure, "question_answering");
-		public void Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
-		public void Regression(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
-		public void TextClassification(TextClassificationInferenceOptions variant) => Set(variant, "text_classification");
-		public void TextClassification(Action<TextClassificationInferenceOptionsDescriptor> configure) => Set(configure, "text_classification");
-		public void TextEmbedding(TextEmbeddingInferenceOptions variant) => Set(variant, "text_embedding");
-		public void TextEmbedding(Action<TextEmbeddingInferenceOptionsDescriptor> configure) => Set(configure, "text_embedding");
-		public void ZeroShotClassification(ZeroShotClassificationInferenceOptions variant) => Set(variant, "zero_shot_classification");
-		public void ZeroShotClassification(Action<ZeroShotClassificationInferenceOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+		public InferenceConfigCreateContainerDescriptor<TDocument> Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
+		public InferenceConfigCreateContainerDescriptor<TDocument> Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
+		public InferenceConfigCreateContainerDescriptor<TDocument> FillMask(FillMaskInferenceOptions variant) => Set(variant, "fill_mask");
+		public InferenceConfigCreateContainerDescriptor<TDocument> FillMask(Action<FillMaskInferenceOptionsDescriptor> configure) => Set(configure, "fill_mask");
+		public InferenceConfigCreateContainerDescriptor<TDocument> Ner(NerInferenceOptions variant) => Set(variant, "ner");
+		public InferenceConfigCreateContainerDescriptor<TDocument> Ner(Action<NerInferenceOptionsDescriptor> configure) => Set(configure, "ner");
+		public InferenceConfigCreateContainerDescriptor<TDocument> PassThrough(PassThroughInferenceOptions variant) => Set(variant, "pass_through");
+		public InferenceConfigCreateContainerDescriptor<TDocument> PassThrough(Action<PassThroughInferenceOptionsDescriptor> configure) => Set(configure, "pass_through");
+		public InferenceConfigCreateContainerDescriptor<TDocument> QuestionAnswering(QuestionAnsweringInferenceOptions variant) => Set(variant, "question_answering");
+		public InferenceConfigCreateContainerDescriptor<TDocument> QuestionAnswering(Action<QuestionAnsweringInferenceOptionsDescriptor> configure) => Set(configure, "question_answering");
+		public InferenceConfigCreateContainerDescriptor<TDocument> Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
+		public InferenceConfigCreateContainerDescriptor<TDocument> Regression(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+		public InferenceConfigCreateContainerDescriptor<TDocument> TextClassification(TextClassificationInferenceOptions variant) => Set(variant, "text_classification");
+		public InferenceConfigCreateContainerDescriptor<TDocument> TextClassification(Action<TextClassificationInferenceOptionsDescriptor> configure) => Set(configure, "text_classification");
+		public InferenceConfigCreateContainerDescriptor<TDocument> TextEmbedding(TextEmbeddingInferenceOptions variant) => Set(variant, "text_embedding");
+		public InferenceConfigCreateContainerDescriptor<TDocument> TextEmbedding(Action<TextEmbeddingInferenceOptionsDescriptor> configure) => Set(configure, "text_embedding");
+		public InferenceConfigCreateContainerDescriptor<TDocument> ZeroShotClassification(ZeroShotClassificationInferenceOptions variant) => Set(variant, "zero_shot_classification");
+		public InferenceConfigCreateContainerDescriptor<TDocument> ZeroShotClassification(Action<ZeroShotClassificationInferenceOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -268,46 +266,44 @@ public InferenceConfigCreateContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private InferenceConfigCreateContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the InferenceConfigCreateContainerDescriptor. Only a single InferenceConfigCreateContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private InferenceConfigCreateContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the InferenceConfigCreateContainerDescriptor. Only a single InferenceConfigCreateContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
-		public void Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
-		public void FillMask(FillMaskInferenceOptions variant) => Set(variant, "fill_mask");
-		public void FillMask(Action<FillMaskInferenceOptionsDescriptor> configure) => Set(configure, "fill_mask");
-		public void Ner(NerInferenceOptions variant) => Set(variant, "ner");
-		public void Ner(Action<NerInferenceOptionsDescriptor> configure) => Set(configure, "ner");
-		public void PassThrough(PassThroughInferenceOptions variant) => Set(variant, "pass_through");
-		public void PassThrough(Action<PassThroughInferenceOptionsDescriptor> configure) => Set(configure, "pass_through");
-		public void QuestionAnswering(QuestionAnsweringInferenceOptions variant) => Set(variant, "question_answering");
-		public void QuestionAnswering(Action<QuestionAnsweringInferenceOptionsDescriptor> configure) => Set(configure, "question_answering");
-		public void Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
-		public void Regression(Action<RegressionInferenceOptionsDescriptor> configure) => Set(configure, "regression");
-		public void Regression<TDocument>(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
-		public void TextClassification(TextClassificationInferenceOptions variant) => Set(variant, "text_classification");
-		public void TextClassification(Action<TextClassificationInferenceOptionsDescriptor> configure) => Set(configure, "text_classification");
-		public void TextEmbedding(TextEmbeddingInferenceOptions variant) => Set(variant, "text_embedding");
-		public void TextEmbedding(Action<TextEmbeddingInferenceOptionsDescriptor> configure) => Set(configure, "text_embedding");
-		public void ZeroShotClassification(ZeroShotClassificationInferenceOptions variant) => Set(variant, "zero_shot_classification");
-		public void ZeroShotClassification(Action<ZeroShotClassificationInferenceOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+		public InferenceConfigCreateContainerDescriptor Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
+		public InferenceConfigCreateContainerDescriptor Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
+		public InferenceConfigCreateContainerDescriptor FillMask(FillMaskInferenceOptions variant) => Set(variant, "fill_mask");
+		public InferenceConfigCreateContainerDescriptor FillMask(Action<FillMaskInferenceOptionsDescriptor> configure) => Set(configure, "fill_mask");
+		public InferenceConfigCreateContainerDescriptor Ner(NerInferenceOptions variant) => Set(variant, "ner");
+		public InferenceConfigCreateContainerDescriptor Ner(Action<NerInferenceOptionsDescriptor> configure) => Set(configure, "ner");
+		public InferenceConfigCreateContainerDescriptor PassThrough(PassThroughInferenceOptions variant) => Set(variant, "pass_through");
+		public InferenceConfigCreateContainerDescriptor PassThrough(Action<PassThroughInferenceOptionsDescriptor> configure) => Set(configure, "pass_through");
+		public InferenceConfigCreateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions variant) => Set(variant, "question_answering");
+		public InferenceConfigCreateContainerDescriptor QuestionAnswering(Action<QuestionAnsweringInferenceOptionsDescriptor> configure) => Set(configure, "question_answering");
+		public InferenceConfigCreateContainerDescriptor Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
+		public InferenceConfigCreateContainerDescriptor Regression(Action<RegressionInferenceOptionsDescriptor> configure) => Set(configure, "regression");
+		public InferenceConfigCreateContainerDescriptor Regression<TDocument>(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+		public InferenceConfigCreateContainerDescriptor TextClassification(TextClassificationInferenceOptions variant) => Set(variant, "text_classification");
+		public InferenceConfigCreateContainerDescriptor TextClassification(Action<TextClassificationInferenceOptionsDescriptor> configure) => Set(configure, "text_classification");
+		public InferenceConfigCreateContainerDescriptor TextEmbedding(TextEmbeddingInferenceOptions variant) => Set(variant, "text_embedding");
+		public InferenceConfigCreateContainerDescriptor TextEmbedding(Action<TextEmbeddingInferenceOptionsDescriptor> configure) => Set(configure, "text_embedding");
+		public InferenceConfigCreateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions variant) => Set(variant, "zero_shot_classification");
+		public InferenceConfigCreateContainerDescriptor ZeroShotClassification(Action<ZeroShotClassificationInferenceOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs
index b080ca02091..f79ffbbad6f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs
@@ -191,45 +191,43 @@ public InferenceConfigUpdateContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private InferenceConfigUpdateContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the InferenceConfigUpdateContainerDescriptor. Only a single InferenceConfigUpdateContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private InferenceConfigUpdateContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the InferenceConfigUpdateContainerDescriptor. Only a single InferenceConfigUpdateContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
-		public void Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
-		public void FillMask(FillMaskInferenceUpdateOptions variant) => Set(variant, "fill_mask");
-		public void FillMask(Action<FillMaskInferenceUpdateOptionsDescriptor> configure) => Set(configure, "fill_mask");
-		public void Ner(NerInferenceUpdateOptions variant) => Set(variant, "ner");
-		public void Ner(Action<NerInferenceUpdateOptionsDescriptor> configure) => Set(configure, "ner");
-		public void PassThrough(PassThroughInferenceUpdateOptions variant) => Set(variant, "pass_through");
-		public void PassThrough(Action<PassThroughInferenceUpdateOptionsDescriptor> configure) => Set(configure, "pass_through");
-		public void QuestionAnswering(QuestionAnsweringInferenceUpdateOptions variant) => Set(variant, "question_answering");
-		public void QuestionAnswering(Action<QuestionAnsweringInferenceUpdateOptionsDescriptor> configure) => Set(configure, "question_answering");
-		public void Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
-		public void Regression(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
-		public void TextClassification(TextClassificationInferenceUpdateOptions variant) => Set(variant, "text_classification");
-		public void TextClassification(Action<TextClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_classification");
-		public void TextEmbedding(TextEmbeddingInferenceUpdateOptions variant) => Set(variant, "text_embedding");
-		public void TextEmbedding(Action<TextEmbeddingInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_embedding");
-		public void ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions variant) => Set(variant, "zero_shot_classification");
-		public void ZeroShotClassification(Action<ZeroShotClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> FillMask(FillMaskInferenceUpdateOptions variant) => Set(variant, "fill_mask");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> FillMask(Action<FillMaskInferenceUpdateOptionsDescriptor> configure) => Set(configure, "fill_mask");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> Ner(NerInferenceUpdateOptions variant) => Set(variant, "ner");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> Ner(Action<NerInferenceUpdateOptionsDescriptor> configure) => Set(configure, "ner");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> PassThrough(PassThroughInferenceUpdateOptions variant) => Set(variant, "pass_through");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> PassThrough(Action<PassThroughInferenceUpdateOptionsDescriptor> configure) => Set(configure, "pass_through");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> QuestionAnswering(QuestionAnsweringInferenceUpdateOptions variant) => Set(variant, "question_answering");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> QuestionAnswering(Action<QuestionAnsweringInferenceUpdateOptionsDescriptor> configure) => Set(configure, "question_answering");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> Regression(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> TextClassification(TextClassificationInferenceUpdateOptions variant) => Set(variant, "text_classification");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> TextClassification(Action<TextClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_classification");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> TextEmbedding(TextEmbeddingInferenceUpdateOptions variant) => Set(variant, "text_embedding");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> TextEmbedding(Action<TextEmbeddingInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_embedding");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions variant) => Set(variant, "zero_shot_classification");
+		public InferenceConfigUpdateContainerDescriptor<TDocument> ZeroShotClassification(Action<ZeroShotClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -268,46 +266,44 @@ public InferenceConfigUpdateContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private InferenceConfigUpdateContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the InferenceConfigUpdateContainerDescriptor. Only a single InferenceConfigUpdateContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private InferenceConfigUpdateContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the InferenceConfigUpdateContainerDescriptor. Only a single InferenceConfigUpdateContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
-		public void Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
-		public void FillMask(FillMaskInferenceUpdateOptions variant) => Set(variant, "fill_mask");
-		public void FillMask(Action<FillMaskInferenceUpdateOptionsDescriptor> configure) => Set(configure, "fill_mask");
-		public void Ner(NerInferenceUpdateOptions variant) => Set(variant, "ner");
-		public void Ner(Action<NerInferenceUpdateOptionsDescriptor> configure) => Set(configure, "ner");
-		public void PassThrough(PassThroughInferenceUpdateOptions variant) => Set(variant, "pass_through");
-		public void PassThrough(Action<PassThroughInferenceUpdateOptionsDescriptor> configure) => Set(configure, "pass_through");
-		public void QuestionAnswering(QuestionAnsweringInferenceUpdateOptions variant) => Set(variant, "question_answering");
-		public void QuestionAnswering(Action<QuestionAnsweringInferenceUpdateOptionsDescriptor> configure) => Set(configure, "question_answering");
-		public void Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
-		public void Regression(Action<RegressionInferenceOptionsDescriptor> configure) => Set(configure, "regression");
-		public void Regression<TDocument>(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
-		public void TextClassification(TextClassificationInferenceUpdateOptions variant) => Set(variant, "text_classification");
-		public void TextClassification(Action<TextClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_classification");
-		public void TextEmbedding(TextEmbeddingInferenceUpdateOptions variant) => Set(variant, "text_embedding");
-		public void TextEmbedding(Action<TextEmbeddingInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_embedding");
-		public void ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions variant) => Set(variant, "zero_shot_classification");
-		public void ZeroShotClassification(Action<ZeroShotClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+		public InferenceConfigUpdateContainerDescriptor Classification(ClassificationInferenceOptions variant) => Set(variant, "classification");
+		public InferenceConfigUpdateContainerDescriptor Classification(Action<ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
+		public InferenceConfigUpdateContainerDescriptor FillMask(FillMaskInferenceUpdateOptions variant) => Set(variant, "fill_mask");
+		public InferenceConfigUpdateContainerDescriptor FillMask(Action<FillMaskInferenceUpdateOptionsDescriptor> configure) => Set(configure, "fill_mask");
+		public InferenceConfigUpdateContainerDescriptor Ner(NerInferenceUpdateOptions variant) => Set(variant, "ner");
+		public InferenceConfigUpdateContainerDescriptor Ner(Action<NerInferenceUpdateOptionsDescriptor> configure) => Set(configure, "ner");
+		public InferenceConfigUpdateContainerDescriptor PassThrough(PassThroughInferenceUpdateOptions variant) => Set(variant, "pass_through");
+		public InferenceConfigUpdateContainerDescriptor PassThrough(Action<PassThroughInferenceUpdateOptionsDescriptor> configure) => Set(configure, "pass_through");
+		public InferenceConfigUpdateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions variant) => Set(variant, "question_answering");
+		public InferenceConfigUpdateContainerDescriptor QuestionAnswering(Action<QuestionAnsweringInferenceUpdateOptionsDescriptor> configure) => Set(configure, "question_answering");
+		public InferenceConfigUpdateContainerDescriptor Regression(RegressionInferenceOptions variant) => Set(variant, "regression");
+		public InferenceConfigUpdateContainerDescriptor Regression(Action<RegressionInferenceOptionsDescriptor> configure) => Set(configure, "regression");
+		public InferenceConfigUpdateContainerDescriptor Regression<TDocument>(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+		public InferenceConfigUpdateContainerDescriptor TextClassification(TextClassificationInferenceUpdateOptions variant) => Set(variant, "text_classification");
+		public InferenceConfigUpdateContainerDescriptor TextClassification(Action<TextClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_classification");
+		public InferenceConfigUpdateContainerDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions variant) => Set(variant, "text_embedding");
+		public InferenceConfigUpdateContainerDescriptor TextEmbedding(Action<TextEmbeddingInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_embedding");
+		public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions variant) => Set(variant, "zero_shot_classification");
+		public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(Action<ZeroShotClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs
index 40cceed800d..b7c3e136f3f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs
@@ -125,33 +125,31 @@ public TokenizationConfigContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private TokenizationConfigContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the TokenizationConfigContainerDescriptor. Only a single TokenizationConfigContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private TokenizationConfigContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the TokenizationConfigContainerDescriptor. Only a single TokenizationConfigContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Bert(NlpBertTokenizationConfig variant) => Set(variant, "bert");
-		public void Bert(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "bert");
-		public void Mpnet(NlpBertTokenizationConfig variant) => Set(variant, "mpnet");
-		public void Mpnet(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "mpnet");
-		public void Roberta(NlpRobertaTokenizationConfig variant) => Set(variant, "roberta");
-		public void Roberta(Action<NlpRobertaTokenizationConfigDescriptor> configure) => Set(configure, "roberta");
+		public TokenizationConfigContainerDescriptor<TDocument> Bert(NlpBertTokenizationConfig variant) => Set(variant, "bert");
+		public TokenizationConfigContainerDescriptor<TDocument> Bert(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "bert");
+		public TokenizationConfigContainerDescriptor<TDocument> Mpnet(NlpBertTokenizationConfig variant) => Set(variant, "mpnet");
+		public TokenizationConfigContainerDescriptor<TDocument> Mpnet(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "mpnet");
+		public TokenizationConfigContainerDescriptor<TDocument> Roberta(NlpRobertaTokenizationConfig variant) => Set(variant, "roberta");
+		public TokenizationConfigContainerDescriptor<TDocument> Roberta(Action<NlpRobertaTokenizationConfigDescriptor> configure) => Set(configure, "roberta");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -190,33 +188,31 @@ public TokenizationConfigContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private TokenizationConfigContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the TokenizationConfigContainerDescriptor. Only a single TokenizationConfigContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private TokenizationConfigContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the TokenizationConfigContainerDescriptor. Only a single TokenizationConfigContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Bert(NlpBertTokenizationConfig variant) => Set(variant, "bert");
-		public void Bert(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "bert");
-		public void Mpnet(NlpBertTokenizationConfig variant) => Set(variant, "mpnet");
-		public void Mpnet(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "mpnet");
-		public void Roberta(NlpRobertaTokenizationConfig variant) => Set(variant, "roberta");
-		public void Roberta(Action<NlpRobertaTokenizationConfigDescriptor> configure) => Set(configure, "roberta");
+		public TokenizationConfigContainerDescriptor Bert(NlpBertTokenizationConfig variant) => Set(variant, "bert");
+		public TokenizationConfigContainerDescriptor Bert(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "bert");
+		public TokenizationConfigContainerDescriptor Mpnet(NlpBertTokenizationConfig variant) => Set(variant, "mpnet");
+		public TokenizationConfigContainerDescriptor Mpnet(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "mpnet");
+		public TokenizationConfigContainerDescriptor Roberta(NlpRobertaTokenizationConfig variant) => Set(variant, "roberta");
+		public TokenizationConfigContainerDescriptor Roberta(Action<NlpRobertaTokenizationConfigDescriptor> configure) => Set(configure, "roberta");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs
index b2157fb13d1..38ca18565d3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs
@@ -173,25 +173,23 @@ public FunctionScoreContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private FunctionScoreContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the FunctionScoreContainerDescriptor. Only a single FunctionScoreContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private FunctionScoreContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the FunctionScoreContainerDescriptor. Only a single FunctionScoreContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; }
@@ -232,12 +230,12 @@ public FunctionScoreContainerDescriptor<TDocument> Weight(double? weight)
 			return Self;
 		}
 
-		public void FieldValueFactor(FieldValueFactorScoreFunction variant) => Set(variant, "field_value_factor");
-		public void FieldValueFactor(Action<FieldValueFactorScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "field_value_factor");
-		public void RandomScore(RandomScoreFunction variant) => Set(variant, "random_score");
-		public void RandomScore(Action<RandomScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "random_score");
-		public void ScriptScore(ScriptScoreFunction variant) => Set(variant, "script_score");
-		public void ScriptScore(Action<ScriptScoreFunctionDescriptor> configure) => Set(configure, "script_score");
+		public FunctionScoreContainerDescriptor<TDocument> FieldValueFactor(FieldValueFactorScoreFunction variant) => Set(variant, "field_value_factor");
+		public FunctionScoreContainerDescriptor<TDocument> FieldValueFactor(Action<FieldValueFactorScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "field_value_factor");
+		public FunctionScoreContainerDescriptor<TDocument> RandomScore(RandomScoreFunction variant) => Set(variant, "random_score");
+		public FunctionScoreContainerDescriptor<TDocument> RandomScore(Action<RandomScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "random_score");
+		public FunctionScoreContainerDescriptor<TDocument> ScriptScore(ScriptScoreFunction variant) => Set(variant, "script_score");
+		public FunctionScoreContainerDescriptor<TDocument> ScriptScore(Action<ScriptScoreFunctionDescriptor> configure) => Set(configure, "script_score");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -298,25 +296,23 @@ public FunctionScoreContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private FunctionScoreContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the FunctionScoreContainerDescriptor. Only a single FunctionScoreContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private FunctionScoreContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the FunctionScoreContainerDescriptor. Only a single FunctionScoreContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; }
@@ -357,14 +353,14 @@ public FunctionScoreContainerDescriptor Weight(double? weight)
 			return Self;
 		}
 
-		public void FieldValueFactor(FieldValueFactorScoreFunction variant) => Set(variant, "field_value_factor");
-		public void FieldValueFactor(Action<FieldValueFactorScoreFunctionDescriptor> configure) => Set(configure, "field_value_factor");
-		public void FieldValueFactor<TDocument>(Action<FieldValueFactorScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "field_value_factor");
-		public void RandomScore(RandomScoreFunction variant) => Set(variant, "random_score");
-		public void RandomScore(Action<RandomScoreFunctionDescriptor> configure) => Set(configure, "random_score");
-		public void RandomScore<TDocument>(Action<RandomScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "random_score");
-		public void ScriptScore(ScriptScoreFunction variant) => Set(variant, "script_score");
-		public void ScriptScore(Action<ScriptScoreFunctionDescriptor> configure) => Set(configure, "script_score");
+		public FunctionScoreContainerDescriptor FieldValueFactor(FieldValueFactorScoreFunction variant) => Set(variant, "field_value_factor");
+		public FunctionScoreContainerDescriptor FieldValueFactor(Action<FieldValueFactorScoreFunctionDescriptor> configure) => Set(configure, "field_value_factor");
+		public FunctionScoreContainerDescriptor FieldValueFactor<TDocument>(Action<FieldValueFactorScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "field_value_factor");
+		public FunctionScoreContainerDescriptor RandomScore(RandomScoreFunction variant) => Set(variant, "random_score");
+		public FunctionScoreContainerDescriptor RandomScore(Action<RandomScoreFunctionDescriptor> configure) => Set(configure, "random_score");
+		public FunctionScoreContainerDescriptor RandomScore<TDocument>(Action<RandomScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "random_score");
+		public FunctionScoreContainerDescriptor ScriptScore(ScriptScoreFunction variant) => Set(variant, "script_score");
+		public FunctionScoreContainerDescriptor ScriptScore(Action<ScriptScoreFunctionDescriptor> configure) => Set(configure, "script_score");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs
index 20ceb447c8a..1726183a709 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs
@@ -158,39 +158,37 @@ public IntervalsContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private IntervalsContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the IntervalsContainerDescriptor. Only a single IntervalsContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private IntervalsContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the IntervalsContainerDescriptor. Only a single IntervalsContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
-		public void AllOf(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
-		public void AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
-		public void AnyOf(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
-		public void Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
-		public void Fuzzy(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
-		public void Match(IntervalsMatch variant) => Set(variant, "match");
-		public void Match(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
-		public void Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
-		public void Prefix(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
-		public void Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
-		public void Wildcard(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+		public IntervalsContainerDescriptor<TDocument> AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
+		public IntervalsContainerDescriptor<TDocument> AllOf(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
+		public IntervalsContainerDescriptor<TDocument> AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
+		public IntervalsContainerDescriptor<TDocument> AnyOf(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
+		public IntervalsContainerDescriptor<TDocument> Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
+		public IntervalsContainerDescriptor<TDocument> Fuzzy(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
+		public IntervalsContainerDescriptor<TDocument> Match(IntervalsMatch variant) => Set(variant, "match");
+		public IntervalsContainerDescriptor<TDocument> Match(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
+		public IntervalsContainerDescriptor<TDocument> Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
+		public IntervalsContainerDescriptor<TDocument> Prefix(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
+		public IntervalsContainerDescriptor<TDocument> Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
+		public IntervalsContainerDescriptor<TDocument> Wildcard(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -229,45 +227,43 @@ public IntervalsContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private IntervalsContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the IntervalsContainerDescriptor. Only a single IntervalsContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private IntervalsContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the IntervalsContainerDescriptor. Only a single IntervalsContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
-		public void AllOf(Action<IntervalsAllOfDescriptor> configure) => Set(configure, "all_of");
-		public void AllOf<TDocument>(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
-		public void AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
-		public void AnyOf(Action<IntervalsAnyOfDescriptor> configure) => Set(configure, "any_of");
-		public void AnyOf<TDocument>(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
-		public void Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
-		public void Fuzzy(Action<IntervalsFuzzyDescriptor> configure) => Set(configure, "fuzzy");
-		public void Fuzzy<TDocument>(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
-		public void Match(IntervalsMatch variant) => Set(variant, "match");
-		public void Match(Action<IntervalsMatchDescriptor> configure) => Set(configure, "match");
-		public void Match<TDocument>(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
-		public void Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
-		public void Prefix(Action<IntervalsPrefixDescriptor> configure) => Set(configure, "prefix");
-		public void Prefix<TDocument>(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
-		public void Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
-		public void Wildcard(Action<IntervalsWildcardDescriptor> configure) => Set(configure, "wildcard");
-		public void Wildcard<TDocument>(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+		public IntervalsContainerDescriptor AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
+		public IntervalsContainerDescriptor AllOf(Action<IntervalsAllOfDescriptor> configure) => Set(configure, "all_of");
+		public IntervalsContainerDescriptor AllOf<TDocument>(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
+		public IntervalsContainerDescriptor AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
+		public IntervalsContainerDescriptor AnyOf(Action<IntervalsAnyOfDescriptor> configure) => Set(configure, "any_of");
+		public IntervalsContainerDescriptor AnyOf<TDocument>(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
+		public IntervalsContainerDescriptor Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
+		public IntervalsContainerDescriptor Fuzzy(Action<IntervalsFuzzyDescriptor> configure) => Set(configure, "fuzzy");
+		public IntervalsContainerDescriptor Fuzzy<TDocument>(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
+		public IntervalsContainerDescriptor Match(IntervalsMatch variant) => Set(variant, "match");
+		public IntervalsContainerDescriptor Match(Action<IntervalsMatchDescriptor> configure) => Set(configure, "match");
+		public IntervalsContainerDescriptor Match<TDocument>(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
+		public IntervalsContainerDescriptor Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
+		public IntervalsContainerDescriptor Prefix(Action<IntervalsPrefixDescriptor> configure) => Set(configure, "prefix");
+		public IntervalsContainerDescriptor Prefix<TDocument>(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
+		public IntervalsContainerDescriptor Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
+		public IntervalsContainerDescriptor Wildcard(Action<IntervalsWildcardDescriptor> configure) => Set(configure, "wildcard");
+		public IntervalsContainerDescriptor Wildcard<TDocument>(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
index af763476e76..ab1b05674bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
@@ -87,25 +87,23 @@ public IntervalsFilterDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private IntervalsFilterDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the IntervalsFilterDescriptor. Only a single IntervalsFilter variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private IntervalsFilterDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the IntervalsFilterDescriptor. Only a single IntervalsFilter variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
@@ -146,25 +144,23 @@ public IntervalsFilterDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private IntervalsFilterDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the IntervalsFilterDescriptor. Only a single IntervalsFilter variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private IntervalsFilterDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the IntervalsFilterDescriptor. Only a single IntervalsFilter variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
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 39eed164078..dc64b24b34d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
@@ -239,25 +239,23 @@ public IntervalsQueryDescriptor(Field field)
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private IntervalsQueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the IntervalsQueryDescriptor. Only a single IntervalsQuery variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private IntervalsQueryDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the IntervalsQueryDescriptor. Only a single IntervalsQuery variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		private string? QueryNameValue { get; set; }
@@ -290,18 +288,18 @@ public IntervalsQueryDescriptor<TDocument> Field<TValue>(Expression<Func<TDocume
 			return Self;
 		}
 
-		public void AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
-		public void AllOf(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
-		public void AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
-		public void AnyOf(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
-		public void Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
-		public void Fuzzy(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
-		public void Match(IntervalsMatch variant) => Set(variant, "match");
-		public void Match(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
-		public void Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
-		public void Prefix(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
-		public void Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
-		public void Wildcard(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+		public IntervalsQueryDescriptor<TDocument> AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
+		public IntervalsQueryDescriptor<TDocument> AllOf(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
+		public IntervalsQueryDescriptor<TDocument> AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
+		public IntervalsQueryDescriptor<TDocument> AnyOf(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
+		public IntervalsQueryDescriptor<TDocument> Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
+		public IntervalsQueryDescriptor<TDocument> Fuzzy(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
+		public IntervalsQueryDescriptor<TDocument> Match(IntervalsMatch variant) => Set(variant, "match");
+		public IntervalsQueryDescriptor<TDocument> Match(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
+		public IntervalsQueryDescriptor<TDocument> Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
+		public IntervalsQueryDescriptor<TDocument> Prefix(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
+		public IntervalsQueryDescriptor<TDocument> Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
+		public IntervalsQueryDescriptor<TDocument> Wildcard(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -362,25 +360,23 @@ public IntervalsQueryDescriptor(Field field)
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private IntervalsQueryDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the IntervalsQueryDescriptor. Only a single IntervalsQuery variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private IntervalsQueryDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the IntervalsQueryDescriptor. Only a single IntervalsQuery variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
 		private string? QueryNameValue { get; set; }
@@ -419,24 +415,24 @@ public IntervalsQueryDescriptor Field<TDocument>(Expression<Func<TDocument, obje
 			return Self;
 		}
 
-		public void AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
-		public void AllOf(Action<IntervalsAllOfDescriptor> configure) => Set(configure, "all_of");
-		public void AllOf<TDocument>(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
-		public void AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
-		public void AnyOf(Action<IntervalsAnyOfDescriptor> configure) => Set(configure, "any_of");
-		public void AnyOf<TDocument>(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
-		public void Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
-		public void Fuzzy(Action<IntervalsFuzzyDescriptor> configure) => Set(configure, "fuzzy");
-		public void Fuzzy<TDocument>(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
-		public void Match(IntervalsMatch variant) => Set(variant, "match");
-		public void Match(Action<IntervalsMatchDescriptor> configure) => Set(configure, "match");
-		public void Match<TDocument>(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
-		public void Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
-		public void Prefix(Action<IntervalsPrefixDescriptor> configure) => Set(configure, "prefix");
-		public void Prefix<TDocument>(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
-		public void Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
-		public void Wildcard(Action<IntervalsWildcardDescriptor> configure) => Set(configure, "wildcard");
-		public void Wildcard<TDocument>(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+		public IntervalsQueryDescriptor AllOf(IntervalsAllOf variant) => Set(variant, "all_of");
+		public IntervalsQueryDescriptor AllOf(Action<IntervalsAllOfDescriptor> configure) => Set(configure, "all_of");
+		public IntervalsQueryDescriptor AllOf<TDocument>(Action<IntervalsAllOfDescriptor<TDocument>> configure) => Set(configure, "all_of");
+		public IntervalsQueryDescriptor AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of");
+		public IntervalsQueryDescriptor AnyOf(Action<IntervalsAnyOfDescriptor> configure) => Set(configure, "any_of");
+		public IntervalsQueryDescriptor AnyOf<TDocument>(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => Set(configure, "any_of");
+		public IntervalsQueryDescriptor Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy");
+		public IntervalsQueryDescriptor Fuzzy(Action<IntervalsFuzzyDescriptor> configure) => Set(configure, "fuzzy");
+		public IntervalsQueryDescriptor Fuzzy<TDocument>(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
+		public IntervalsQueryDescriptor Match(IntervalsMatch variant) => Set(variant, "match");
+		public IntervalsQueryDescriptor Match(Action<IntervalsMatchDescriptor> configure) => Set(configure, "match");
+		public IntervalsQueryDescriptor Match<TDocument>(Action<IntervalsMatchDescriptor<TDocument>> configure) => Set(configure, "match");
+		public IntervalsQueryDescriptor Prefix(IntervalsPrefix variant) => Set(variant, "prefix");
+		public IntervalsQueryDescriptor Prefix(Action<IntervalsPrefixDescriptor> configure) => Set(configure, "prefix");
+		public IntervalsQueryDescriptor Prefix<TDocument>(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
+		public IntervalsQueryDescriptor Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard");
+		public IntervalsQueryDescriptor Wildcard(Action<IntervalsWildcardDescriptor> configure) => Set(configure, "wildcard");
+		public IntervalsQueryDescriptor Wildcard<TDocument>(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs
index 7311aad92f3..55bf36d3398 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs
@@ -642,126 +642,124 @@ public QueryContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private QueryContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the QueryContainerDescriptor. Only a single QueryContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private QueryContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the QueryContainerDescriptor. Only a single QueryContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Bool(BoolQuery query) => Set(query, "bool");
-		public void Bool(Action<BoolQueryDescriptor<TDocument>> configure) => Set(configure, "bool");
-		public void Boosting(BoostingQuery query) => Set(query, "boosting");
-		public void Boosting(Action<BoostingQueryDescriptor<TDocument>> configure) => Set(configure, "boosting");
-		public void CombinedFields(CombinedFieldsQuery query) => Set(query, "combined_fields");
-		public void CombinedFields(Action<CombinedFieldsQueryDescriptor<TDocument>> configure) => Set(configure, "combined_fields");
-		public void ConstantScore(ConstantScoreQuery query) => Set(query, "constant_score");
-		public void ConstantScore(Action<ConstantScoreQueryDescriptor<TDocument>> configure) => Set(configure, "constant_score");
-		public void DisMax(DisMaxQuery query) => Set(query, "dis_max");
-		public void DisMax(Action<DisMaxQueryDescriptor<TDocument>> configure) => Set(configure, "dis_max");
-		public void Exists(ExistsQuery query) => Set(query, "exists");
-		public void Exists(Action<ExistsQueryDescriptor<TDocument>> configure) => Set(configure, "exists");
-		public void FieldMaskingSpan(SpanFieldMaskingQuery query) => Set(query, "field_masking_span");
-		public void FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
-		public void FunctionScore(FunctionScoreQuery query) => Set(query, "function_score");
-		public void FunctionScore(Action<FunctionScoreQueryDescriptor<TDocument>> configure) => Set(configure, "function_score");
-		public void Fuzzy(FuzzyQuery query) => Set(query, "fuzzy");
-		public void Fuzzy(Action<FuzzyQueryDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
-		public void GeoBoundingBox(GeoBoundingBoxQuery query) => Set(query, "geo_bounding_box");
-		public void GeoBoundingBox(Action<GeoBoundingBoxQueryDescriptor<TDocument>> configure) => Set(configure, "geo_bounding_box");
-		public void GeoDistance(GeoDistanceQuery query) => Set(query, "geo_distance");
-		public void GeoDistance(Action<GeoDistanceQueryDescriptor<TDocument>> configure) => Set(configure, "geo_distance");
-		public void GeoPolygon(GeoPolygonQuery query) => Set(query, "geo_polygon");
-		public void GeoPolygon(Action<GeoPolygonQueryDescriptor<TDocument>> configure) => Set(configure, "geo_polygon");
-		public void GeoShape(GeoShapeQuery query) => Set(query, "geo_shape");
-		public void GeoShape(Action<GeoShapeQueryDescriptor<TDocument>> configure) => Set(configure, "geo_shape");
-		public void HasChild(HasChildQuery query) => Set(query, "has_child");
-		public void HasChild(Action<HasChildQueryDescriptor<TDocument>> configure) => Set(configure, "has_child");
-		public void HasParent(HasParentQuery query) => Set(query, "has_parent");
-		public void HasParent(Action<HasParentQueryDescriptor<TDocument>> configure) => Set(configure, "has_parent");
-		public void Ids(IdsQuery query) => Set(query, "ids");
-		public void Ids(Action<IdsQueryDescriptor> configure) => Set(configure, "ids");
-		public void Intervals(IntervalsQuery query) => Set(query, "intervals");
-		public void Intervals(Action<IntervalsQueryDescriptor<TDocument>> configure) => Set(configure, "intervals");
-		public void Match(MatchQuery query) => Set(query, "match");
-		public void Match(Action<MatchQueryDescriptor<TDocument>> configure) => Set(configure, "match");
-		public void MatchAll(MatchAllQuery query) => Set(query, "match_all");
-		public void MatchAll(Action<MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
-		public void MatchBoolPrefix(MatchBoolPrefixQuery query) => Set(query, "match_bool_prefix");
-		public void MatchBoolPrefix(Action<MatchBoolPrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_bool_prefix");
-		public void MatchNone(MatchNoneQuery query) => Set(query, "match_none");
-		public void MatchNone(Action<MatchNoneQueryDescriptor> configure) => Set(configure, "match_none");
-		public void MatchPhrase(MatchPhraseQuery query) => Set(query, "match_phrase");
-		public void MatchPhrase(Action<MatchPhraseQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase");
-		public void MatchPhrasePrefix(MatchPhrasePrefixQuery query) => Set(query, "match_phrase_prefix");
-		public void MatchPhrasePrefix(Action<MatchPhrasePrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase_prefix");
-		public void MoreLikeThis(MoreLikeThisQuery query) => Set(query, "more_like_this");
-		public void MoreLikeThis(Action<MoreLikeThisQueryDescriptor<TDocument>> configure) => Set(configure, "more_like_this");
-		public void MultiMatch(MultiMatchQuery query) => Set(query, "multi_match");
-		public void MultiMatch(Action<MultiMatchQueryDescriptor<TDocument>> configure) => Set(configure, "multi_match");
-		public void Nested(NestedQuery query) => Set(query, "nested");
-		public void Nested(Action<NestedQueryDescriptor<TDocument>> configure) => Set(configure, "nested");
-		public void ParentId(ParentIdQuery query) => Set(query, "parent_id");
-		public void ParentId(Action<ParentIdQueryDescriptor> configure) => Set(configure, "parent_id");
-		public void Percolate(PercolateQuery query) => Set(query, "percolate");
-		public void Percolate(Action<PercolateQueryDescriptor<TDocument>> configure) => Set(configure, "percolate");
-		public void Prefix(PrefixQuery query) => Set(query, "prefix");
-		public void Prefix(Action<PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
-		public void QueryString(QueryStringQuery query) => Set(query, "query_string");
-		public void QueryString(Action<QueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "query_string");
-		public void Range(RangeQuery query) => Set(query, "range");
-		public void RankFeature(RankFeatureQuery query) => Set(query, "rank_feature");
-		public void RankFeature(Action<RankFeatureQueryDescriptor<TDocument>> configure) => Set(configure, "rank_feature");
-		public void Regexp(RegexpQuery query) => Set(query, "regexp");
-		public void Regexp(Action<RegexpQueryDescriptor<TDocument>> configure) => Set(configure, "regexp");
-		public void Script(ScriptQuery query) => Set(query, "script");
-		public void Script(Action<ScriptQueryDescriptor> configure) => Set(configure, "script");
-		public void ScriptScore(ScriptScoreQuery query) => Set(query, "script_score");
-		public void ScriptScore(Action<ScriptScoreQueryDescriptor<TDocument>> configure) => Set(configure, "script_score");
-		public void Shape(ShapeQuery query) => Set(query, "shape");
-		public void Shape(Action<ShapeQueryDescriptor<TDocument>> configure) => Set(configure, "shape");
-		public void SimpleQueryString(SimpleQueryStringQuery query) => Set(query, "simple_query_string");
-		public void SimpleQueryString(Action<SimpleQueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "simple_query_string");
-		public void SpanContaining(SpanContainingQuery query) => Set(query, "span_containing");
-		public void SpanContaining(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
-		public void SpanFirst(SpanFirstQuery query) => Set(query, "span_first");
-		public void SpanFirst(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
-		public void SpanMulti(SpanMultiTermQuery query) => Set(query, "span_multi");
-		public void SpanMulti(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
-		public void SpanNear(SpanNearQuery query) => Set(query, "span_near");
-		public void SpanNear(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
-		public void SpanNot(SpanNotQuery query) => Set(query, "span_not");
-		public void SpanNot(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
-		public void SpanOr(SpanOrQuery query) => Set(query, "span_or");
-		public void SpanOr(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
-		public void SpanTerm(SpanTermQuery query) => Set(query, "span_term");
-		public void SpanTerm(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
-		public void SpanWithin(SpanWithinQuery query) => Set(query, "span_within");
-		public void SpanWithin(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
-		public void Term(TermQuery query) => Set(query, "term");
-		public void Term(Action<TermQueryDescriptor<TDocument>> configure) => Set(configure, "term");
-		public void Terms(TermsQuery query) => Set(query, "terms");
-		public void Terms(Action<TermsQueryDescriptor<TDocument>> configure) => Set(configure, "terms");
-		public void TermsSet(TermsSetQuery query) => Set(query, "terms_set");
-		public void TermsSet(Action<TermsSetQueryDescriptor<TDocument>> configure) => Set(configure, "terms_set");
-		public void Wildcard(WildcardQuery query) => Set(query, "wildcard");
-		public void Wildcard(Action<WildcardQueryDescriptor<TDocument>> configure) => Set(configure, "wildcard");
-		public void Wrapper(WrapperQuery query) => Set(query, "wrapper");
-		public void Wrapper(Action<WrapperQueryDescriptor> configure) => Set(configure, "wrapper");
+		public QueryContainerDescriptor<TDocument> Bool(BoolQuery query) => Set(query, "bool");
+		public QueryContainerDescriptor<TDocument> Bool(Action<BoolQueryDescriptor<TDocument>> configure) => Set(configure, "bool");
+		public QueryContainerDescriptor<TDocument> Boosting(BoostingQuery query) => Set(query, "boosting");
+		public QueryContainerDescriptor<TDocument> Boosting(Action<BoostingQueryDescriptor<TDocument>> configure) => Set(configure, "boosting");
+		public QueryContainerDescriptor<TDocument> CombinedFields(CombinedFieldsQuery query) => Set(query, "combined_fields");
+		public QueryContainerDescriptor<TDocument> CombinedFields(Action<CombinedFieldsQueryDescriptor<TDocument>> configure) => Set(configure, "combined_fields");
+		public QueryContainerDescriptor<TDocument> ConstantScore(ConstantScoreQuery query) => Set(query, "constant_score");
+		public QueryContainerDescriptor<TDocument> ConstantScore(Action<ConstantScoreQueryDescriptor<TDocument>> configure) => Set(configure, "constant_score");
+		public QueryContainerDescriptor<TDocument> DisMax(DisMaxQuery query) => Set(query, "dis_max");
+		public QueryContainerDescriptor<TDocument> DisMax(Action<DisMaxQueryDescriptor<TDocument>> configure) => Set(configure, "dis_max");
+		public QueryContainerDescriptor<TDocument> Exists(ExistsQuery query) => Set(query, "exists");
+		public QueryContainerDescriptor<TDocument> Exists(Action<ExistsQueryDescriptor<TDocument>> configure) => Set(configure, "exists");
+		public QueryContainerDescriptor<TDocument> FieldMaskingSpan(SpanFieldMaskingQuery query) => Set(query, "field_masking_span");
+		public QueryContainerDescriptor<TDocument> FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
+		public QueryContainerDescriptor<TDocument> FunctionScore(FunctionScoreQuery query) => Set(query, "function_score");
+		public QueryContainerDescriptor<TDocument> FunctionScore(Action<FunctionScoreQueryDescriptor<TDocument>> configure) => Set(configure, "function_score");
+		public QueryContainerDescriptor<TDocument> Fuzzy(FuzzyQuery query) => Set(query, "fuzzy");
+		public QueryContainerDescriptor<TDocument> Fuzzy(Action<FuzzyQueryDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
+		public QueryContainerDescriptor<TDocument> GeoBoundingBox(GeoBoundingBoxQuery query) => Set(query, "geo_bounding_box");
+		public QueryContainerDescriptor<TDocument> GeoBoundingBox(Action<GeoBoundingBoxQueryDescriptor<TDocument>> configure) => Set(configure, "geo_bounding_box");
+		public QueryContainerDescriptor<TDocument> GeoDistance(GeoDistanceQuery query) => Set(query, "geo_distance");
+		public QueryContainerDescriptor<TDocument> GeoDistance(Action<GeoDistanceQueryDescriptor<TDocument>> configure) => Set(configure, "geo_distance");
+		public QueryContainerDescriptor<TDocument> GeoPolygon(GeoPolygonQuery query) => Set(query, "geo_polygon");
+		public QueryContainerDescriptor<TDocument> GeoPolygon(Action<GeoPolygonQueryDescriptor<TDocument>> configure) => Set(configure, "geo_polygon");
+		public QueryContainerDescriptor<TDocument> GeoShape(GeoShapeQuery query) => Set(query, "geo_shape");
+		public QueryContainerDescriptor<TDocument> GeoShape(Action<GeoShapeQueryDescriptor<TDocument>> configure) => Set(configure, "geo_shape");
+		public QueryContainerDescriptor<TDocument> HasChild(HasChildQuery query) => Set(query, "has_child");
+		public QueryContainerDescriptor<TDocument> HasChild(Action<HasChildQueryDescriptor<TDocument>> configure) => Set(configure, "has_child");
+		public QueryContainerDescriptor<TDocument> HasParent(HasParentQuery query) => Set(query, "has_parent");
+		public QueryContainerDescriptor<TDocument> HasParent(Action<HasParentQueryDescriptor<TDocument>> configure) => Set(configure, "has_parent");
+		public QueryContainerDescriptor<TDocument> Ids(IdsQuery query) => Set(query, "ids");
+		public QueryContainerDescriptor<TDocument> Ids(Action<IdsQueryDescriptor> configure) => Set(configure, "ids");
+		public QueryContainerDescriptor<TDocument> Intervals(IntervalsQuery query) => Set(query, "intervals");
+		public QueryContainerDescriptor<TDocument> Intervals(Action<IntervalsQueryDescriptor<TDocument>> configure) => Set(configure, "intervals");
+		public QueryContainerDescriptor<TDocument> Match(MatchQuery query) => Set(query, "match");
+		public QueryContainerDescriptor<TDocument> Match(Action<MatchQueryDescriptor<TDocument>> configure) => Set(configure, "match");
+		public QueryContainerDescriptor<TDocument> MatchAll(MatchAllQuery query) => Set(query, "match_all");
+		public QueryContainerDescriptor<TDocument> MatchAll(Action<MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
+		public QueryContainerDescriptor<TDocument> MatchBoolPrefix(MatchBoolPrefixQuery query) => Set(query, "match_bool_prefix");
+		public QueryContainerDescriptor<TDocument> MatchBoolPrefix(Action<MatchBoolPrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_bool_prefix");
+		public QueryContainerDescriptor<TDocument> MatchNone(MatchNoneQuery query) => Set(query, "match_none");
+		public QueryContainerDescriptor<TDocument> MatchNone(Action<MatchNoneQueryDescriptor> configure) => Set(configure, "match_none");
+		public QueryContainerDescriptor<TDocument> MatchPhrase(MatchPhraseQuery query) => Set(query, "match_phrase");
+		public QueryContainerDescriptor<TDocument> MatchPhrase(Action<MatchPhraseQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase");
+		public QueryContainerDescriptor<TDocument> MatchPhrasePrefix(MatchPhrasePrefixQuery query) => Set(query, "match_phrase_prefix");
+		public QueryContainerDescriptor<TDocument> MatchPhrasePrefix(Action<MatchPhrasePrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase_prefix");
+		public QueryContainerDescriptor<TDocument> MoreLikeThis(MoreLikeThisQuery query) => Set(query, "more_like_this");
+		public QueryContainerDescriptor<TDocument> MoreLikeThis(Action<MoreLikeThisQueryDescriptor<TDocument>> configure) => Set(configure, "more_like_this");
+		public QueryContainerDescriptor<TDocument> MultiMatch(MultiMatchQuery query) => Set(query, "multi_match");
+		public QueryContainerDescriptor<TDocument> MultiMatch(Action<MultiMatchQueryDescriptor<TDocument>> configure) => Set(configure, "multi_match");
+		public QueryContainerDescriptor<TDocument> Nested(NestedQuery query) => Set(query, "nested");
+		public QueryContainerDescriptor<TDocument> Nested(Action<NestedQueryDescriptor<TDocument>> configure) => Set(configure, "nested");
+		public QueryContainerDescriptor<TDocument> ParentId(ParentIdQuery query) => Set(query, "parent_id");
+		public QueryContainerDescriptor<TDocument> ParentId(Action<ParentIdQueryDescriptor> configure) => Set(configure, "parent_id");
+		public QueryContainerDescriptor<TDocument> Percolate(PercolateQuery query) => Set(query, "percolate");
+		public QueryContainerDescriptor<TDocument> Percolate(Action<PercolateQueryDescriptor<TDocument>> configure) => Set(configure, "percolate");
+		public QueryContainerDescriptor<TDocument> Prefix(PrefixQuery query) => Set(query, "prefix");
+		public QueryContainerDescriptor<TDocument> Prefix(Action<PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+		public QueryContainerDescriptor<TDocument> QueryString(QueryStringQuery query) => Set(query, "query_string");
+		public QueryContainerDescriptor<TDocument> QueryString(Action<QueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "query_string");
+		public QueryContainerDescriptor<TDocument> Range(RangeQuery query) => Set(query, "range");
+		public QueryContainerDescriptor<TDocument> RankFeature(RankFeatureQuery query) => Set(query, "rank_feature");
+		public QueryContainerDescriptor<TDocument> RankFeature(Action<RankFeatureQueryDescriptor<TDocument>> configure) => Set(configure, "rank_feature");
+		public QueryContainerDescriptor<TDocument> Regexp(RegexpQuery query) => Set(query, "regexp");
+		public QueryContainerDescriptor<TDocument> Regexp(Action<RegexpQueryDescriptor<TDocument>> configure) => Set(configure, "regexp");
+		public QueryContainerDescriptor<TDocument> Script(ScriptQuery query) => Set(query, "script");
+		public QueryContainerDescriptor<TDocument> Script(Action<ScriptQueryDescriptor> configure) => Set(configure, "script");
+		public QueryContainerDescriptor<TDocument> ScriptScore(ScriptScoreQuery query) => Set(query, "script_score");
+		public QueryContainerDescriptor<TDocument> ScriptScore(Action<ScriptScoreQueryDescriptor<TDocument>> configure) => Set(configure, "script_score");
+		public QueryContainerDescriptor<TDocument> Shape(ShapeQuery query) => Set(query, "shape");
+		public QueryContainerDescriptor<TDocument> Shape(Action<ShapeQueryDescriptor<TDocument>> configure) => Set(configure, "shape");
+		public QueryContainerDescriptor<TDocument> SimpleQueryString(SimpleQueryStringQuery query) => Set(query, "simple_query_string");
+		public QueryContainerDescriptor<TDocument> SimpleQueryString(Action<SimpleQueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "simple_query_string");
+		public QueryContainerDescriptor<TDocument> SpanContaining(SpanContainingQuery query) => Set(query, "span_containing");
+		public QueryContainerDescriptor<TDocument> SpanContaining(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
+		public QueryContainerDescriptor<TDocument> SpanFirst(SpanFirstQuery query) => Set(query, "span_first");
+		public QueryContainerDescriptor<TDocument> SpanFirst(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
+		public QueryContainerDescriptor<TDocument> SpanMulti(SpanMultiTermQuery query) => Set(query, "span_multi");
+		public QueryContainerDescriptor<TDocument> SpanMulti(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
+		public QueryContainerDescriptor<TDocument> SpanNear(SpanNearQuery query) => Set(query, "span_near");
+		public QueryContainerDescriptor<TDocument> SpanNear(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
+		public QueryContainerDescriptor<TDocument> SpanNot(SpanNotQuery query) => Set(query, "span_not");
+		public QueryContainerDescriptor<TDocument> SpanNot(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
+		public QueryContainerDescriptor<TDocument> SpanOr(SpanOrQuery query) => Set(query, "span_or");
+		public QueryContainerDescriptor<TDocument> SpanOr(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
+		public QueryContainerDescriptor<TDocument> SpanTerm(SpanTermQuery query) => Set(query, "span_term");
+		public QueryContainerDescriptor<TDocument> SpanTerm(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
+		public QueryContainerDescriptor<TDocument> SpanWithin(SpanWithinQuery query) => Set(query, "span_within");
+		public QueryContainerDescriptor<TDocument> SpanWithin(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
+		public QueryContainerDescriptor<TDocument> Term(TermQuery query) => Set(query, "term");
+		public QueryContainerDescriptor<TDocument> Term(Action<TermQueryDescriptor<TDocument>> configure) => Set(configure, "term");
+		public QueryContainerDescriptor<TDocument> Terms(TermsQuery query) => Set(query, "terms");
+		public QueryContainerDescriptor<TDocument> Terms(Action<TermsQueryDescriptor<TDocument>> configure) => Set(configure, "terms");
+		public QueryContainerDescriptor<TDocument> TermsSet(TermsSetQuery query) => Set(query, "terms_set");
+		public QueryContainerDescriptor<TDocument> TermsSet(Action<TermsSetQueryDescriptor<TDocument>> configure) => Set(configure, "terms_set");
+		public QueryContainerDescriptor<TDocument> Wildcard(WildcardQuery query) => Set(query, "wildcard");
+		public QueryContainerDescriptor<TDocument> Wildcard(Action<WildcardQueryDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+		public QueryContainerDescriptor<TDocument> Wrapper(WrapperQuery query) => Set(query, "wrapper");
+		public QueryContainerDescriptor<TDocument> Wrapper(Action<WrapperQueryDescriptor> configure) => Set(configure, "wrapper");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -800,169 +798,167 @@ public QueryContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private QueryContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the QueryContainerDescriptor. Only a single QueryContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private QueryContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the QueryContainerDescriptor. Only a single QueryContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Bool(BoolQuery query) => Set(query, "bool");
-		public void Bool(Action<BoolQueryDescriptor> configure) => Set(configure, "bool");
-		public void Bool<TDocument>(Action<BoolQueryDescriptor<TDocument>> configure) => Set(configure, "bool");
-		public void Boosting(BoostingQuery query) => Set(query, "boosting");
-		public void Boosting(Action<BoostingQueryDescriptor> configure) => Set(configure, "boosting");
-		public void Boosting<TDocument>(Action<BoostingQueryDescriptor<TDocument>> configure) => Set(configure, "boosting");
-		public void CombinedFields(CombinedFieldsQuery query) => Set(query, "combined_fields");
-		public void CombinedFields(Action<CombinedFieldsQueryDescriptor> configure) => Set(configure, "combined_fields");
-		public void CombinedFields<TDocument>(Action<CombinedFieldsQueryDescriptor<TDocument>> configure) => Set(configure, "combined_fields");
-		public void ConstantScore(ConstantScoreQuery query) => Set(query, "constant_score");
-		public void ConstantScore(Action<ConstantScoreQueryDescriptor> configure) => Set(configure, "constant_score");
-		public void ConstantScore<TDocument>(Action<ConstantScoreQueryDescriptor<TDocument>> configure) => Set(configure, "constant_score");
-		public void DisMax(DisMaxQuery query) => Set(query, "dis_max");
-		public void DisMax(Action<DisMaxQueryDescriptor> configure) => Set(configure, "dis_max");
-		public void DisMax<TDocument>(Action<DisMaxQueryDescriptor<TDocument>> configure) => Set(configure, "dis_max");
-		public void Exists(ExistsQuery query) => Set(query, "exists");
-		public void Exists(Action<ExistsQueryDescriptor> configure) => Set(configure, "exists");
-		public void Exists<TDocument>(Action<ExistsQueryDescriptor<TDocument>> configure) => Set(configure, "exists");
-		public void FieldMaskingSpan(SpanFieldMaskingQuery query) => Set(query, "field_masking_span");
-		public void FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor> configure) => Set(configure, "field_masking_span");
-		public void FieldMaskingSpan<TDocument>(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
-		public void FunctionScore(FunctionScoreQuery query) => Set(query, "function_score");
-		public void FunctionScore(Action<FunctionScoreQueryDescriptor> configure) => Set(configure, "function_score");
-		public void FunctionScore<TDocument>(Action<FunctionScoreQueryDescriptor<TDocument>> configure) => Set(configure, "function_score");
-		public void Fuzzy(FuzzyQuery query) => Set(query, "fuzzy");
-		public void Fuzzy(Action<FuzzyQueryDescriptor> configure) => Set(configure, "fuzzy");
-		public void Fuzzy<TDocument>(Action<FuzzyQueryDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
-		public void GeoBoundingBox(GeoBoundingBoxQuery query) => Set(query, "geo_bounding_box");
-		public void GeoBoundingBox(Action<GeoBoundingBoxQueryDescriptor> configure) => Set(configure, "geo_bounding_box");
-		public void GeoBoundingBox<TDocument>(Action<GeoBoundingBoxQueryDescriptor<TDocument>> configure) => Set(configure, "geo_bounding_box");
-		public void GeoDistance(GeoDistanceQuery query) => Set(query, "geo_distance");
-		public void GeoDistance(Action<GeoDistanceQueryDescriptor> configure) => Set(configure, "geo_distance");
-		public void GeoDistance<TDocument>(Action<GeoDistanceQueryDescriptor<TDocument>> configure) => Set(configure, "geo_distance");
-		public void GeoPolygon(GeoPolygonQuery query) => Set(query, "geo_polygon");
-		public void GeoPolygon(Action<GeoPolygonQueryDescriptor> configure) => Set(configure, "geo_polygon");
-		public void GeoPolygon<TDocument>(Action<GeoPolygonQueryDescriptor<TDocument>> configure) => Set(configure, "geo_polygon");
-		public void GeoShape(GeoShapeQuery query) => Set(query, "geo_shape");
-		public void GeoShape(Action<GeoShapeQueryDescriptor> configure) => Set(configure, "geo_shape");
-		public void GeoShape<TDocument>(Action<GeoShapeQueryDescriptor<TDocument>> configure) => Set(configure, "geo_shape");
-		public void HasChild(HasChildQuery query) => Set(query, "has_child");
-		public void HasChild(Action<HasChildQueryDescriptor> configure) => Set(configure, "has_child");
-		public void HasChild<TDocument>(Action<HasChildQueryDescriptor<TDocument>> configure) => Set(configure, "has_child");
-		public void HasParent(HasParentQuery query) => Set(query, "has_parent");
-		public void HasParent(Action<HasParentQueryDescriptor> configure) => Set(configure, "has_parent");
-		public void HasParent<TDocument>(Action<HasParentQueryDescriptor<TDocument>> configure) => Set(configure, "has_parent");
-		public void Ids(IdsQuery query) => Set(query, "ids");
-		public void Ids(Action<IdsQueryDescriptor> configure) => Set(configure, "ids");
-		public void Intervals(IntervalsQuery query) => Set(query, "intervals");
-		public void Intervals(Action<IntervalsQueryDescriptor> configure) => Set(configure, "intervals");
-		public void Intervals<TDocument>(Action<IntervalsQueryDescriptor<TDocument>> configure) => Set(configure, "intervals");
-		public void Match(MatchQuery query) => Set(query, "match");
-		public void Match(Action<MatchQueryDescriptor> configure) => Set(configure, "match");
-		public void Match<TDocument>(Action<MatchQueryDescriptor<TDocument>> configure) => Set(configure, "match");
-		public void MatchAll(MatchAllQuery query) => Set(query, "match_all");
-		public void MatchAll(Action<MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
-		public void MatchBoolPrefix(MatchBoolPrefixQuery query) => Set(query, "match_bool_prefix");
-		public void MatchBoolPrefix(Action<MatchBoolPrefixQueryDescriptor> configure) => Set(configure, "match_bool_prefix");
-		public void MatchBoolPrefix<TDocument>(Action<MatchBoolPrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_bool_prefix");
-		public void MatchNone(MatchNoneQuery query) => Set(query, "match_none");
-		public void MatchNone(Action<MatchNoneQueryDescriptor> configure) => Set(configure, "match_none");
-		public void MatchPhrase(MatchPhraseQuery query) => Set(query, "match_phrase");
-		public void MatchPhrase(Action<MatchPhraseQueryDescriptor> configure) => Set(configure, "match_phrase");
-		public void MatchPhrase<TDocument>(Action<MatchPhraseQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase");
-		public void MatchPhrasePrefix(MatchPhrasePrefixQuery query) => Set(query, "match_phrase_prefix");
-		public void MatchPhrasePrefix(Action<MatchPhrasePrefixQueryDescriptor> configure) => Set(configure, "match_phrase_prefix");
-		public void MatchPhrasePrefix<TDocument>(Action<MatchPhrasePrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase_prefix");
-		public void MoreLikeThis(MoreLikeThisQuery query) => Set(query, "more_like_this");
-		public void MoreLikeThis(Action<MoreLikeThisQueryDescriptor> configure) => Set(configure, "more_like_this");
-		public void MoreLikeThis<TDocument>(Action<MoreLikeThisQueryDescriptor<TDocument>> configure) => Set(configure, "more_like_this");
-		public void MultiMatch(MultiMatchQuery query) => Set(query, "multi_match");
-		public void MultiMatch(Action<MultiMatchQueryDescriptor> configure) => Set(configure, "multi_match");
-		public void MultiMatch<TDocument>(Action<MultiMatchQueryDescriptor<TDocument>> configure) => Set(configure, "multi_match");
-		public void Nested(NestedQuery query) => Set(query, "nested");
-		public void Nested(Action<NestedQueryDescriptor> configure) => Set(configure, "nested");
-		public void Nested<TDocument>(Action<NestedQueryDescriptor<TDocument>> configure) => Set(configure, "nested");
-		public void ParentId(ParentIdQuery query) => Set(query, "parent_id");
-		public void ParentId(Action<ParentIdQueryDescriptor> configure) => Set(configure, "parent_id");
-		public void Percolate(PercolateQuery query) => Set(query, "percolate");
-		public void Percolate(Action<PercolateQueryDescriptor> configure) => Set(configure, "percolate");
-		public void Percolate<TDocument>(Action<PercolateQueryDescriptor<TDocument>> configure) => Set(configure, "percolate");
-		public void Prefix(PrefixQuery query) => Set(query, "prefix");
-		public void Prefix(Action<PrefixQueryDescriptor> configure) => Set(configure, "prefix");
-		public void Prefix<TDocument>(Action<PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
-		public void QueryString(QueryStringQuery query) => Set(query, "query_string");
-		public void QueryString(Action<QueryStringQueryDescriptor> configure) => Set(configure, "query_string");
-		public void QueryString<TDocument>(Action<QueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "query_string");
-		public void Range(RangeQuery query) => Set(query, "range");
-		public void RankFeature(RankFeatureQuery query) => Set(query, "rank_feature");
-		public void RankFeature(Action<RankFeatureQueryDescriptor> configure) => Set(configure, "rank_feature");
-		public void RankFeature<TDocument>(Action<RankFeatureQueryDescriptor<TDocument>> configure) => Set(configure, "rank_feature");
-		public void Regexp(RegexpQuery query) => Set(query, "regexp");
-		public void Regexp(Action<RegexpQueryDescriptor> configure) => Set(configure, "regexp");
-		public void Regexp<TDocument>(Action<RegexpQueryDescriptor<TDocument>> configure) => Set(configure, "regexp");
-		public void Script(ScriptQuery query) => Set(query, "script");
-		public void Script(Action<ScriptQueryDescriptor> configure) => Set(configure, "script");
-		public void ScriptScore(ScriptScoreQuery query) => Set(query, "script_score");
-		public void ScriptScore(Action<ScriptScoreQueryDescriptor> configure) => Set(configure, "script_score");
-		public void ScriptScore<TDocument>(Action<ScriptScoreQueryDescriptor<TDocument>> configure) => Set(configure, "script_score");
-		public void Shape(ShapeQuery query) => Set(query, "shape");
-		public void Shape(Action<ShapeQueryDescriptor> configure) => Set(configure, "shape");
-		public void Shape<TDocument>(Action<ShapeQueryDescriptor<TDocument>> configure) => Set(configure, "shape");
-		public void SimpleQueryString(SimpleQueryStringQuery query) => Set(query, "simple_query_string");
-		public void SimpleQueryString(Action<SimpleQueryStringQueryDescriptor> configure) => Set(configure, "simple_query_string");
-		public void SimpleQueryString<TDocument>(Action<SimpleQueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "simple_query_string");
-		public void SpanContaining(SpanContainingQuery query) => Set(query, "span_containing");
-		public void SpanContaining(Action<SpanContainingQueryDescriptor> configure) => Set(configure, "span_containing");
-		public void SpanContaining<TDocument>(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
-		public void SpanFirst(SpanFirstQuery query) => Set(query, "span_first");
-		public void SpanFirst(Action<SpanFirstQueryDescriptor> configure) => Set(configure, "span_first");
-		public void SpanFirst<TDocument>(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
-		public void SpanMulti(SpanMultiTermQuery query) => Set(query, "span_multi");
-		public void SpanMulti(Action<SpanMultiTermQueryDescriptor> configure) => Set(configure, "span_multi");
-		public void SpanMulti<TDocument>(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
-		public void SpanNear(SpanNearQuery query) => Set(query, "span_near");
-		public void SpanNear(Action<SpanNearQueryDescriptor> configure) => Set(configure, "span_near");
-		public void SpanNear<TDocument>(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
-		public void SpanNot(SpanNotQuery query) => Set(query, "span_not");
-		public void SpanNot(Action<SpanNotQueryDescriptor> configure) => Set(configure, "span_not");
-		public void SpanNot<TDocument>(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
-		public void SpanOr(SpanOrQuery query) => Set(query, "span_or");
-		public void SpanOr(Action<SpanOrQueryDescriptor> configure) => Set(configure, "span_or");
-		public void SpanOr<TDocument>(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
-		public void SpanTerm(SpanTermQuery query) => Set(query, "span_term");
-		public void SpanTerm(Action<SpanTermQueryDescriptor> configure) => Set(configure, "span_term");
-		public void SpanTerm<TDocument>(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
-		public void SpanWithin(SpanWithinQuery query) => Set(query, "span_within");
-		public void SpanWithin(Action<SpanWithinQueryDescriptor> configure) => Set(configure, "span_within");
-		public void SpanWithin<TDocument>(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
-		public void Term(TermQuery query) => Set(query, "term");
-		public void Term(Action<TermQueryDescriptor> configure) => Set(configure, "term");
-		public void Term<TDocument>(Action<TermQueryDescriptor<TDocument>> configure) => Set(configure, "term");
-		public void Terms(TermsQuery query) => Set(query, "terms");
-		public void Terms(Action<TermsQueryDescriptor> configure) => Set(configure, "terms");
-		public void Terms<TDocument>(Action<TermsQueryDescriptor<TDocument>> configure) => Set(configure, "terms");
-		public void TermsSet(TermsSetQuery query) => Set(query, "terms_set");
-		public void TermsSet(Action<TermsSetQueryDescriptor> configure) => Set(configure, "terms_set");
-		public void TermsSet<TDocument>(Action<TermsSetQueryDescriptor<TDocument>> configure) => Set(configure, "terms_set");
-		public void Wildcard(WildcardQuery query) => Set(query, "wildcard");
-		public void Wildcard(Action<WildcardQueryDescriptor> configure) => Set(configure, "wildcard");
-		public void Wildcard<TDocument>(Action<WildcardQueryDescriptor<TDocument>> configure) => Set(configure, "wildcard");
-		public void Wrapper(WrapperQuery query) => Set(query, "wrapper");
-		public void Wrapper(Action<WrapperQueryDescriptor> configure) => Set(configure, "wrapper");
+		public QueryContainerDescriptor Bool(BoolQuery query) => Set(query, "bool");
+		public QueryContainerDescriptor Bool(Action<BoolQueryDescriptor> configure) => Set(configure, "bool");
+		public QueryContainerDescriptor Bool<TDocument>(Action<BoolQueryDescriptor<TDocument>> configure) => Set(configure, "bool");
+		public QueryContainerDescriptor Boosting(BoostingQuery query) => Set(query, "boosting");
+		public QueryContainerDescriptor Boosting(Action<BoostingQueryDescriptor> configure) => Set(configure, "boosting");
+		public QueryContainerDescriptor Boosting<TDocument>(Action<BoostingQueryDescriptor<TDocument>> configure) => Set(configure, "boosting");
+		public QueryContainerDescriptor CombinedFields(CombinedFieldsQuery query) => Set(query, "combined_fields");
+		public QueryContainerDescriptor CombinedFields(Action<CombinedFieldsQueryDescriptor> configure) => Set(configure, "combined_fields");
+		public QueryContainerDescriptor CombinedFields<TDocument>(Action<CombinedFieldsQueryDescriptor<TDocument>> configure) => Set(configure, "combined_fields");
+		public QueryContainerDescriptor ConstantScore(ConstantScoreQuery query) => Set(query, "constant_score");
+		public QueryContainerDescriptor ConstantScore(Action<ConstantScoreQueryDescriptor> configure) => Set(configure, "constant_score");
+		public QueryContainerDescriptor ConstantScore<TDocument>(Action<ConstantScoreQueryDescriptor<TDocument>> configure) => Set(configure, "constant_score");
+		public QueryContainerDescriptor DisMax(DisMaxQuery query) => Set(query, "dis_max");
+		public QueryContainerDescriptor DisMax(Action<DisMaxQueryDescriptor> configure) => Set(configure, "dis_max");
+		public QueryContainerDescriptor DisMax<TDocument>(Action<DisMaxQueryDescriptor<TDocument>> configure) => Set(configure, "dis_max");
+		public QueryContainerDescriptor Exists(ExistsQuery query) => Set(query, "exists");
+		public QueryContainerDescriptor Exists(Action<ExistsQueryDescriptor> configure) => Set(configure, "exists");
+		public QueryContainerDescriptor Exists<TDocument>(Action<ExistsQueryDescriptor<TDocument>> configure) => Set(configure, "exists");
+		public QueryContainerDescriptor FieldMaskingSpan(SpanFieldMaskingQuery query) => Set(query, "field_masking_span");
+		public QueryContainerDescriptor FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor> configure) => Set(configure, "field_masking_span");
+		public QueryContainerDescriptor FieldMaskingSpan<TDocument>(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
+		public QueryContainerDescriptor FunctionScore(FunctionScoreQuery query) => Set(query, "function_score");
+		public QueryContainerDescriptor FunctionScore(Action<FunctionScoreQueryDescriptor> configure) => Set(configure, "function_score");
+		public QueryContainerDescriptor FunctionScore<TDocument>(Action<FunctionScoreQueryDescriptor<TDocument>> configure) => Set(configure, "function_score");
+		public QueryContainerDescriptor Fuzzy(FuzzyQuery query) => Set(query, "fuzzy");
+		public QueryContainerDescriptor Fuzzy(Action<FuzzyQueryDescriptor> configure) => Set(configure, "fuzzy");
+		public QueryContainerDescriptor Fuzzy<TDocument>(Action<FuzzyQueryDescriptor<TDocument>> configure) => Set(configure, "fuzzy");
+		public QueryContainerDescriptor GeoBoundingBox(GeoBoundingBoxQuery query) => Set(query, "geo_bounding_box");
+		public QueryContainerDescriptor GeoBoundingBox(Action<GeoBoundingBoxQueryDescriptor> configure) => Set(configure, "geo_bounding_box");
+		public QueryContainerDescriptor GeoBoundingBox<TDocument>(Action<GeoBoundingBoxQueryDescriptor<TDocument>> configure) => Set(configure, "geo_bounding_box");
+		public QueryContainerDescriptor GeoDistance(GeoDistanceQuery query) => Set(query, "geo_distance");
+		public QueryContainerDescriptor GeoDistance(Action<GeoDistanceQueryDescriptor> configure) => Set(configure, "geo_distance");
+		public QueryContainerDescriptor GeoDistance<TDocument>(Action<GeoDistanceQueryDescriptor<TDocument>> configure) => Set(configure, "geo_distance");
+		public QueryContainerDescriptor GeoPolygon(GeoPolygonQuery query) => Set(query, "geo_polygon");
+		public QueryContainerDescriptor GeoPolygon(Action<GeoPolygonQueryDescriptor> configure) => Set(configure, "geo_polygon");
+		public QueryContainerDescriptor GeoPolygon<TDocument>(Action<GeoPolygonQueryDescriptor<TDocument>> configure) => Set(configure, "geo_polygon");
+		public QueryContainerDescriptor GeoShape(GeoShapeQuery query) => Set(query, "geo_shape");
+		public QueryContainerDescriptor GeoShape(Action<GeoShapeQueryDescriptor> configure) => Set(configure, "geo_shape");
+		public QueryContainerDescriptor GeoShape<TDocument>(Action<GeoShapeQueryDescriptor<TDocument>> configure) => Set(configure, "geo_shape");
+		public QueryContainerDescriptor HasChild(HasChildQuery query) => Set(query, "has_child");
+		public QueryContainerDescriptor HasChild(Action<HasChildQueryDescriptor> configure) => Set(configure, "has_child");
+		public QueryContainerDescriptor HasChild<TDocument>(Action<HasChildQueryDescriptor<TDocument>> configure) => Set(configure, "has_child");
+		public QueryContainerDescriptor HasParent(HasParentQuery query) => Set(query, "has_parent");
+		public QueryContainerDescriptor HasParent(Action<HasParentQueryDescriptor> configure) => Set(configure, "has_parent");
+		public QueryContainerDescriptor HasParent<TDocument>(Action<HasParentQueryDescriptor<TDocument>> configure) => Set(configure, "has_parent");
+		public QueryContainerDescriptor Ids(IdsQuery query) => Set(query, "ids");
+		public QueryContainerDescriptor Ids(Action<IdsQueryDescriptor> configure) => Set(configure, "ids");
+		public QueryContainerDescriptor Intervals(IntervalsQuery query) => Set(query, "intervals");
+		public QueryContainerDescriptor Intervals(Action<IntervalsQueryDescriptor> configure) => Set(configure, "intervals");
+		public QueryContainerDescriptor Intervals<TDocument>(Action<IntervalsQueryDescriptor<TDocument>> configure) => Set(configure, "intervals");
+		public QueryContainerDescriptor Match(MatchQuery query) => Set(query, "match");
+		public QueryContainerDescriptor Match(Action<MatchQueryDescriptor> configure) => Set(configure, "match");
+		public QueryContainerDescriptor Match<TDocument>(Action<MatchQueryDescriptor<TDocument>> configure) => Set(configure, "match");
+		public QueryContainerDescriptor MatchAll(MatchAllQuery query) => Set(query, "match_all");
+		public QueryContainerDescriptor MatchAll(Action<MatchAllQueryDescriptor> configure) => Set(configure, "match_all");
+		public QueryContainerDescriptor MatchBoolPrefix(MatchBoolPrefixQuery query) => Set(query, "match_bool_prefix");
+		public QueryContainerDescriptor MatchBoolPrefix(Action<MatchBoolPrefixQueryDescriptor> configure) => Set(configure, "match_bool_prefix");
+		public QueryContainerDescriptor MatchBoolPrefix<TDocument>(Action<MatchBoolPrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_bool_prefix");
+		public QueryContainerDescriptor MatchNone(MatchNoneQuery query) => Set(query, "match_none");
+		public QueryContainerDescriptor MatchNone(Action<MatchNoneQueryDescriptor> configure) => Set(configure, "match_none");
+		public QueryContainerDescriptor MatchPhrase(MatchPhraseQuery query) => Set(query, "match_phrase");
+		public QueryContainerDescriptor MatchPhrase(Action<MatchPhraseQueryDescriptor> configure) => Set(configure, "match_phrase");
+		public QueryContainerDescriptor MatchPhrase<TDocument>(Action<MatchPhraseQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase");
+		public QueryContainerDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery query) => Set(query, "match_phrase_prefix");
+		public QueryContainerDescriptor MatchPhrasePrefix(Action<MatchPhrasePrefixQueryDescriptor> configure) => Set(configure, "match_phrase_prefix");
+		public QueryContainerDescriptor MatchPhrasePrefix<TDocument>(Action<MatchPhrasePrefixQueryDescriptor<TDocument>> configure) => Set(configure, "match_phrase_prefix");
+		public QueryContainerDescriptor MoreLikeThis(MoreLikeThisQuery query) => Set(query, "more_like_this");
+		public QueryContainerDescriptor MoreLikeThis(Action<MoreLikeThisQueryDescriptor> configure) => Set(configure, "more_like_this");
+		public QueryContainerDescriptor MoreLikeThis<TDocument>(Action<MoreLikeThisQueryDescriptor<TDocument>> configure) => Set(configure, "more_like_this");
+		public QueryContainerDescriptor MultiMatch(MultiMatchQuery query) => Set(query, "multi_match");
+		public QueryContainerDescriptor MultiMatch(Action<MultiMatchQueryDescriptor> configure) => Set(configure, "multi_match");
+		public QueryContainerDescriptor MultiMatch<TDocument>(Action<MultiMatchQueryDescriptor<TDocument>> configure) => Set(configure, "multi_match");
+		public QueryContainerDescriptor Nested(NestedQuery query) => Set(query, "nested");
+		public QueryContainerDescriptor Nested(Action<NestedQueryDescriptor> configure) => Set(configure, "nested");
+		public QueryContainerDescriptor Nested<TDocument>(Action<NestedQueryDescriptor<TDocument>> configure) => Set(configure, "nested");
+		public QueryContainerDescriptor ParentId(ParentIdQuery query) => Set(query, "parent_id");
+		public QueryContainerDescriptor ParentId(Action<ParentIdQueryDescriptor> configure) => Set(configure, "parent_id");
+		public QueryContainerDescriptor Percolate(PercolateQuery query) => Set(query, "percolate");
+		public QueryContainerDescriptor Percolate(Action<PercolateQueryDescriptor> configure) => Set(configure, "percolate");
+		public QueryContainerDescriptor Percolate<TDocument>(Action<PercolateQueryDescriptor<TDocument>> configure) => Set(configure, "percolate");
+		public QueryContainerDescriptor Prefix(PrefixQuery query) => Set(query, "prefix");
+		public QueryContainerDescriptor Prefix(Action<PrefixQueryDescriptor> configure) => Set(configure, "prefix");
+		public QueryContainerDescriptor Prefix<TDocument>(Action<PrefixQueryDescriptor<TDocument>> configure) => Set(configure, "prefix");
+		public QueryContainerDescriptor QueryString(QueryStringQuery query) => Set(query, "query_string");
+		public QueryContainerDescriptor QueryString(Action<QueryStringQueryDescriptor> configure) => Set(configure, "query_string");
+		public QueryContainerDescriptor QueryString<TDocument>(Action<QueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "query_string");
+		public QueryContainerDescriptor Range(RangeQuery query) => Set(query, "range");
+		public QueryContainerDescriptor RankFeature(RankFeatureQuery query) => Set(query, "rank_feature");
+		public QueryContainerDescriptor RankFeature(Action<RankFeatureQueryDescriptor> configure) => Set(configure, "rank_feature");
+		public QueryContainerDescriptor RankFeature<TDocument>(Action<RankFeatureQueryDescriptor<TDocument>> configure) => Set(configure, "rank_feature");
+		public QueryContainerDescriptor Regexp(RegexpQuery query) => Set(query, "regexp");
+		public QueryContainerDescriptor Regexp(Action<RegexpQueryDescriptor> configure) => Set(configure, "regexp");
+		public QueryContainerDescriptor Regexp<TDocument>(Action<RegexpQueryDescriptor<TDocument>> configure) => Set(configure, "regexp");
+		public QueryContainerDescriptor Script(ScriptQuery query) => Set(query, "script");
+		public QueryContainerDescriptor Script(Action<ScriptQueryDescriptor> configure) => Set(configure, "script");
+		public QueryContainerDescriptor ScriptScore(ScriptScoreQuery query) => Set(query, "script_score");
+		public QueryContainerDescriptor ScriptScore(Action<ScriptScoreQueryDescriptor> configure) => Set(configure, "script_score");
+		public QueryContainerDescriptor ScriptScore<TDocument>(Action<ScriptScoreQueryDescriptor<TDocument>> configure) => Set(configure, "script_score");
+		public QueryContainerDescriptor Shape(ShapeQuery query) => Set(query, "shape");
+		public QueryContainerDescriptor Shape(Action<ShapeQueryDescriptor> configure) => Set(configure, "shape");
+		public QueryContainerDescriptor Shape<TDocument>(Action<ShapeQueryDescriptor<TDocument>> configure) => Set(configure, "shape");
+		public QueryContainerDescriptor SimpleQueryString(SimpleQueryStringQuery query) => Set(query, "simple_query_string");
+		public QueryContainerDescriptor SimpleQueryString(Action<SimpleQueryStringQueryDescriptor> configure) => Set(configure, "simple_query_string");
+		public QueryContainerDescriptor SimpleQueryString<TDocument>(Action<SimpleQueryStringQueryDescriptor<TDocument>> configure) => Set(configure, "simple_query_string");
+		public QueryContainerDescriptor SpanContaining(SpanContainingQuery query) => Set(query, "span_containing");
+		public QueryContainerDescriptor SpanContaining(Action<SpanContainingQueryDescriptor> configure) => Set(configure, "span_containing");
+		public QueryContainerDescriptor SpanContaining<TDocument>(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
+		public QueryContainerDescriptor SpanFirst(SpanFirstQuery query) => Set(query, "span_first");
+		public QueryContainerDescriptor SpanFirst(Action<SpanFirstQueryDescriptor> configure) => Set(configure, "span_first");
+		public QueryContainerDescriptor SpanFirst<TDocument>(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
+		public QueryContainerDescriptor SpanMulti(SpanMultiTermQuery query) => Set(query, "span_multi");
+		public QueryContainerDescriptor SpanMulti(Action<SpanMultiTermQueryDescriptor> configure) => Set(configure, "span_multi");
+		public QueryContainerDescriptor SpanMulti<TDocument>(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
+		public QueryContainerDescriptor SpanNear(SpanNearQuery query) => Set(query, "span_near");
+		public QueryContainerDescriptor SpanNear(Action<SpanNearQueryDescriptor> configure) => Set(configure, "span_near");
+		public QueryContainerDescriptor SpanNear<TDocument>(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
+		public QueryContainerDescriptor SpanNot(SpanNotQuery query) => Set(query, "span_not");
+		public QueryContainerDescriptor SpanNot(Action<SpanNotQueryDescriptor> configure) => Set(configure, "span_not");
+		public QueryContainerDescriptor SpanNot<TDocument>(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
+		public QueryContainerDescriptor SpanOr(SpanOrQuery query) => Set(query, "span_or");
+		public QueryContainerDescriptor SpanOr(Action<SpanOrQueryDescriptor> configure) => Set(configure, "span_or");
+		public QueryContainerDescriptor SpanOr<TDocument>(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
+		public QueryContainerDescriptor SpanTerm(SpanTermQuery query) => Set(query, "span_term");
+		public QueryContainerDescriptor SpanTerm(Action<SpanTermQueryDescriptor> configure) => Set(configure, "span_term");
+		public QueryContainerDescriptor SpanTerm<TDocument>(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
+		public QueryContainerDescriptor SpanWithin(SpanWithinQuery query) => Set(query, "span_within");
+		public QueryContainerDescriptor SpanWithin(Action<SpanWithinQueryDescriptor> configure) => Set(configure, "span_within");
+		public QueryContainerDescriptor SpanWithin<TDocument>(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
+		public QueryContainerDescriptor Term(TermQuery query) => Set(query, "term");
+		public QueryContainerDescriptor Term(Action<TermQueryDescriptor> configure) => Set(configure, "term");
+		public QueryContainerDescriptor Term<TDocument>(Action<TermQueryDescriptor<TDocument>> configure) => Set(configure, "term");
+		public QueryContainerDescriptor Terms(TermsQuery query) => Set(query, "terms");
+		public QueryContainerDescriptor Terms(Action<TermsQueryDescriptor> configure) => Set(configure, "terms");
+		public QueryContainerDescriptor Terms<TDocument>(Action<TermsQueryDescriptor<TDocument>> configure) => Set(configure, "terms");
+		public QueryContainerDescriptor TermsSet(TermsSetQuery query) => Set(query, "terms_set");
+		public QueryContainerDescriptor TermsSet(Action<TermsSetQueryDescriptor> configure) => Set(configure, "terms_set");
+		public QueryContainerDescriptor TermsSet<TDocument>(Action<TermsSetQueryDescriptor<TDocument>> configure) => Set(configure, "terms_set");
+		public QueryContainerDescriptor Wildcard(WildcardQuery query) => Set(query, "wildcard");
+		public QueryContainerDescriptor Wildcard(Action<WildcardQueryDescriptor> configure) => Set(configure, "wildcard");
+		public QueryContainerDescriptor Wildcard<TDocument>(Action<WildcardQueryDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+		public QueryContainerDescriptor Wrapper(WrapperQuery query) => Set(query, "wrapper");
+		public QueryContainerDescriptor Wrapper(Action<WrapperQueryDescriptor> configure) => Set(configure, "wrapper");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
index 6577dd79255..05b5dc28f50 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
@@ -191,45 +191,43 @@ public SpanQueryDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private SpanQueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the SpanQueryDescriptor. Only a single SpanQuery variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private SpanQueryDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the SpanQueryDescriptor. Only a single SpanQuery variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void FieldMaskingSpan(SpanFieldMaskingQuery variant) => Set(variant, "field_masking_span");
-		public void FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
-		public void SpanContaining(SpanContainingQuery variant) => Set(variant, "span_containing");
-		public void SpanContaining(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
-		public void SpanFirst(SpanFirstQuery variant) => Set(variant, "span_first");
-		public void SpanFirst(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
-		public void SpanMulti(SpanMultiTermQuery variant) => Set(variant, "span_multi");
-		public void SpanMulti(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
-		public void SpanNear(SpanNearQuery variant) => Set(variant, "span_near");
-		public void SpanNear(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
-		public void SpanNot(SpanNotQuery variant) => Set(variant, "span_not");
-		public void SpanNot(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
-		public void SpanOr(SpanOrQuery variant) => Set(variant, "span_or");
-		public void SpanOr(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
-		public void SpanTerm(SpanTermQuery variant) => Set(variant, "span_term");
-		public void SpanTerm(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
-		public void SpanWithin(SpanWithinQuery variant) => Set(variant, "span_within");
-		public void SpanWithin(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
+		public SpanQueryDescriptor<TDocument> FieldMaskingSpan(SpanFieldMaskingQuery variant) => Set(variant, "field_masking_span");
+		public SpanQueryDescriptor<TDocument> FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
+		public SpanQueryDescriptor<TDocument> SpanContaining(SpanContainingQuery variant) => Set(variant, "span_containing");
+		public SpanQueryDescriptor<TDocument> SpanContaining(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
+		public SpanQueryDescriptor<TDocument> SpanFirst(SpanFirstQuery variant) => Set(variant, "span_first");
+		public SpanQueryDescriptor<TDocument> SpanFirst(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
+		public SpanQueryDescriptor<TDocument> SpanMulti(SpanMultiTermQuery variant) => Set(variant, "span_multi");
+		public SpanQueryDescriptor<TDocument> SpanMulti(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
+		public SpanQueryDescriptor<TDocument> SpanNear(SpanNearQuery variant) => Set(variant, "span_near");
+		public SpanQueryDescriptor<TDocument> SpanNear(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
+		public SpanQueryDescriptor<TDocument> SpanNot(SpanNotQuery variant) => Set(variant, "span_not");
+		public SpanQueryDescriptor<TDocument> SpanNot(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
+		public SpanQueryDescriptor<TDocument> SpanOr(SpanOrQuery variant) => Set(variant, "span_or");
+		public SpanQueryDescriptor<TDocument> SpanOr(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
+		public SpanQueryDescriptor<TDocument> SpanTerm(SpanTermQuery variant) => Set(variant, "span_term");
+		public SpanQueryDescriptor<TDocument> SpanTerm(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
+		public SpanQueryDescriptor<TDocument> SpanWithin(SpanWithinQuery variant) => Set(variant, "span_within");
+		public SpanQueryDescriptor<TDocument> SpanWithin(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -268,54 +266,52 @@ public SpanQueryDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private SpanQueryDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the SpanQueryDescriptor. Only a single SpanQuery variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private SpanQueryDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the SpanQueryDescriptor. Only a single SpanQuery variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void FieldMaskingSpan(SpanFieldMaskingQuery variant) => Set(variant, "field_masking_span");
-		public void FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor> configure) => Set(configure, "field_masking_span");
-		public void FieldMaskingSpan<TDocument>(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
-		public void SpanContaining(SpanContainingQuery variant) => Set(variant, "span_containing");
-		public void SpanContaining(Action<SpanContainingQueryDescriptor> configure) => Set(configure, "span_containing");
-		public void SpanContaining<TDocument>(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
-		public void SpanFirst(SpanFirstQuery variant) => Set(variant, "span_first");
-		public void SpanFirst(Action<SpanFirstQueryDescriptor> configure) => Set(configure, "span_first");
-		public void SpanFirst<TDocument>(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
-		public void SpanMulti(SpanMultiTermQuery variant) => Set(variant, "span_multi");
-		public void SpanMulti(Action<SpanMultiTermQueryDescriptor> configure) => Set(configure, "span_multi");
-		public void SpanMulti<TDocument>(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
-		public void SpanNear(SpanNearQuery variant) => Set(variant, "span_near");
-		public void SpanNear(Action<SpanNearQueryDescriptor> configure) => Set(configure, "span_near");
-		public void SpanNear<TDocument>(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
-		public void SpanNot(SpanNotQuery variant) => Set(variant, "span_not");
-		public void SpanNot(Action<SpanNotQueryDescriptor> configure) => Set(configure, "span_not");
-		public void SpanNot<TDocument>(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
-		public void SpanOr(SpanOrQuery variant) => Set(variant, "span_or");
-		public void SpanOr(Action<SpanOrQueryDescriptor> configure) => Set(configure, "span_or");
-		public void SpanOr<TDocument>(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
-		public void SpanTerm(SpanTermQuery variant) => Set(variant, "span_term");
-		public void SpanTerm(Action<SpanTermQueryDescriptor> configure) => Set(configure, "span_term");
-		public void SpanTerm<TDocument>(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
-		public void SpanWithin(SpanWithinQuery variant) => Set(variant, "span_within");
-		public void SpanWithin(Action<SpanWithinQueryDescriptor> configure) => Set(configure, "span_within");
-		public void SpanWithin<TDocument>(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
+		public SpanQueryDescriptor FieldMaskingSpan(SpanFieldMaskingQuery variant) => Set(variant, "field_masking_span");
+		public SpanQueryDescriptor FieldMaskingSpan(Action<SpanFieldMaskingQueryDescriptor> configure) => Set(configure, "field_masking_span");
+		public SpanQueryDescriptor FieldMaskingSpan<TDocument>(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => Set(configure, "field_masking_span");
+		public SpanQueryDescriptor SpanContaining(SpanContainingQuery variant) => Set(variant, "span_containing");
+		public SpanQueryDescriptor SpanContaining(Action<SpanContainingQueryDescriptor> configure) => Set(configure, "span_containing");
+		public SpanQueryDescriptor SpanContaining<TDocument>(Action<SpanContainingQueryDescriptor<TDocument>> configure) => Set(configure, "span_containing");
+		public SpanQueryDescriptor SpanFirst(SpanFirstQuery variant) => Set(variant, "span_first");
+		public SpanQueryDescriptor SpanFirst(Action<SpanFirstQueryDescriptor> configure) => Set(configure, "span_first");
+		public SpanQueryDescriptor SpanFirst<TDocument>(Action<SpanFirstQueryDescriptor<TDocument>> configure) => Set(configure, "span_first");
+		public SpanQueryDescriptor SpanMulti(SpanMultiTermQuery variant) => Set(variant, "span_multi");
+		public SpanQueryDescriptor SpanMulti(Action<SpanMultiTermQueryDescriptor> configure) => Set(configure, "span_multi");
+		public SpanQueryDescriptor SpanMulti<TDocument>(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_multi");
+		public SpanQueryDescriptor SpanNear(SpanNearQuery variant) => Set(variant, "span_near");
+		public SpanQueryDescriptor SpanNear(Action<SpanNearQueryDescriptor> configure) => Set(configure, "span_near");
+		public SpanQueryDescriptor SpanNear<TDocument>(Action<SpanNearQueryDescriptor<TDocument>> configure) => Set(configure, "span_near");
+		public SpanQueryDescriptor SpanNot(SpanNotQuery variant) => Set(variant, "span_not");
+		public SpanQueryDescriptor SpanNot(Action<SpanNotQueryDescriptor> configure) => Set(configure, "span_not");
+		public SpanQueryDescriptor SpanNot<TDocument>(Action<SpanNotQueryDescriptor<TDocument>> configure) => Set(configure, "span_not");
+		public SpanQueryDescriptor SpanOr(SpanOrQuery variant) => Set(variant, "span_or");
+		public SpanQueryDescriptor SpanOr(Action<SpanOrQueryDescriptor> configure) => Set(configure, "span_or");
+		public SpanQueryDescriptor SpanOr<TDocument>(Action<SpanOrQueryDescriptor<TDocument>> configure) => Set(configure, "span_or");
+		public SpanQueryDescriptor SpanTerm(SpanTermQuery variant) => Set(variant, "span_term");
+		public SpanQueryDescriptor SpanTerm(Action<SpanTermQueryDescriptor> configure) => Set(configure, "span_term");
+		public SpanQueryDescriptor SpanTerm<TDocument>(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
+		public SpanQueryDescriptor SpanWithin(SpanWithinQuery variant) => Set(variant, "span_within");
+		public SpanQueryDescriptor SpanWithin(Action<SpanWithinQueryDescriptor> configure) => Set(configure, "span_within");
+		public SpanQueryDescriptor SpanWithin<TDocument>(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs
index b83cc2f663e..ea396d37c26 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs
@@ -169,35 +169,33 @@ public SortOptionsDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private SortOptionsDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the SortOptionsDescriptor. Only a single SortOptions variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private SortOptionsDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the SortOptionsDescriptor. Only a single SortOptions variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Doc(ScoreSort variant) => Set(variant, "_doc");
-		public void Doc(Action<ScoreSortDescriptor> configure) => Set(configure, "_doc");
-		public void GeoDistance(GeoDistanceSort variant) => Set(variant, "_geo_distance");
-		public void GeoDistance(Action<GeoDistanceSortDescriptor<TDocument>> configure) => Set(configure, "_geo_distance");
-		public void Score(ScoreSort variant) => Set(variant, "_score");
-		public void Score(Action<ScoreSortDescriptor> configure) => Set(configure, "_score");
-		public void Script(ScriptSort variant) => Set(variant, "_script");
-		public void Script(Action<ScriptSortDescriptor<TDocument>> configure) => Set(configure, "_script");
+		public SortOptionsDescriptor<TDocument> Doc(ScoreSort variant) => Set(variant, "_doc");
+		public SortOptionsDescriptor<TDocument> Doc(Action<ScoreSortDescriptor> configure) => Set(configure, "_doc");
+		public SortOptionsDescriptor<TDocument> GeoDistance(GeoDistanceSort variant) => Set(variant, "_geo_distance");
+		public SortOptionsDescriptor<TDocument> GeoDistance(Action<GeoDistanceSortDescriptor<TDocument>> configure) => Set(configure, "_geo_distance");
+		public SortOptionsDescriptor<TDocument> Score(ScoreSort variant) => Set(variant, "_score");
+		public SortOptionsDescriptor<TDocument> Score(Action<ScoreSortDescriptor> configure) => Set(configure, "_score");
+		public SortOptionsDescriptor<TDocument> Script(ScriptSort variant) => Set(variant, "_script");
+		public SortOptionsDescriptor<TDocument> Script(Action<ScriptSortDescriptor<TDocument>> configure) => Set(configure, "_script");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -236,37 +234,35 @@ public SortOptionsDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private SortOptionsDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the SortOptionsDescriptor. Only a single SortOptions variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private SortOptionsDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the SortOptionsDescriptor. Only a single SortOptions variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void Doc(ScoreSort variant) => Set(variant, "_doc");
-		public void Doc(Action<ScoreSortDescriptor> configure) => Set(configure, "_doc");
-		public void GeoDistance(GeoDistanceSort variant) => Set(variant, "_geo_distance");
-		public void GeoDistance(Action<GeoDistanceSortDescriptor> configure) => Set(configure, "_geo_distance");
-		public void GeoDistance<TDocument>(Action<GeoDistanceSortDescriptor<TDocument>> configure) => Set(configure, "_geo_distance");
-		public void Score(ScoreSort variant) => Set(variant, "_score");
-		public void Score(Action<ScoreSortDescriptor> configure) => Set(configure, "_score");
-		public void Script(ScriptSort variant) => Set(variant, "_script");
-		public void Script(Action<ScriptSortDescriptor> configure) => Set(configure, "_script");
-		public void Script<TDocument>(Action<ScriptSortDescriptor<TDocument>> configure) => Set(configure, "_script");
+		public SortOptionsDescriptor Doc(ScoreSort variant) => Set(variant, "_doc");
+		public SortOptionsDescriptor Doc(Action<ScoreSortDescriptor> configure) => Set(configure, "_doc");
+		public SortOptionsDescriptor GeoDistance(GeoDistanceSort variant) => Set(variant, "_geo_distance");
+		public SortOptionsDescriptor GeoDistance(Action<GeoDistanceSortDescriptor> configure) => Set(configure, "_geo_distance");
+		public SortOptionsDescriptor GeoDistance<TDocument>(Action<GeoDistanceSortDescriptor<TDocument>> configure) => Set(configure, "_geo_distance");
+		public SortOptionsDescriptor Score(ScoreSort variant) => Set(variant, "_score");
+		public SortOptionsDescriptor Score(Action<ScoreSortDescriptor> configure) => Set(configure, "_score");
+		public SortOptionsDescriptor Script(ScriptSort variant) => Set(variant, "_script");
+		public SortOptionsDescriptor Script(Action<ScriptSortDescriptor> configure) => Set(configure, "_script");
+		public SortOptionsDescriptor Script<TDocument>(Action<ScriptSortDescriptor<TDocument>> configure) => Set(configure, "_script");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs
index 5091ca65738..cfc18294db7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs
@@ -125,33 +125,31 @@ public PivotGroupByContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private PivotGroupByContainerDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the PivotGroupByContainerDescriptor. Only a single PivotGroupByContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private PivotGroupByContainerDescriptor<TDocument> Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the PivotGroupByContainerDescriptor. Only a single PivotGroupByContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void DateHistogram(Aggregations.DateHistogramAggregation variant) => Set(variant, "date_histogram");
-		public void DateHistogram(Action<Aggregations.DateHistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "date_histogram");
-		public void Histogram(Aggregations.HistogramAggregation variant) => Set(variant, "histogram");
-		public void Histogram(Action<Aggregations.HistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "histogram");
-		public void Terms(Aggregations.TermsAggregation variant) => Set(variant, "terms");
-		public void Terms(Action<Aggregations.TermsAggregationDescriptor<TDocument>> configure) => Set(configure, "terms");
+		public PivotGroupByContainerDescriptor<TDocument> DateHistogram(Aggregations.DateHistogramAggregation variant) => Set(variant, "date_histogram");
+		public PivotGroupByContainerDescriptor<TDocument> DateHistogram(Action<Aggregations.DateHistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "date_histogram");
+		public PivotGroupByContainerDescriptor<TDocument> Histogram(Aggregations.HistogramAggregation variant) => Set(variant, "histogram");
+		public PivotGroupByContainerDescriptor<TDocument> Histogram(Action<Aggregations.HistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "histogram");
+		public PivotGroupByContainerDescriptor<TDocument> Terms(Aggregations.TermsAggregation variant) => Set(variant, "terms");
+		public PivotGroupByContainerDescriptor<TDocument> Terms(Action<Aggregations.TermsAggregationDescriptor<TDocument>> configure) => Set(configure, "terms");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)
@@ -190,36 +188,34 @@ public PivotGroupByContainerDescriptor() : base()
 
 		private Descriptor Descriptor { get; set; }
 
-		private void Set<T>(Action<T> descriptorAction, string variantName)
+		private PivotGroupByContainerDescriptor Set<T>(Action<T> descriptorAction, string variantName)
 			where T : Descriptor
 		{
-			if (ContainsVariant)
-				throw new InvalidOperationException("A variant has already been assigned to the PivotGroupByContainerDescriptor. Only a single PivotGroupByContainer variant can be added to this container type.");
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
 			var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 			descriptorAction?.Invoke(descriptor);
 			Descriptor = descriptor;
+			return Self;
 		}
 
-		private void Set(object variant, string variantName)
+		private PivotGroupByContainerDescriptor Set(object variant, string variantName)
 		{
-			if (ContainsVariant)
-				throw new Exception("A variant has already been assigned to the PivotGroupByContainerDescriptor. Only a single PivotGroupByContainer variant can be added to this container type.");
 			Variant = variant;
 			ContainedVariantName = variantName;
 			ContainsVariant = true;
+			return Self;
 		}
 
-		public void DateHistogram(Aggregations.DateHistogramAggregation variant) => Set(variant, "date_histogram");
-		public void DateHistogram(Action<Aggregations.DateHistogramAggregationDescriptor> configure) => Set(configure, "date_histogram");
-		public void DateHistogram<TDocument>(Action<Aggregations.DateHistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "date_histogram");
-		public void Histogram(Aggregations.HistogramAggregation variant) => Set(variant, "histogram");
-		public void Histogram(Action<Aggregations.HistogramAggregationDescriptor> configure) => Set(configure, "histogram");
-		public void Histogram<TDocument>(Action<Aggregations.HistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "histogram");
-		public void Terms(Aggregations.TermsAggregation variant) => Set(variant, "terms");
-		public void Terms(Action<Aggregations.TermsAggregationDescriptor> configure) => Set(configure, "terms");
-		public void Terms<TDocument>(Action<Aggregations.TermsAggregationDescriptor<TDocument>> configure) => Set(configure, "terms");
+		public PivotGroupByContainerDescriptor DateHistogram(Aggregations.DateHistogramAggregation variant) => Set(variant, "date_histogram");
+		public PivotGroupByContainerDescriptor DateHistogram(Action<Aggregations.DateHistogramAggregationDescriptor> configure) => Set(configure, "date_histogram");
+		public PivotGroupByContainerDescriptor DateHistogram<TDocument>(Action<Aggregations.DateHistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "date_histogram");
+		public PivotGroupByContainerDescriptor Histogram(Aggregations.HistogramAggregation variant) => Set(variant, "histogram");
+		public PivotGroupByContainerDescriptor Histogram(Action<Aggregations.HistogramAggregationDescriptor> configure) => Set(configure, "histogram");
+		public PivotGroupByContainerDescriptor Histogram<TDocument>(Action<Aggregations.HistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "histogram");
+		public PivotGroupByContainerDescriptor Terms(Aggregations.TermsAggregation variant) => Set(variant, "terms");
+		public PivotGroupByContainerDescriptor Terms(Action<Aggregations.TermsAggregationDescriptor> configure) => Set(configure, "terms");
+		public PivotGroupByContainerDescriptor Terms<TDocument>(Action<Aggregations.TermsAggregationDescriptor<TDocument>> configure) => Set(configure, "terms");
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 			if (!ContainsVariant)