diff --git a/protos/generated/models/aggregated_models.proto b/protos/generated/models/aggregated_models.proto
index a7552f12fc1..80bb942c50b 100644
--- a/protos/generated/models/aggregated_models.proto
+++ b/protos/generated/models/aggregated_models.proto
@@ -367,14 +367,11 @@ message AggregationProfile {
 
   string description = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
+  string type = 3;
 
-  string type = 4;
+  optional AggregationProfileDebug debug = 4;
 
-  optional AggregationProfileDebug debug = 5;
-
-  repeated AggregationProfile children = 6;
+  repeated AggregationProfile children = 5;
 }
 message AggregationProfileDebug {
   optional int32 segments_with_multi_valued_ords = 1;
@@ -518,6 +515,7 @@ message AutoDateHistogramAggregation {
 
   optional MinimumInterval minimum_interval = 8;
 
+  // A date and time, either as a string whose format depends on the context (defaulting to ISO_8601) or the number of milliseconds since the epoch. OpenSearch accepts both as an input but will generally output a string. representation.
   optional string missing = 9;
 
   // Time zone specified as a ISO 8601 UTC offset.
@@ -880,10 +878,7 @@ message Collector {
 
   string reason = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
-
-  repeated Collector children = 4;
+  repeated Collector children = 3;
 }
 enum CombinedFieldsOperator {
   COMBINED_FIELDS_OPERATOR_UNSPECIFIED = 0;
@@ -1252,6 +1247,7 @@ message DateDecayPlacement {
   // A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and `d` (days). Also accepts `0` without a unit and `-1` to indicate an unspecified value.
   optional string offset = 2;
 
+  // A date and time, either as a string whose format depends on the context (defaulting to ISO_8601) or the number of milliseconds since the epoch. OpenSearch accepts both as an input but will generally output a string. representation.
   optional string origin = 3;
 
   // A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and `d` (days). Also accepts `0` without a unit and `-1` to indicate an unspecified value.
@@ -1296,6 +1292,7 @@ message DateHistogramAggregation {
   // Only returns buckets that have `min_doc_count` number of documents. By default, all buckets between the first bucket that matches documents and the last one are returned.
   optional int32 min_doc_count = 12;
 
+  // A date and time, either as a string whose format depends on the context (defaulting to ISO_8601) or the number of milliseconds since the epoch. OpenSearch accepts both as an input but will generally output a string. representation.
   optional string missing = 13;
 
   // A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and `d` (days). Also accepts `0` without a unit and `-1` to indicate an unspecified value.
@@ -1317,9 +1314,6 @@ message DateHistogramBucket {
   int64 doc_count = 1;
 
   optional string key_as_string = 2;
-
-  // The time unit for milliseconds.
-  int64 key = 3;
 }
 message DateRangeAggregate {
   // The custom metadata attached to a resource.
@@ -1412,14 +1406,6 @@ message DateRangeQueryAllOfTo {
     NullValue null_value = 2;
   }
 }
-message DateTime {
-  oneof date_time {
-    string string = 1;
-
-    // The time unit for milliseconds.
-    int64 int64 = 2;
-  }
-}
 enum Day {
   DAY_UNSPECIFIED = 0;
   DAY_DAY = 1;
@@ -1962,14 +1948,11 @@ message FetchProfile {
 
   string description = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
+  FetchProfileBreakdown breakdown = 3;
 
-  FetchProfileBreakdown breakdown = 4;
+  optional FetchProfileDebug debug = 4;
 
-  optional FetchProfileDebug debug = 5;
-
-  repeated FetchProfile children = 6;
+  repeated FetchProfile children = 5;
 }
 message FetchProfileBreakdown {
   optional int32 load_source = 1;
@@ -2065,11 +2048,11 @@ message FieldSuggester {
 
   optional string text = 3;
 
-  optional CompletionSuggester completion = 4;
-
-  optional PhraseSuggester phrase = 5;
-
-  optional TermSuggester term = 6;
+  oneof field_suggester {
+    CompletionSuggester completion = 4;
+    PhraseSuggester phrase = 5;
+    TermSuggester term = 6;
+  }
 }
 enum FieldType {
   FIELD_TYPE_UNSPECIFIED = 0;
@@ -2111,14 +2094,15 @@ enum FieldType {
   FIELD_TYPE_RANK_FEATURES = 36;
   FIELD_TYPE_SCALED_FLOAT = 37;
   FIELD_TYPE_SEARCH_AS_YOU_TYPE = 38;
-  FIELD_TYPE_SHORT = 39;
-  FIELD_TYPE_TEXT = 40;
-  FIELD_TYPE_TOKEN_COUNT = 41;
-  FIELD_TYPE_UNSIGNED_LONG = 42;
-  FIELD_TYPE_VERSION = 43;
-  FIELD_TYPE_WILDCARD = 44;
-  FIELD_TYPE_XY_POINT = 45;
-  FIELD_TYPE_XY_SHAPE = 46;
+  FIELD_TYPE_SEMANTIC = 39;
+  FIELD_TYPE_SHORT = 40;
+  FIELD_TYPE_TEXT = 41;
+  FIELD_TYPE_TOKEN_COUNT = 42;
+  FIELD_TYPE_UNSIGNED_LONG = 43;
+  FIELD_TYPE_VERSION = 44;
+  FIELD_TYPE_WILDCARD = 45;
+  FIELD_TYPE_XY_POINT = 46;
+  FIELD_TYPE_XY_SHAPE = 47;
 }
 message FieldValue {
   optional bool bool = 1;
@@ -3347,36 +3331,27 @@ message IntervalsAnyOf {
   optional IntervalsFilter filter = 2;
 }
 message IntervalsContainer {
-  optional IntervalsAllOf all_of = 1;
-
-  optional IntervalsAnyOf any_of = 2;
-
-  optional IntervalsFuzzy fuzzy = 3;
-
-  optional IntervalsMatch match = 4;
-
-  optional IntervalsPrefix prefix = 5;
-
-  optional IntervalsWildcard wildcard = 6;
+  oneof intervals_container {
+    IntervalsAllOf all_of = 1;
+    IntervalsAnyOf any_of = 2;
+    IntervalsFuzzy fuzzy = 3;
+    IntervalsMatch match = 4;
+    IntervalsPrefix prefix = 5;
+    IntervalsWildcard wildcard = 6;
+  }
 }
 message IntervalsFilter {
-  optional IntervalsContainer after = 1;
-
-  optional IntervalsContainer before = 2;
-
-  optional IntervalsContainer contained_by = 3;
-
-  optional IntervalsContainer containing = 4;
-
-  optional IntervalsContainer not_contained_by = 5;
-
-  optional IntervalsContainer not_containing = 6;
-
-  optional IntervalsContainer not_overlapping = 7;
-
-  optional IntervalsContainer overlapping = 8;
-
-  optional Script script = 9;
+  oneof intervals_filter {
+    IntervalsContainer after = 1;
+    IntervalsContainer before = 2;
+    IntervalsContainer contained_by = 3;
+    IntervalsContainer containing = 4;
+    IntervalsContainer not_contained_by = 5;
+    IntervalsContainer not_containing = 6;
+    IntervalsContainer not_overlapping = 7;
+    IntervalsContainer overlapping = 8;
+    Script script = 9;
+  }
 }
 message IntervalsFuzzy {
   // Analyzer used to normalize the term.
@@ -3430,19 +3405,16 @@ message IntervalsQuery {
 
   optional string x_name = 2;
 
-  optional IntervalsAllOf all_of = 3;
-
-  optional IntervalsAnyOf any_of = 4;
-
-  optional IntervalsFuzzy fuzzy = 5;
-
-  optional IntervalsMatch match = 6;
-
-  optional IntervalsPrefix prefix = 7;
-
-  optional IntervalsWildcard wildcard = 8;
-
   string field = 9;
+
+  oneof intervals_query {
+    IntervalsAllOf all_of = 3;
+    IntervalsAnyOf any_of = 4;
+    IntervalsFuzzy fuzzy = 5;
+    IntervalsMatch match = 6;
+    IntervalsPrefix prefix = 7;
+    IntervalsWildcard wildcard = 8;
+  }
 }
 message IntervalsWildcard {
   // Analyzer used to analyze the `pattern`. Defaults to the top-level field's analyzer.
@@ -3498,13 +3470,12 @@ message IpRangeBucket {
   optional string to = 4;
 }
 message Item {
-  optional ResponseItem index = 1;
-
-  optional ResponseItem create = 2;
-
-  optional ResponseItem update = 3;
-
-  optional ResponseItem delete = 4;
+  oneof item {
+    ResponseItem index = 1;
+    ResponseItem create = 2;
+    ResponseItem update = 3;
+    ResponseItem delete = 4;
+  }
 }
 message KeyedPercentilesValue {
   oneof keyed_percentiles_value {
@@ -3762,34 +3733,32 @@ message MatchQuery {
   // If `true`, match phrase queries are automatically created for multi-term synonyms.
   optional bool auto_generate_synonyms_phrase_query = 4;
 
-  optional float cutoff_frequency = 5;
-
-  optional Fuzziness fuzziness = 6;
+  optional Fuzziness fuzziness = 5;
 
-  optional MultiTermQueryRewrite fuzzy_rewrite = 7;
+  optional MultiTermQueryRewrite fuzzy_rewrite = 6;
 
   // If `true`, edits for fuzzy matching include transpositions of two adjacent characters (for example, `ab` to `ba`).
-  optional bool fuzzy_transpositions = 8;
+  optional bool fuzzy_transpositions = 7;
 
   // If `true`, format-based errors, such as providing a text query value for a numeric field, are ignored.
-  optional bool lenient = 9;
+  optional bool lenient = 8;
 
   // Maximum number of terms to which the query will expand.
-  optional int32 max_expansions = 10;
+  optional int32 max_expansions = 9;
 
-  optional MinimumShouldMatch minimum_should_match = 11;
+  optional MinimumShouldMatch minimum_should_match = 10;
 
-  optional Operator operator = 12;
+  optional Operator operator = 11;
 
   // Number of beginning characters left unchanged for fuzzy matching.
-  optional int32 prefix_length = 13;
+  optional int32 prefix_length = 12;
 
   // Text, number, Boolean value or date you wish to find in the provided field.
-  FieldValue query = 14;
+  FieldValue query = 13;
 
-  optional ZeroTermsQuery zero_terms_query = 15;
+  optional ZeroTermsQuery zero_terms_query = 14;
 
-  string field = 16;
+  string field = 15;
 }
 message MatrixAggregation {
   // The custom metadata attached to a resource.
@@ -4648,13 +4617,12 @@ message OperationBase {
   optional string x_index = 3;
 }
 message OperationContainer {
-  optional IndexOperation index = 1;
-
-  optional WriteOperation create = 2;
-
-  optional UpdateOperation update = 3;
-
-  optional DeleteOperation delete = 4;
+  oneof operation_container {
+    IndexOperation index = 1;
+    WriteOperation create = 2;
+    UpdateOperation update = 3;
+    DeleteOperation delete = 4;
+  }
 }
 enum Operator {
   OPERATOR_UNSPECIFIED = 0;
@@ -4914,12 +4882,6 @@ message PinnedQuery {
   optional string x_name = 2;
 
   QueryContainer organic = 3;
-
-  // Document IDs listed in the order they are to appear in results. Required if `docs` is not specified.
-  repeated string ids = 4;
-
-  // Documents listed in the order they are to appear in results. Required if `ids` is not specified.
-  repeated PinnedDoc docs = 5;
 }
 message PipelineAggregationBase {
   // The custom metadata attached to a resource.
@@ -5024,148 +4986,90 @@ message QueryBreakdown {
   int64 set_min_competitive_score_count = 18;
 }
 message QueryContainer {
-  optional BoolQuery bool = 1;
-
-  optional BoostingQuery boosting = 2;
-
-  optional CommonTermsQuery common = 3;
-
-  optional CombinedFieldsQuery combined_fields = 4;
-
-  optional ConstantScoreQuery constant_score = 5;
-
-  optional DisMaxQuery dis_max = 6;
-
-  optional DistanceFeatureQuery distance_feature = 7;
-
-  optional ExistsQuery exists = 8;
-
-  optional FunctionScoreQuery function_score = 9;
-
-  // Returns documents that contain terms similar to the search term, as measured by a Levenshtein edit distance.
-  optional FuzzyQuery fuzzy = 10;
-
-  optional GeoBoundingBoxQuery geo_bounding_box = 11;
-
-  optional GeoDistanceQuery geo_distance = 12;
-
-  optional GeoPolygonQuery geo_polygon = 13;
-
-  optional GeoShapeQuery geo_shape = 14;
-
-  optional HasChildQuery has_child = 15;
-
-  optional HasParentQuery has_parent = 16;
-
-  optional HybridQuery hybrid = 17;
-
-  optional IdsQuery ids = 18;
-
-  // Returns documents based on the order and proximity of matching terms.
-  optional IntervalsQuery intervals = 19;
-
-  optional KnnQuery knn = 20;
-
-  // Returns documents that match a provided text, number, date or Boolean value. The provided text is analyzed before matching.
-  optional MatchQuery match = 21;
-
-  optional MatchAllQuery match_all = 22;
-
-  // Analyzes its input and constructs a `bool` query from the terms. Each term except the last is used in a `term` query. The last term is used in a prefix query.
-  optional MatchBoolPrefixQuery match_bool_prefix = 23;
-
-  optional MatchNoneQuery match_none = 24;
-
-  // Analyzes the text and creates a phrase query out of the analyzed text.
-  optional MatchPhraseQuery match_phrase = 25;
-
-  // Returns documents that contain the words of a provided text, in the same order as provided. The last term of the provided text is treated as a prefix, matching any words that begin with that term.
-  optional MatchPhrasePrefixQuery match_phrase_prefix = 26;
-
-  optional MoreLikeThisQuery more_like_this = 27;
-
-  optional MultiMatchQuery multi_match = 28;
-
-  optional NestedQuery nested = 29;
-
-  optional NeuralQuery neural = 30;
-
-  optional ParentIdQuery parent_id = 31;
-
-  optional PercolateQuery percolate = 32;
-
-  optional PinnedQuery pinned = 33;
-
-  // Returns documents that contain a specific prefix in a provided field.
-  optional PrefixQuery prefix = 34;
-
-  optional QueryStringQuery query_string = 35;
-
-  // Returns documents that contain terms within a provided range.
-  optional RangeQuery range = 36;
-
-  optional RankFeatureQuery rank_feature = 37;
-
-  // Returns documents that contain terms matching a regular expression.
-  optional RegexpQuery regexp = 38;
-
-  optional ScriptQuery script = 39;
-
-  optional ScriptScoreQuery script_score = 40;
-
-  optional SimpleQueryStringQuery simple_query_string = 41;
-
-  optional SpanContainingQuery span_containing = 42;
-
-  optional SpanFieldMaskingQuery field_masking_span = 43;
-
-  optional SpanFirstQuery span_first = 44;
-
-  optional SpanMultiTermQuery span_multi = 45;
-
-  optional SpanNearQuery span_near = 46;
-
-  optional SpanNotQuery span_not = 47;
-
-  optional SpanOrQuery span_or = 48;
-
-  // Matches spans containing a term.
-  optional SpanTermQuery span_term = 49;
-
-  optional SpanWithinQuery span_within = 50;
-
-  // Return documents using a template query contains placeholders that are resolved by search request processors during query execution.
-  optional ObjectMap template = 51;
-
-  // Returns documents that contain an exact term in a provided field. To return a document, the query term must exactly match the queried field's value, including white space and capitalization.
-  optional TermQuery term = 52;
-
-  // Returns documents that contain one or more exact terms in a provided field.
-  optional TermsQuery terms = 53;
-
-  // Returns documents that contain a minimum number of exact terms in a provided field. To return a document, a required number of terms must exactly match the field values, including white space and capitalization.
-  optional TermsSetQuery terms_set = 54;
-
-  optional TypeQuery type = 55;
-
-  // Returns documents that contain terms matching a wildcard pattern.
-  optional WildcardQuery wildcard = 56;
-
-  optional WrapperQuery wrapper = 57;
-
-  optional XyShapeQuery xy_shape = 58;
+  oneof query_container {
+    BoolQuery bool = 1;
+    BoostingQuery boosting = 2;
+    CommonTermsQuery common = 3;
+    CombinedFieldsQuery combined_fields = 4;
+    ConstantScoreQuery constant_score = 5;
+    DisMaxQuery dis_max = 6;
+    DistanceFeatureQuery distance_feature = 7;
+    ExistsQuery exists = 8;
+    FunctionScoreQuery function_score = 9;
+    // Returns documents that contain terms similar to the search term, as measured by a Levenshtein edit distance.
+    FuzzyQuery fuzzy = 10;
+    GeoBoundingBoxQuery geo_bounding_box = 11;
+    GeoDistanceQuery geo_distance = 12;
+    GeoPolygonQuery geo_polygon = 13;
+    GeoShapeQuery geo_shape = 14;
+    HasChildQuery has_child = 15;
+    HasParentQuery has_parent = 16;
+    HybridQuery hybrid = 17;
+    IdsQuery ids = 18;
+    // Returns documents based on the order and proximity of matching terms.
+    IntervalsQuery intervals = 19;
+    KnnQuery knn = 20;
+    // Returns documents that match a provided text, number, date or Boolean value. The provided text is analyzed before matching.
+    MatchQuery match = 21;
+    MatchAllQuery match_all = 22;
+    // Analyzes its input and constructs a `bool` query from the terms. Each term except the last is used in a `term` query. The last term is used in a prefix query.
+    MatchBoolPrefixQuery match_bool_prefix = 23;
+    MatchNoneQuery match_none = 24;
+    // Analyzes the text and creates a phrase query out of the analyzed text.
+    MatchPhraseQuery match_phrase = 25;
+    // Returns documents that contain the words of a provided text, in the same order as provided. The last term of the provided text is treated as a prefix, matching any words that begin with that term.
+    MatchPhrasePrefixQuery match_phrase_prefix = 26;
+    MoreLikeThisQuery more_like_this = 27;
+    MultiMatchQuery multi_match = 28;
+    NestedQuery nested = 29;
+    NeuralQuery neural = 30;
+    ParentIdQuery parent_id = 31;
+    PercolateQuery percolate = 32;
+    PinnedQuery pinned = 33;
+    // Returns documents that contain a specific prefix in a provided field.
+    PrefixQuery prefix = 34;
+    QueryStringQuery query_string = 35;
+    // Returns documents that contain terms within a provided range.
+    RangeQuery range = 36;
+    RankFeatureQuery rank_feature = 37;
+    // Returns documents that contain terms matching a regular expression.
+    RegexpQuery regexp = 38;
+    ScriptQuery script = 39;
+    ScriptScoreQuery script_score = 40;
+    SimpleQueryStringQuery simple_query_string = 41;
+    SpanContainingQuery span_containing = 42;
+    SpanFieldMaskingQuery field_masking_span = 43;
+    SpanFirstQuery span_first = 44;
+    SpanMultiTermQuery span_multi = 45;
+    SpanNearQuery span_near = 46;
+    SpanNotQuery span_not = 47;
+    SpanOrQuery span_or = 48;
+    // Matches spans containing a term.
+    SpanTermQuery span_term = 49;
+    SpanWithinQuery span_within = 50;
+    // Return documents using a template query contains placeholders that are resolved by search request processors during query execution.
+    ObjectMap template = 51;
+    // Returns documents that contain an exact term in a provided field. To return a document, the query term must exactly match the queried field's value, including white space and capitalization.
+    TermQuery term = 52;
+    // Returns documents that contain one or more exact terms in a provided field.
+    TermsQuery terms = 53;
+    // Returns documents that contain a minimum number of exact terms in a provided field. To return a document, a required number of terms must exactly match the field values, including white space and capitalization.
+    TermsSetQuery terms_set = 54;
+    TypeQuery type = 55;
+    // Returns documents that contain terms matching a wildcard pattern.
+    WildcardQuery wildcard = 56;
+    WrapperQuery wrapper = 57;
+    XyShapeQuery xy_shape = 58;
+  }
 }
 message QueryProfile {
   QueryBreakdown breakdown = 1;
 
   string description = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
-
-  string type = 4;
+  string type = 3;
 
-  repeated QueryProfile children = 5;
+  repeated QueryProfile children = 4;
 }
 message QueryStringQuery {
   // Floating point number used to decrease or increase the relevance scores of the query. Boost values are relative to the default value of 1.0. A boost value between 0 and 1.0 decreases the relevance score. A value greater than 1.0 increases the relevance score.
@@ -6249,11 +6153,11 @@ message SlicedScroll {
   int32 max = 3;
 }
 message SmoothingModel {
-  optional LaplaceSmoothingModel laplace = 1;
-
-  optional LinearInterpolationSmoothingModel linear_interpolation = 2;
-
-  optional StupidBackoffSmoothingModel stupid_backoff = 3;
+  oneof smoothing_model {
+    LaplaceSmoothingModel laplace = 1;
+    LinearInterpolationSmoothingModel linear_interpolation = 2;
+    StupidBackoffSmoothingModel stupid_backoff = 3;
+  }
 }
 message SortCombinations {
   oneof sort_combinations {
@@ -6276,11 +6180,11 @@ enum SortMode {
   SORT_MODE_SUM = 5;
 }
 message SortOptions {
-  optional ScoreSort x_score = 1;
-
-  optional GeoDistanceSort x_geo_distance = 2;
-
-  optional ScriptSort x_script = 3;
+  oneof sort_options {
+    ScoreSort x_score = 1;
+    GeoDistanceSort x_geo_distance = 2;
+    ScriptSort x_script = 3;
+  }
 }
 enum SortOrder {
   SORT_ORDER_UNSPECIFIED = 0;
@@ -6400,26 +6304,19 @@ message SpanOrQuery {
   repeated SpanQuery clauses = 3;
 }
 message SpanQuery {
-  optional SpanContainingQuery span_containing = 1;
-
-  optional SpanFieldMaskingQuery field_masking_span = 2;
-
-  optional SpanFirstQuery span_first = 3;
-
-  optional SpanGapQuery span_gap = 4;
-
-  optional SpanMultiTermQuery span_multi = 5;
-
-  optional SpanNearQuery span_near = 6;
-
-  optional SpanNotQuery span_not = 7;
-
-  optional SpanOrQuery span_or = 8;
-
-  // The equivalent of the `term` query but for use with other span queries.
-  optional SpanTermQuery span_term = 9;
-
-  optional SpanWithinQuery span_within = 10;
+  oneof span_query {
+    SpanContainingQuery span_containing = 1;
+    SpanFieldMaskingQuery field_masking_span = 2;
+    SpanFirstQuery span_first = 3;
+    SpanGapQuery span_gap = 4;
+    SpanMultiTermQuery span_multi = 5;
+    SpanNearQuery span_near = 6;
+    SpanNotQuery span_not = 7;
+    SpanOrQuery span_or = 8;
+    // The equivalent of the `term` query but for use with other span queries.
+    SpanTermQuery span_term = 9;
+    SpanWithinQuery span_within = 10;
+  }
 }
 message SpanTermQuery {
   // Floating point number used to decrease or increase the relevance scores of the query. Boost values are relative to the default value of 1.0. A boost value between 0 and 1.0 decreases the relevance score. A value greater than 1.0 increases the relevance score.