diff --git a/.typos.toml b/.typos.toml
index 3910405a..e6af6d2b 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -2,4 +2,7 @@
 extend-exclude = [
     # Exclude all generated files
     "**/greptime/v1/**",
+    "java/**",
+    "go/**",
+    "c++/**"
 ]
diff --git a/c++/substrait_extension/promql_plan.pb.cc b/c++/substrait_extension/promql_plan.pb.cc
index d8cd448f..b7560124 100644
--- a/c++/substrait_extension/promql_plan.pb.cc
+++ b/c++/substrait_extension/promql_plan.pb.cc
@@ -44,6 +44,8 @@ PROTOBUF_CONSTEXPR InstantManipulate::InstantManipulate(
   , /*decltype(_impl_.end_)*/int64_t{0}
   , /*decltype(_impl_.interval_)*/int64_t{0}
   , /*decltype(_impl_.lookback_delta_)*/int64_t{0}
+  , /*decltype(_impl_.time_index_idx_)*/uint64_t{0u}
+  , /*decltype(_impl_.field_index_idx_)*/uint64_t{0u}
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct InstantManipulateDefaultTypeInternal {
   PROTOBUF_CONSTEXPR InstantManipulateDefaultTypeInternal()
@@ -57,8 +59,11 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT
 PROTOBUF_CONSTEXPR SeriesNormalize::SeriesNormalize(
     ::_pbi::ConstantInitialized): _impl_{
     /*decltype(_impl_.tag_columns_)*/{}
+  , /*decltype(_impl_.tag_column_indices_)*/{}
+  , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
   , /*decltype(_impl_.time_index_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
   , /*decltype(_impl_.offset_)*/int64_t{0}
+  , /*decltype(_impl_.time_index_idx_)*/uint64_t{0u}
   , /*decltype(_impl_.filter_nan_)*/false
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct SeriesNormalizeDefaultTypeInternal {
@@ -73,7 +78,10 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT
 PROTOBUF_CONSTEXPR SeriesDivide::SeriesDivide(
     ::_pbi::ConstantInitialized): _impl_{
     /*decltype(_impl_.tag_columns_)*/{}
+  , /*decltype(_impl_.tag_column_indices_)*/{}
+  , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
   , /*decltype(_impl_.time_index_column_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
+  , /*decltype(_impl_.time_index_column_idx_)*/uint64_t{0u}
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct SeriesDivideDefaultTypeInternal {
   PROTOBUF_CONSTEXPR SeriesDivideDefaultTypeInternal()
@@ -87,11 +95,14 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT
 PROTOBUF_CONSTEXPR RangeManipulate::RangeManipulate(
     ::_pbi::ConstantInitialized): _impl_{
     /*decltype(_impl_.tag_columns_)*/{}
+  , /*decltype(_impl_.tag_column_indices_)*/{}
+  , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
   , /*decltype(_impl_.time_index_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
   , /*decltype(_impl_.start_)*/int64_t{0}
   , /*decltype(_impl_.end_)*/int64_t{0}
   , /*decltype(_impl_.interval_)*/int64_t{0}
   , /*decltype(_impl_.range_)*/int64_t{0}
+  , /*decltype(_impl_.time_index_idx_)*/uint64_t{0u}
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct RangeManipulateDefaultTypeInternal {
   PROTOBUF_CONSTEXPR RangeManipulateDefaultTypeInternal()
@@ -105,11 +116,15 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT
 PROTOBUF_CONSTEXPR ScalarCalculate::ScalarCalculate(
     ::_pbi::ConstantInitialized): _impl_{
     /*decltype(_impl_.tag_columns_)*/{}
+  , /*decltype(_impl_.tag_column_indices_)*/{}
+  , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
   , /*decltype(_impl_.time_index_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
   , /*decltype(_impl_.field_column_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
   , /*decltype(_impl_.start_)*/int64_t{0}
   , /*decltype(_impl_.end_)*/int64_t{0}
   , /*decltype(_impl_.interval_)*/int64_t{0}
+  , /*decltype(_impl_.time_index_idx_)*/uint64_t{0u}
+  , /*decltype(_impl_.field_column_idx_)*/uint64_t{0u}
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct ScalarCalculateDefaultTypeInternal {
   PROTOBUF_CONSTEXPR ScalarCalculateDefaultTypeInternal()
@@ -128,6 +143,8 @@ PROTOBUF_CONSTEXPR Absent::Absent(
   , /*decltype(_impl_.start_)*/int64_t{0}
   , /*decltype(_impl_.end_)*/int64_t{0}
   , /*decltype(_impl_.step_)*/int64_t{0}
+  , /*decltype(_impl_.time_index_column_idx_)*/uint64_t{0u}
+  , /*decltype(_impl_.value_column_idx_)*/uint64_t{0u}
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct AbsentDefaultTypeInternal {
   PROTOBUF_CONSTEXPR AbsentDefaultTypeInternal()
@@ -179,6 +196,8 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
   PROTOBUF_FIELD_OFFSET(::substrait_extension::InstantManipulate, _impl_.lookback_delta_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::InstantManipulate, _impl_.time_index_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::InstantManipulate, _impl_.field_index_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::InstantManipulate, _impl_.time_index_idx_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::InstantManipulate, _impl_.field_index_idx_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -189,6 +208,8 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
   PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.time_index_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.filter_nan_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.tag_columns_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.time_index_idx_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.tag_column_indices_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesDivide, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -197,6 +218,8 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
   ~0u,  // no _inlined_string_donated_
   PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesDivide, _impl_.tag_columns_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesDivide, _impl_.time_index_column_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesDivide, _impl_.tag_column_indices_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesDivide, _impl_.time_index_column_idx_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::substrait_extension::RangeManipulate, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -209,6 +232,8 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
   PROTOBUF_FIELD_OFFSET(::substrait_extension::RangeManipulate, _impl_.range_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::RangeManipulate, _impl_.time_index_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::RangeManipulate, _impl_.tag_columns_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::RangeManipulate, _impl_.time_index_idx_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::RangeManipulate, _impl_.tag_column_indices_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::substrait_extension::ScalarCalculate, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -221,6 +246,9 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
   PROTOBUF_FIELD_OFFSET(::substrait_extension::ScalarCalculate, _impl_.time_index_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::ScalarCalculate, _impl_.tag_columns_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::ScalarCalculate, _impl_.field_column_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::ScalarCalculate, _impl_.time_index_idx_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::ScalarCalculate, _impl_.tag_column_indices_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::ScalarCalculate, _impl_.field_column_idx_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::substrait_extension::Absent, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -233,6 +261,8 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
   PROTOBUF_FIELD_OFFSET(::substrait_extension::Absent, _impl_.time_index_column_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::Absent, _impl_.value_column_),
   PROTOBUF_FIELD_OFFSET(::substrait_extension::Absent, _impl_.fake_labels_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::Absent, _impl_.time_index_column_idx_),
+  PROTOBUF_FIELD_OFFSET(::substrait_extension::Absent, _impl_.value_column_idx_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::substrait_extension::LabelPair, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -245,12 +275,12 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
 static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, -1, -1, sizeof(::substrait_extension::EmptyMetric)},
   { 9, -1, -1, sizeof(::substrait_extension::InstantManipulate)},
-  { 21, -1, -1, sizeof(::substrait_extension::SeriesNormalize)},
-  { 31, -1, -1, sizeof(::substrait_extension::SeriesDivide)},
-  { 39, -1, -1, sizeof(::substrait_extension::RangeManipulate)},
-  { 51, -1, -1, sizeof(::substrait_extension::ScalarCalculate)},
-  { 63, -1, -1, sizeof(::substrait_extension::Absent)},
-  { 75, -1, -1, sizeof(::substrait_extension::LabelPair)},
+  { 23, -1, -1, sizeof(::substrait_extension::SeriesNormalize)},
+  { 35, -1, -1, sizeof(::substrait_extension::SeriesDivide)},
+  { 45, -1, -1, sizeof(::substrait_extension::RangeManipulate)},
+  { 59, -1, -1, sizeof(::substrait_extension::ScalarCalculate)},
+  { 74, -1, -1, sizeof(::substrait_extension::Absent)},
+  { 88, -1, -1, sizeof(::substrait_extension::LabelPair)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
@@ -268,31 +298,41 @@ const char descriptor_table_protodef_substrait_5fextension_2fpromql_5fplan_2epro
   "\n%substrait_extension/promql_plan.proto\022"
   "\023substrait_extension\";\n\013EmptyMetric\022\r\n\005s"
   "tart\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001("
-  "\003\"\202\001\n\021InstantManipulate\022\r\n\005start\030\001 \001(\003\022\013"
+  "\003\"\273\001\n\021InstantManipulate\022\r\n\005start\030\001 \001(\003\022\013"
   "\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022\026\n\016lookbac"
-  "k_delta\030\004 \001(\003\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013fie"
-  "ld_index\030\006 \001(\t\"^\n\017SeriesNormalize\022\016\n\006off"
-  "set\030\001 \001(\003\022\022\n\ntime_index\030\002 \001(\t\022\022\n\nfilter_"
-  "nan\030\003 \001(\010\022\023\n\013tag_columns\030\004 \003(\t\">\n\014Series"
-  "Divide\022\023\n\013tag_columns\030\001 \003(\t\022\031\n\021time_inde"
-  "x_column\030\002 \001(\t\"w\n\017RangeManipulate\022\r\n\005sta"
-  "rt\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022"
-  "\r\n\005range\030\004 \001(\003\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013ta"
-  "g_columns\030\006 \003(\t\"~\n\017ScalarCalculate\022\r\n\005st"
-  "art\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003"
-  "\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013tag_columns\030\006 \003("
-  "\t\022\024\n\014field_column\030\007 \001(\t\"\230\001\n\006Absent\022\r\n\005st"
-  "art\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\014\n\004step\030\003 \001(\003\022\031\n\021"
-  "time_index_column\030\004 \001(\t\022\024\n\014value_column\030"
-  "\005 \001(\t\0223\n\013fake_labels\030\006 \003(\0132\036.substrait_e"
-  "xtension.LabelPair\"\'\n\tLabelPair\022\013\n\003key\030\001"
-  " \001(\t\022\r\n\005value\030\002 \001(\tB\?Z=github.com/Grepti"
-  "meTeam/greptime-proto/go/substrait_exten"
-  "sionb\006proto3"
+  "k_delta\030\004 \001(\003\022\026\n\ntime_index\030\005 \001(\tB\002\030\001\022\027\n"
+  "\013field_index\030\006 \001(\tB\002\030\001\022\026\n\016time_index_idx"
+  "\030\007 \001(\004\022\027\n\017field_index_idx\030\010 \001(\004\"\232\001\n\017Seri"
+  "esNormalize\022\016\n\006offset\030\001 \001(\003\022\026\n\ntime_inde"
+  "x\030\002 \001(\tB\002\030\001\022\022\n\nfilter_nan\030\003 \001(\010\022\027\n\013tag_c"
+  "olumns\030\004 \003(\tB\002\030\001\022\026\n\016time_index_idx\030\005 \001(\004"
+  "\022\032\n\022tag_column_indices\030\006 \003(\004\"\201\001\n\014SeriesD"
+  "ivide\022\027\n\013tag_columns\030\001 \003(\tB\002\030\001\022\035\n\021time_i"
+  "ndex_column\030\002 \001(\tB\002\030\001\022\032\n\022tag_column_indi"
+  "ces\030\003 \003(\004\022\035\n\025time_index_column_idx\030\004 \001(\004"
+  "\"\263\001\n\017RangeManipulate\022\r\n\005start\030\001 \001(\003\022\013\n\003e"
+  "nd\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022\r\n\005range\030\004 \001("
+  "\003\022\026\n\ntime_index\030\005 \001(\tB\002\030\001\022\027\n\013tag_columns"
+  "\030\006 \003(\tB\002\030\001\022\026\n\016time_index_idx\030\007 \001(\004\022\032\n\022ta"
+  "g_column_indices\030\010 \003(\004\"\330\001\n\017ScalarCalcula"
+  "te\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interv"
+  "al\030\003 \001(\003\022\026\n\ntime_index\030\005 \001(\tB\002\030\001\022\027\n\013tag_"
+  "columns\030\006 \003(\tB\002\030\001\022\030\n\014field_column\030\007 \001(\tB"
+  "\002\030\001\022\026\n\016time_index_idx\030\010 \001(\004\022\032\n\022tag_colum"
+  "n_indices\030\t \003(\004\022\030\n\020field_column_idx\030\n \001("
+  "\004\"\331\001\n\006Absent\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003"
+  "\022\014\n\004step\030\003 \001(\003\022\035\n\021time_index_column\030\004 \001("
+  "\tB\002\030\001\022\030\n\014value_column\030\005 \001(\tB\002\030\001\0223\n\013fake_"
+  "labels\030\006 \003(\0132\036.substrait_extension.Label"
+  "Pair\022\035\n\025time_index_column_idx\030\007 \001(\004\022\030\n\020v"
+  "alue_column_idx\030\010 \001(\004\"\'\n\tLabelPair\022\013\n\003ke"
+  "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\tB\?Z=github.com/Gre"
+  "ptimeTeam/greptime-proto/go/substrait_ex"
+  "tensionb\006proto3"
   ;
 static ::_pbi::once_flag descriptor_table_substrait_5fextension_2fpromql_5fplan_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_substrait_5fextension_2fpromql_5fplan_2eproto = {
-    false, false, 932, descriptor_table_protodef_substrait_5fextension_2fpromql_5fplan_2eproto,
+    false, false, 1335, descriptor_table_protodef_substrait_5fextension_2fpromql_5fplan_2eproto,
     "substrait_extension/promql_plan.proto",
     &descriptor_table_substrait_5fextension_2fpromql_5fplan_2eproto_once, nullptr, 0, 8,
     schemas, file_default_instances, TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offsets,
@@ -564,6 +604,8 @@ InstantManipulate::InstantManipulate(const InstantManipulate& from)
     , decltype(_impl_.end_){}
     , decltype(_impl_.interval_){}
     , decltype(_impl_.lookback_delta_){}
+    , decltype(_impl_.time_index_idx_){}
+    , decltype(_impl_.field_index_idx_){}
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -584,8 +626,8 @@ InstantManipulate::InstantManipulate(const InstantManipulate& from)
       _this->GetArenaForAllocation());
   }
   ::memcpy(&_impl_.start_, &from._impl_.start_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.lookback_delta_) -
-    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.lookback_delta_));
+    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.field_index_idx_) -
+    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.field_index_idx_));
   // @@protoc_insertion_point(copy_constructor:substrait_extension.InstantManipulate)
 }
 
@@ -600,6 +642,8 @@ inline void InstantManipulate::SharedCtor(
     , decltype(_impl_.end_){int64_t{0}}
     , decltype(_impl_.interval_){int64_t{0}}
     , decltype(_impl_.lookback_delta_){int64_t{0}}
+    , decltype(_impl_.time_index_idx_){uint64_t{0u}}
+    , decltype(_impl_.field_index_idx_){uint64_t{0u}}
     , /*decltype(_impl_._cached_size_)*/{}
   };
   _impl_.time_index_.InitDefault();
@@ -640,8 +684,8 @@ void InstantManipulate::Clear() {
   _impl_.time_index_.ClearToEmpty();
   _impl_.field_index_.ClearToEmpty();
   ::memset(&_impl_.start_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.lookback_delta_) -
-      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.lookback_delta_));
+      reinterpret_cast<char*>(&_impl_.field_index_idx_) -
+      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.field_index_idx_));
   _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
 }
 
@@ -683,7 +727,7 @@ const char* InstantManipulate::_InternalParse(const char* ptr, ::_pbi::ParseCont
         } else
           goto handle_unusual;
         continue;
-      // string time_index = 5;
+      // string time_index = 5 [deprecated = true];
       case 5:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
           auto str = _internal_mutable_time_index();
@@ -693,7 +737,7 @@ const char* InstantManipulate::_InternalParse(const char* ptr, ::_pbi::ParseCont
         } else
           goto handle_unusual;
         continue;
-      // string field_index = 6;
+      // string field_index = 6 [deprecated = true];
       case 6:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
           auto str = _internal_mutable_field_index();
@@ -703,6 +747,22 @@ const char* InstantManipulate::_InternalParse(const char* ptr, ::_pbi::ParseCont
         } else
           goto handle_unusual;
         continue;
+      // uint64 time_index_idx = 7;
+      case 7:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56)) {
+          _impl_.time_index_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
+      // uint64 field_index_idx = 8;
+      case 8:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 64)) {
+          _impl_.field_index_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
       default:
         goto handle_unusual;
     }  // switch
@@ -756,7 +816,7 @@ uint8_t* InstantManipulate::_InternalSerialize(
     target = ::_pbi::WireFormatLite::WriteInt64ToArray(4, this->_internal_lookback_delta(), target);
   }
 
-  // string time_index = 5;
+  // string time_index = 5 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_time_index().data(), static_cast<int>(this->_internal_time_index().length()),
@@ -766,7 +826,7 @@ uint8_t* InstantManipulate::_InternalSerialize(
         5, this->_internal_time_index(), target);
   }
 
-  // string field_index = 6;
+  // string field_index = 6 [deprecated = true];
   if (!this->_internal_field_index().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_field_index().data(), static_cast<int>(this->_internal_field_index().length()),
@@ -776,6 +836,18 @@ uint8_t* InstantManipulate::_InternalSerialize(
         6, this->_internal_field_index(), target);
   }
 
+  // uint64 time_index_idx = 7;
+  if (this->_internal_time_index_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(7, this->_internal_time_index_idx(), target);
+  }
+
+  // uint64 field_index_idx = 8;
+  if (this->_internal_field_index_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(8, this->_internal_field_index_idx(), target);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -792,14 +864,14 @@ size_t InstantManipulate::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // string time_index = 5;
+  // string time_index = 5 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
         this->_internal_time_index());
   }
 
-  // string field_index = 6;
+  // string field_index = 6 [deprecated = true];
   if (!this->_internal_field_index().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
@@ -826,6 +898,16 @@ size_t InstantManipulate::ByteSizeLong() const {
     total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_lookback_delta());
   }
 
+  // uint64 time_index_idx = 7;
+  if (this->_internal_time_index_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_time_index_idx());
+  }
+
+  // uint64 field_index_idx = 8;
+  if (this->_internal_field_index_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_field_index_idx());
+  }
+
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
@@ -862,6 +944,12 @@ void InstantManipulate::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, cons
   if (from._internal_lookback_delta() != 0) {
     _this->_internal_set_lookback_delta(from._internal_lookback_delta());
   }
+  if (from._internal_time_index_idx() != 0) {
+    _this->_internal_set_time_index_idx(from._internal_time_index_idx());
+  }
+  if (from._internal_field_index_idx() != 0) {
+    _this->_internal_set_field_index_idx(from._internal_field_index_idx());
+  }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -890,8 +978,8 @@ void InstantManipulate::InternalSwap(InstantManipulate* other) {
       &other->_impl_.field_index_, rhs_arena
   );
   ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(InstantManipulate, _impl_.lookback_delta_)
-      + sizeof(InstantManipulate::_impl_.lookback_delta_)
+      PROTOBUF_FIELD_OFFSET(InstantManipulate, _impl_.field_index_idx_)
+      + sizeof(InstantManipulate::_impl_.field_index_idx_)
       - PROTOBUF_FIELD_OFFSET(InstantManipulate, _impl_.start_)>(
           reinterpret_cast<char*>(&_impl_.start_),
           reinterpret_cast<char*>(&other->_impl_.start_));
@@ -920,8 +1008,11 @@ SeriesNormalize::SeriesNormalize(const SeriesNormalize& from)
   SeriesNormalize* const _this = this; (void)_this;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){from._impl_.tag_columns_}
+    , decltype(_impl_.tag_column_indices_){from._impl_.tag_column_indices_}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_){}
     , decltype(_impl_.offset_){}
+    , decltype(_impl_.time_index_idx_){}
     , decltype(_impl_.filter_nan_){}
     , /*decltype(_impl_._cached_size_)*/{}};
 
@@ -946,8 +1037,11 @@ inline void SeriesNormalize::SharedCtor(
   (void)is_message_owned;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){arena}
+    , decltype(_impl_.tag_column_indices_){arena}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_){}
     , decltype(_impl_.offset_){int64_t{0}}
+    , decltype(_impl_.time_index_idx_){uint64_t{0u}}
     , decltype(_impl_.filter_nan_){false}
     , /*decltype(_impl_._cached_size_)*/{}
   };
@@ -969,6 +1063,7 @@ SeriesNormalize::~SeriesNormalize() {
 inline void SeriesNormalize::SharedDtor() {
   GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
   _impl_.tag_columns_.~RepeatedPtrField();
+  _impl_.tag_column_indices_.~RepeatedField();
   _impl_.time_index_.Destroy();
 }
 
@@ -983,6 +1078,7 @@ void SeriesNormalize::Clear() {
   (void) cached_has_bits;
 
   _impl_.tag_columns_.Clear();
+  _impl_.tag_column_indices_.Clear();
   _impl_.time_index_.ClearToEmpty();
   ::memset(&_impl_.offset_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&_impl_.filter_nan_) -
@@ -1004,7 +1100,7 @@ const char* SeriesNormalize::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
-      // string time_index = 2;
+      // string time_index = 2 [deprecated = true];
       case 2:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
           auto str = _internal_mutable_time_index();
@@ -1022,7 +1118,7 @@ const char* SeriesNormalize::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
-      // repeated string tag_columns = 4;
+      // repeated string tag_columns = 4 [deprecated = true];
       case 4:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
           ptr -= 1;
@@ -1037,6 +1133,25 @@ const char* SeriesNormalize::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
+      // uint64 time_index_idx = 5;
+      case 5:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40)) {
+          _impl_.time_index_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
+      // repeated uint64 tag_column_indices = 6;
+      case 6:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
+          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedUInt64Parser(_internal_mutable_tag_column_indices(), ptr, ctx);
+          CHK_(ptr);
+        } else if (static_cast<uint8_t>(tag) == 48) {
+          _internal_add_tag_column_indices(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr));
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
       default:
         goto handle_unusual;
     }  // switch
@@ -1072,7 +1187,7 @@ uint8_t* SeriesNormalize::_InternalSerialize(
     target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_offset(), target);
   }
 
-  // string time_index = 2;
+  // string time_index = 2 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_time_index().data(), static_cast<int>(this->_internal_time_index().length()),
@@ -1088,7 +1203,7 @@ uint8_t* SeriesNormalize::_InternalSerialize(
     target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_filter_nan(), target);
   }
 
-  // repeated string tag_columns = 4;
+  // repeated string tag_columns = 4 [deprecated = true];
   for (int i = 0, n = this->_internal_tag_columns_size(); i < n; i++) {
     const auto& s = this->_internal_tag_columns(i);
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
@@ -1098,6 +1213,21 @@ uint8_t* SeriesNormalize::_InternalSerialize(
     target = stream->WriteString(4, s, target);
   }
 
+  // uint64 time_index_idx = 5;
+  if (this->_internal_time_index_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(5, this->_internal_time_index_idx(), target);
+  }
+
+  // repeated uint64 tag_column_indices = 6;
+  {
+    int byte_size = _impl_._tag_column_indices_cached_byte_size_.load(std::memory_order_relaxed);
+    if (byte_size > 0) {
+      target = stream->WriteUInt64Packed(
+          6, _internal_tag_column_indices(), byte_size, target);
+    }
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -1114,7 +1244,7 @@ size_t SeriesNormalize::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated string tag_columns = 4;
+  // repeated string tag_columns = 4 [deprecated = true];
   total_size += 1 *
       ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.tag_columns_.size());
   for (int i = 0, n = _impl_.tag_columns_.size(); i < n; i++) {
@@ -1122,7 +1252,21 @@ size_t SeriesNormalize::ByteSizeLong() const {
       _impl_.tag_columns_.Get(i));
   }
 
-  // string time_index = 2;
+  // repeated uint64 tag_column_indices = 6;
+  {
+    size_t data_size = ::_pbi::WireFormatLite::
+      UInt64Size(this->_impl_.tag_column_indices_);
+    if (data_size > 0) {
+      total_size += 1 +
+        ::_pbi::WireFormatLite::Int32Size(static_cast<int32_t>(data_size));
+    }
+    int cached_size = ::_pbi::ToCachedSize(data_size);
+    _impl_._tag_column_indices_cached_byte_size_.store(cached_size,
+                                    std::memory_order_relaxed);
+    total_size += data_size;
+  }
+
+  // string time_index = 2 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
@@ -1134,6 +1278,11 @@ size_t SeriesNormalize::ByteSizeLong() const {
     total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_offset());
   }
 
+  // uint64 time_index_idx = 5;
+  if (this->_internal_time_index_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_time_index_idx());
+  }
+
   // bool filter_nan = 3;
   if (this->_internal_filter_nan() != 0) {
     total_size += 1 + 1;
@@ -1158,12 +1307,16 @@ void SeriesNormalize::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const
   (void) cached_has_bits;
 
   _this->_impl_.tag_columns_.MergeFrom(from._impl_.tag_columns_);
+  _this->_impl_.tag_column_indices_.MergeFrom(from._impl_.tag_column_indices_);
   if (!from._internal_time_index().empty()) {
     _this->_internal_set_time_index(from._internal_time_index());
   }
   if (from._internal_offset() != 0) {
     _this->_internal_set_offset(from._internal_offset());
   }
+  if (from._internal_time_index_idx() != 0) {
+    _this->_internal_set_time_index_idx(from._internal_time_index_idx());
+  }
   if (from._internal_filter_nan() != 0) {
     _this->_internal_set_filter_nan(from._internal_filter_nan());
   }
@@ -1187,6 +1340,7 @@ void SeriesNormalize::InternalSwap(SeriesNormalize* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   _impl_.tag_columns_.InternalSwap(&other->_impl_.tag_columns_);
+  _impl_.tag_column_indices_.InternalSwap(&other->_impl_.tag_column_indices_);
   ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
       &_impl_.time_index_, lhs_arena,
       &other->_impl_.time_index_, rhs_arena
@@ -1222,7 +1376,10 @@ SeriesDivide::SeriesDivide(const SeriesDivide& from)
   SeriesDivide* const _this = this; (void)_this;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){from._impl_.tag_columns_}
+    , decltype(_impl_.tag_column_indices_){from._impl_.tag_column_indices_}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_column_){}
+    , decltype(_impl_.time_index_column_idx_){}
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -1234,6 +1391,7 @@ SeriesDivide::SeriesDivide(const SeriesDivide& from)
     _this->_impl_.time_index_column_.Set(from._internal_time_index_column(), 
       _this->GetArenaForAllocation());
   }
+  _this->_impl_.time_index_column_idx_ = from._impl_.time_index_column_idx_;
   // @@protoc_insertion_point(copy_constructor:substrait_extension.SeriesDivide)
 }
 
@@ -1243,7 +1401,10 @@ inline void SeriesDivide::SharedCtor(
   (void)is_message_owned;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){arena}
+    , decltype(_impl_.tag_column_indices_){arena}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_column_){}
+    , decltype(_impl_.time_index_column_idx_){uint64_t{0u}}
     , /*decltype(_impl_._cached_size_)*/{}
   };
   _impl_.time_index_column_.InitDefault();
@@ -1264,6 +1425,7 @@ SeriesDivide::~SeriesDivide() {
 inline void SeriesDivide::SharedDtor() {
   GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
   _impl_.tag_columns_.~RepeatedPtrField();
+  _impl_.tag_column_indices_.~RepeatedField();
   _impl_.time_index_column_.Destroy();
 }
 
@@ -1278,7 +1440,9 @@ void SeriesDivide::Clear() {
   (void) cached_has_bits;
 
   _impl_.tag_columns_.Clear();
+  _impl_.tag_column_indices_.Clear();
   _impl_.time_index_column_.ClearToEmpty();
+  _impl_.time_index_column_idx_ = uint64_t{0u};
   _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
 }
 
@@ -1288,7 +1452,7 @@ const char* SeriesDivide::_InternalParse(const char* ptr, ::_pbi::ParseContext*
     uint32_t tag;
     ptr = ::_pbi::ReadTag(ptr, &tag);
     switch (tag >> 3) {
-      // repeated string tag_columns = 1;
+      // repeated string tag_columns = 1 [deprecated = true];
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
           ptr -= 1;
@@ -1303,7 +1467,7 @@ const char* SeriesDivide::_InternalParse(const char* ptr, ::_pbi::ParseContext*
         } else
           goto handle_unusual;
         continue;
-      // string time_index_column = 2;
+      // string time_index_column = 2 [deprecated = true];
       case 2:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
           auto str = _internal_mutable_time_index_column();
@@ -1313,6 +1477,25 @@ const char* SeriesDivide::_InternalParse(const char* ptr, ::_pbi::ParseContext*
         } else
           goto handle_unusual;
         continue;
+      // repeated uint64 tag_column_indices = 3;
+      case 3:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
+          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedUInt64Parser(_internal_mutable_tag_column_indices(), ptr, ctx);
+          CHK_(ptr);
+        } else if (static_cast<uint8_t>(tag) == 24) {
+          _internal_add_tag_column_indices(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr));
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
+      // uint64 time_index_column_idx = 4;
+      case 4:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 32)) {
+          _impl_.time_index_column_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
       default:
         goto handle_unusual;
     }  // switch
@@ -1342,7 +1525,7 @@ uint8_t* SeriesDivide::_InternalSerialize(
   uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // repeated string tag_columns = 1;
+  // repeated string tag_columns = 1 [deprecated = true];
   for (int i = 0, n = this->_internal_tag_columns_size(); i < n; i++) {
     const auto& s = this->_internal_tag_columns(i);
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
@@ -1352,7 +1535,7 @@ uint8_t* SeriesDivide::_InternalSerialize(
     target = stream->WriteString(1, s, target);
   }
 
-  // string time_index_column = 2;
+  // string time_index_column = 2 [deprecated = true];
   if (!this->_internal_time_index_column().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_time_index_column().data(), static_cast<int>(this->_internal_time_index_column().length()),
@@ -1362,6 +1545,21 @@ uint8_t* SeriesDivide::_InternalSerialize(
         2, this->_internal_time_index_column(), target);
   }
 
+  // repeated uint64 tag_column_indices = 3;
+  {
+    int byte_size = _impl_._tag_column_indices_cached_byte_size_.load(std::memory_order_relaxed);
+    if (byte_size > 0) {
+      target = stream->WriteUInt64Packed(
+          3, _internal_tag_column_indices(), byte_size, target);
+    }
+  }
+
+  // uint64 time_index_column_idx = 4;
+  if (this->_internal_time_index_column_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(4, this->_internal_time_index_column_idx(), target);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -1378,7 +1576,7 @@ size_t SeriesDivide::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated string tag_columns = 1;
+  // repeated string tag_columns = 1 [deprecated = true];
   total_size += 1 *
       ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.tag_columns_.size());
   for (int i = 0, n = _impl_.tag_columns_.size(); i < n; i++) {
@@ -1386,13 +1584,32 @@ size_t SeriesDivide::ByteSizeLong() const {
       _impl_.tag_columns_.Get(i));
   }
 
-  // string time_index_column = 2;
+  // repeated uint64 tag_column_indices = 3;
+  {
+    size_t data_size = ::_pbi::WireFormatLite::
+      UInt64Size(this->_impl_.tag_column_indices_);
+    if (data_size > 0) {
+      total_size += 1 +
+        ::_pbi::WireFormatLite::Int32Size(static_cast<int32_t>(data_size));
+    }
+    int cached_size = ::_pbi::ToCachedSize(data_size);
+    _impl_._tag_column_indices_cached_byte_size_.store(cached_size,
+                                    std::memory_order_relaxed);
+    total_size += data_size;
+  }
+
+  // string time_index_column = 2 [deprecated = true];
   if (!this->_internal_time_index_column().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
         this->_internal_time_index_column());
   }
 
+  // uint64 time_index_column_idx = 4;
+  if (this->_internal_time_index_column_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_time_index_column_idx());
+  }
+
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
@@ -1412,9 +1629,13 @@ void SeriesDivide::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::P
   (void) cached_has_bits;
 
   _this->_impl_.tag_columns_.MergeFrom(from._impl_.tag_columns_);
+  _this->_impl_.tag_column_indices_.MergeFrom(from._impl_.tag_column_indices_);
   if (!from._internal_time_index_column().empty()) {
     _this->_internal_set_time_index_column(from._internal_time_index_column());
   }
+  if (from._internal_time_index_column_idx() != 0) {
+    _this->_internal_set_time_index_column_idx(from._internal_time_index_column_idx());
+  }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1435,10 +1656,12 @@ void SeriesDivide::InternalSwap(SeriesDivide* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   _impl_.tag_columns_.InternalSwap(&other->_impl_.tag_columns_);
+  _impl_.tag_column_indices_.InternalSwap(&other->_impl_.tag_column_indices_);
   ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
       &_impl_.time_index_column_, lhs_arena,
       &other->_impl_.time_index_column_, rhs_arena
   );
+  swap(_impl_.time_index_column_idx_, other->_impl_.time_index_column_idx_);
 }
 
 ::PROTOBUF_NAMESPACE_ID::Metadata SeriesDivide::GetMetadata() const {
@@ -1464,11 +1687,14 @@ RangeManipulate::RangeManipulate(const RangeManipulate& from)
   RangeManipulate* const _this = this; (void)_this;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){from._impl_.tag_columns_}
+    , decltype(_impl_.tag_column_indices_){from._impl_.tag_column_indices_}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_){}
     , decltype(_impl_.start_){}
     , decltype(_impl_.end_){}
     , decltype(_impl_.interval_){}
     , decltype(_impl_.range_){}
+    , decltype(_impl_.time_index_idx_){}
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -1481,8 +1707,8 @@ RangeManipulate::RangeManipulate(const RangeManipulate& from)
       _this->GetArenaForAllocation());
   }
   ::memcpy(&_impl_.start_, &from._impl_.start_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.range_) -
-    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.range_));
+    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.time_index_idx_) -
+    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.time_index_idx_));
   // @@protoc_insertion_point(copy_constructor:substrait_extension.RangeManipulate)
 }
 
@@ -1492,11 +1718,14 @@ inline void RangeManipulate::SharedCtor(
   (void)is_message_owned;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){arena}
+    , decltype(_impl_.tag_column_indices_){arena}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_){}
     , decltype(_impl_.start_){int64_t{0}}
     , decltype(_impl_.end_){int64_t{0}}
     , decltype(_impl_.interval_){int64_t{0}}
     , decltype(_impl_.range_){int64_t{0}}
+    , decltype(_impl_.time_index_idx_){uint64_t{0u}}
     , /*decltype(_impl_._cached_size_)*/{}
   };
   _impl_.time_index_.InitDefault();
@@ -1517,6 +1746,7 @@ RangeManipulate::~RangeManipulate() {
 inline void RangeManipulate::SharedDtor() {
   GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
   _impl_.tag_columns_.~RepeatedPtrField();
+  _impl_.tag_column_indices_.~RepeatedField();
   _impl_.time_index_.Destroy();
 }
 
@@ -1531,10 +1761,11 @@ void RangeManipulate::Clear() {
   (void) cached_has_bits;
 
   _impl_.tag_columns_.Clear();
+  _impl_.tag_column_indices_.Clear();
   _impl_.time_index_.ClearToEmpty();
   ::memset(&_impl_.start_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.range_) -
-      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.range_));
+      reinterpret_cast<char*>(&_impl_.time_index_idx_) -
+      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.time_index_idx_));
   _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
 }
 
@@ -1576,7 +1807,7 @@ const char* RangeManipulate::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
-      // string time_index = 5;
+      // string time_index = 5 [deprecated = true];
       case 5:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
           auto str = _internal_mutable_time_index();
@@ -1586,7 +1817,7 @@ const char* RangeManipulate::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
-      // repeated string tag_columns = 6;
+      // repeated string tag_columns = 6 [deprecated = true];
       case 6:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
           ptr -= 1;
@@ -1601,6 +1832,25 @@ const char* RangeManipulate::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
+      // uint64 time_index_idx = 7;
+      case 7:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56)) {
+          _impl_.time_index_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
+      // repeated uint64 tag_column_indices = 8;
+      case 8:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 66)) {
+          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedUInt64Parser(_internal_mutable_tag_column_indices(), ptr, ctx);
+          CHK_(ptr);
+        } else if (static_cast<uint8_t>(tag) == 64) {
+          _internal_add_tag_column_indices(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr));
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
       default:
         goto handle_unusual;
     }  // switch
@@ -1654,7 +1904,7 @@ uint8_t* RangeManipulate::_InternalSerialize(
     target = ::_pbi::WireFormatLite::WriteInt64ToArray(4, this->_internal_range(), target);
   }
 
-  // string time_index = 5;
+  // string time_index = 5 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_time_index().data(), static_cast<int>(this->_internal_time_index().length()),
@@ -1664,7 +1914,7 @@ uint8_t* RangeManipulate::_InternalSerialize(
         5, this->_internal_time_index(), target);
   }
 
-  // repeated string tag_columns = 6;
+  // repeated string tag_columns = 6 [deprecated = true];
   for (int i = 0, n = this->_internal_tag_columns_size(); i < n; i++) {
     const auto& s = this->_internal_tag_columns(i);
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
@@ -1674,6 +1924,21 @@ uint8_t* RangeManipulate::_InternalSerialize(
     target = stream->WriteString(6, s, target);
   }
 
+  // uint64 time_index_idx = 7;
+  if (this->_internal_time_index_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(7, this->_internal_time_index_idx(), target);
+  }
+
+  // repeated uint64 tag_column_indices = 8;
+  {
+    int byte_size = _impl_._tag_column_indices_cached_byte_size_.load(std::memory_order_relaxed);
+    if (byte_size > 0) {
+      target = stream->WriteUInt64Packed(
+          8, _internal_tag_column_indices(), byte_size, target);
+    }
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -1690,7 +1955,7 @@ size_t RangeManipulate::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated string tag_columns = 6;
+  // repeated string tag_columns = 6 [deprecated = true];
   total_size += 1 *
       ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.tag_columns_.size());
   for (int i = 0, n = _impl_.tag_columns_.size(); i < n; i++) {
@@ -1698,7 +1963,21 @@ size_t RangeManipulate::ByteSizeLong() const {
       _impl_.tag_columns_.Get(i));
   }
 
-  // string time_index = 5;
+  // repeated uint64 tag_column_indices = 8;
+  {
+    size_t data_size = ::_pbi::WireFormatLite::
+      UInt64Size(this->_impl_.tag_column_indices_);
+    if (data_size > 0) {
+      total_size += 1 +
+        ::_pbi::WireFormatLite::Int32Size(static_cast<int32_t>(data_size));
+    }
+    int cached_size = ::_pbi::ToCachedSize(data_size);
+    _impl_._tag_column_indices_cached_byte_size_.store(cached_size,
+                                    std::memory_order_relaxed);
+    total_size += data_size;
+  }
+
+  // string time_index = 5 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
@@ -1725,6 +2004,11 @@ size_t RangeManipulate::ByteSizeLong() const {
     total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_range());
   }
 
+  // uint64 time_index_idx = 7;
+  if (this->_internal_time_index_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_time_index_idx());
+  }
+
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
@@ -1744,6 +2028,7 @@ void RangeManipulate::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const
   (void) cached_has_bits;
 
   _this->_impl_.tag_columns_.MergeFrom(from._impl_.tag_columns_);
+  _this->_impl_.tag_column_indices_.MergeFrom(from._impl_.tag_column_indices_);
   if (!from._internal_time_index().empty()) {
     _this->_internal_set_time_index(from._internal_time_index());
   }
@@ -1759,6 +2044,9 @@ void RangeManipulate::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const
   if (from._internal_range() != 0) {
     _this->_internal_set_range(from._internal_range());
   }
+  if (from._internal_time_index_idx() != 0) {
+    _this->_internal_set_time_index_idx(from._internal_time_index_idx());
+  }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1779,13 +2067,14 @@ void RangeManipulate::InternalSwap(RangeManipulate* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   _impl_.tag_columns_.InternalSwap(&other->_impl_.tag_columns_);
+  _impl_.tag_column_indices_.InternalSwap(&other->_impl_.tag_column_indices_);
   ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
       &_impl_.time_index_, lhs_arena,
       &other->_impl_.time_index_, rhs_arena
   );
   ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(RangeManipulate, _impl_.range_)
-      + sizeof(RangeManipulate::_impl_.range_)
+      PROTOBUF_FIELD_OFFSET(RangeManipulate, _impl_.time_index_idx_)
+      + sizeof(RangeManipulate::_impl_.time_index_idx_)
       - PROTOBUF_FIELD_OFFSET(RangeManipulate, _impl_.start_)>(
           reinterpret_cast<char*>(&_impl_.start_),
           reinterpret_cast<char*>(&other->_impl_.start_));
@@ -1814,11 +2103,15 @@ ScalarCalculate::ScalarCalculate(const ScalarCalculate& from)
   ScalarCalculate* const _this = this; (void)_this;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){from._impl_.tag_columns_}
+    , decltype(_impl_.tag_column_indices_){from._impl_.tag_column_indices_}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_){}
     , decltype(_impl_.field_column_){}
     , decltype(_impl_.start_){}
     , decltype(_impl_.end_){}
     , decltype(_impl_.interval_){}
+    , decltype(_impl_.time_index_idx_){}
+    , decltype(_impl_.field_column_idx_){}
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -1839,8 +2132,8 @@ ScalarCalculate::ScalarCalculate(const ScalarCalculate& from)
       _this->GetArenaForAllocation());
   }
   ::memcpy(&_impl_.start_, &from._impl_.start_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.interval_) -
-    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.interval_));
+    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.field_column_idx_) -
+    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.field_column_idx_));
   // @@protoc_insertion_point(copy_constructor:substrait_extension.ScalarCalculate)
 }
 
@@ -1850,11 +2143,15 @@ inline void ScalarCalculate::SharedCtor(
   (void)is_message_owned;
   new (&_impl_) Impl_{
       decltype(_impl_.tag_columns_){arena}
+    , decltype(_impl_.tag_column_indices_){arena}
+    , /*decltype(_impl_._tag_column_indices_cached_byte_size_)*/{0}
     , decltype(_impl_.time_index_){}
     , decltype(_impl_.field_column_){}
     , decltype(_impl_.start_){int64_t{0}}
     , decltype(_impl_.end_){int64_t{0}}
     , decltype(_impl_.interval_){int64_t{0}}
+    , decltype(_impl_.time_index_idx_){uint64_t{0u}}
+    , decltype(_impl_.field_column_idx_){uint64_t{0u}}
     , /*decltype(_impl_._cached_size_)*/{}
   };
   _impl_.time_index_.InitDefault();
@@ -1879,6 +2176,7 @@ ScalarCalculate::~ScalarCalculate() {
 inline void ScalarCalculate::SharedDtor() {
   GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
   _impl_.tag_columns_.~RepeatedPtrField();
+  _impl_.tag_column_indices_.~RepeatedField();
   _impl_.time_index_.Destroy();
   _impl_.field_column_.Destroy();
 }
@@ -1894,11 +2192,12 @@ void ScalarCalculate::Clear() {
   (void) cached_has_bits;
 
   _impl_.tag_columns_.Clear();
+  _impl_.tag_column_indices_.Clear();
   _impl_.time_index_.ClearToEmpty();
   _impl_.field_column_.ClearToEmpty();
   ::memset(&_impl_.start_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.interval_) -
-      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.interval_));
+      reinterpret_cast<char*>(&_impl_.field_column_idx_) -
+      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.field_column_idx_));
   _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
 }
 
@@ -1932,7 +2231,7 @@ const char* ScalarCalculate::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
-      // string time_index = 5;
+      // string time_index = 5 [deprecated = true];
       case 5:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
           auto str = _internal_mutable_time_index();
@@ -1942,7 +2241,7 @@ const char* ScalarCalculate::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
-      // repeated string tag_columns = 6;
+      // repeated string tag_columns = 6 [deprecated = true];
       case 6:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
           ptr -= 1;
@@ -1957,7 +2256,7 @@ const char* ScalarCalculate::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
-      // string field_column = 7;
+      // string field_column = 7 [deprecated = true];
       case 7:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
           auto str = _internal_mutable_field_column();
@@ -1967,6 +2266,33 @@ const char* ScalarCalculate::_InternalParse(const char* ptr, ::_pbi::ParseContex
         } else
           goto handle_unusual;
         continue;
+      // uint64 time_index_idx = 8;
+      case 8:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 64)) {
+          _impl_.time_index_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
+      // repeated uint64 tag_column_indices = 9;
+      case 9:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 74)) {
+          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedUInt64Parser(_internal_mutable_tag_column_indices(), ptr, ctx);
+          CHK_(ptr);
+        } else if (static_cast<uint8_t>(tag) == 72) {
+          _internal_add_tag_column_indices(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr));
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
+      // uint64 field_column_idx = 10;
+      case 10:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 80)) {
+          _impl_.field_column_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
       default:
         goto handle_unusual;
     }  // switch
@@ -2014,7 +2340,7 @@ uint8_t* ScalarCalculate::_InternalSerialize(
     target = ::_pbi::WireFormatLite::WriteInt64ToArray(3, this->_internal_interval(), target);
   }
 
-  // string time_index = 5;
+  // string time_index = 5 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_time_index().data(), static_cast<int>(this->_internal_time_index().length()),
@@ -2024,7 +2350,7 @@ uint8_t* ScalarCalculate::_InternalSerialize(
         5, this->_internal_time_index(), target);
   }
 
-  // repeated string tag_columns = 6;
+  // repeated string tag_columns = 6 [deprecated = true];
   for (int i = 0, n = this->_internal_tag_columns_size(); i < n; i++) {
     const auto& s = this->_internal_tag_columns(i);
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
@@ -2034,7 +2360,7 @@ uint8_t* ScalarCalculate::_InternalSerialize(
     target = stream->WriteString(6, s, target);
   }
 
-  // string field_column = 7;
+  // string field_column = 7 [deprecated = true];
   if (!this->_internal_field_column().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_field_column().data(), static_cast<int>(this->_internal_field_column().length()),
@@ -2044,6 +2370,27 @@ uint8_t* ScalarCalculate::_InternalSerialize(
         7, this->_internal_field_column(), target);
   }
 
+  // uint64 time_index_idx = 8;
+  if (this->_internal_time_index_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(8, this->_internal_time_index_idx(), target);
+  }
+
+  // repeated uint64 tag_column_indices = 9;
+  {
+    int byte_size = _impl_._tag_column_indices_cached_byte_size_.load(std::memory_order_relaxed);
+    if (byte_size > 0) {
+      target = stream->WriteUInt64Packed(
+          9, _internal_tag_column_indices(), byte_size, target);
+    }
+  }
+
+  // uint64 field_column_idx = 10;
+  if (this->_internal_field_column_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(10, this->_internal_field_column_idx(), target);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -2060,7 +2407,7 @@ size_t ScalarCalculate::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated string tag_columns = 6;
+  // repeated string tag_columns = 6 [deprecated = true];
   total_size += 1 *
       ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.tag_columns_.size());
   for (int i = 0, n = _impl_.tag_columns_.size(); i < n; i++) {
@@ -2068,14 +2415,28 @@ size_t ScalarCalculate::ByteSizeLong() const {
       _impl_.tag_columns_.Get(i));
   }
 
-  // string time_index = 5;
+  // repeated uint64 tag_column_indices = 9;
+  {
+    size_t data_size = ::_pbi::WireFormatLite::
+      UInt64Size(this->_impl_.tag_column_indices_);
+    if (data_size > 0) {
+      total_size += 1 +
+        ::_pbi::WireFormatLite::Int32Size(static_cast<int32_t>(data_size));
+    }
+    int cached_size = ::_pbi::ToCachedSize(data_size);
+    _impl_._tag_column_indices_cached_byte_size_.store(cached_size,
+                                    std::memory_order_relaxed);
+    total_size += data_size;
+  }
+
+  // string time_index = 5 [deprecated = true];
   if (!this->_internal_time_index().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
         this->_internal_time_index());
   }
 
-  // string field_column = 7;
+  // string field_column = 7 [deprecated = true];
   if (!this->_internal_field_column().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
@@ -2097,6 +2458,16 @@ size_t ScalarCalculate::ByteSizeLong() const {
     total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_interval());
   }
 
+  // uint64 time_index_idx = 8;
+  if (this->_internal_time_index_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_time_index_idx());
+  }
+
+  // uint64 field_column_idx = 10;
+  if (this->_internal_field_column_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_field_column_idx());
+  }
+
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
@@ -2116,6 +2487,7 @@ void ScalarCalculate::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const
   (void) cached_has_bits;
 
   _this->_impl_.tag_columns_.MergeFrom(from._impl_.tag_columns_);
+  _this->_impl_.tag_column_indices_.MergeFrom(from._impl_.tag_column_indices_);
   if (!from._internal_time_index().empty()) {
     _this->_internal_set_time_index(from._internal_time_index());
   }
@@ -2131,6 +2503,12 @@ void ScalarCalculate::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const
   if (from._internal_interval() != 0) {
     _this->_internal_set_interval(from._internal_interval());
   }
+  if (from._internal_time_index_idx() != 0) {
+    _this->_internal_set_time_index_idx(from._internal_time_index_idx());
+  }
+  if (from._internal_field_column_idx() != 0) {
+    _this->_internal_set_field_column_idx(from._internal_field_column_idx());
+  }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -2151,6 +2529,7 @@ void ScalarCalculate::InternalSwap(ScalarCalculate* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   _impl_.tag_columns_.InternalSwap(&other->_impl_.tag_columns_);
+  _impl_.tag_column_indices_.InternalSwap(&other->_impl_.tag_column_indices_);
   ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
       &_impl_.time_index_, lhs_arena,
       &other->_impl_.time_index_, rhs_arena
@@ -2160,8 +2539,8 @@ void ScalarCalculate::InternalSwap(ScalarCalculate* other) {
       &other->_impl_.field_column_, rhs_arena
   );
   ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ScalarCalculate, _impl_.interval_)
-      + sizeof(ScalarCalculate::_impl_.interval_)
+      PROTOBUF_FIELD_OFFSET(ScalarCalculate, _impl_.field_column_idx_)
+      + sizeof(ScalarCalculate::_impl_.field_column_idx_)
       - PROTOBUF_FIELD_OFFSET(ScalarCalculate, _impl_.start_)>(
           reinterpret_cast<char*>(&_impl_.start_),
           reinterpret_cast<char*>(&other->_impl_.start_));
@@ -2195,6 +2574,8 @@ Absent::Absent(const Absent& from)
     , decltype(_impl_.start_){}
     , decltype(_impl_.end_){}
     , decltype(_impl_.step_){}
+    , decltype(_impl_.time_index_column_idx_){}
+    , decltype(_impl_.value_column_idx_){}
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -2215,8 +2596,8 @@ Absent::Absent(const Absent& from)
       _this->GetArenaForAllocation());
   }
   ::memcpy(&_impl_.start_, &from._impl_.start_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.step_) -
-    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.step_));
+    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.value_column_idx_) -
+    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.value_column_idx_));
   // @@protoc_insertion_point(copy_constructor:substrait_extension.Absent)
 }
 
@@ -2231,6 +2612,8 @@ inline void Absent::SharedCtor(
     , decltype(_impl_.start_){int64_t{0}}
     , decltype(_impl_.end_){int64_t{0}}
     , decltype(_impl_.step_){int64_t{0}}
+    , decltype(_impl_.time_index_column_idx_){uint64_t{0u}}
+    , decltype(_impl_.value_column_idx_){uint64_t{0u}}
     , /*decltype(_impl_._cached_size_)*/{}
   };
   _impl_.time_index_column_.InitDefault();
@@ -2273,8 +2656,8 @@ void Absent::Clear() {
   _impl_.time_index_column_.ClearToEmpty();
   _impl_.value_column_.ClearToEmpty();
   ::memset(&_impl_.start_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.step_) -
-      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.step_));
+      reinterpret_cast<char*>(&_impl_.value_column_idx_) -
+      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.value_column_idx_));
   _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
 }
 
@@ -2308,7 +2691,7 @@ const char* Absent::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
         } else
           goto handle_unusual;
         continue;
-      // string time_index_column = 4;
+      // string time_index_column = 4 [deprecated = true];
       case 4:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
           auto str = _internal_mutable_time_index_column();
@@ -2318,7 +2701,7 @@ const char* Absent::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
         } else
           goto handle_unusual;
         continue;
-      // string value_column = 5;
+      // string value_column = 5 [deprecated = true];
       case 5:
         if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
           auto str = _internal_mutable_value_column();
@@ -2341,6 +2724,22 @@ const char* Absent::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
         } else
           goto handle_unusual;
         continue;
+      // uint64 time_index_column_idx = 7;
+      case 7:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56)) {
+          _impl_.time_index_column_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
+      // uint64 value_column_idx = 8;
+      case 8:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 64)) {
+          _impl_.value_column_idx_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          CHK_(ptr);
+        } else
+          goto handle_unusual;
+        continue;
       default:
         goto handle_unusual;
     }  // switch
@@ -2388,7 +2787,7 @@ uint8_t* Absent::_InternalSerialize(
     target = ::_pbi::WireFormatLite::WriteInt64ToArray(3, this->_internal_step(), target);
   }
 
-  // string time_index_column = 4;
+  // string time_index_column = 4 [deprecated = true];
   if (!this->_internal_time_index_column().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_time_index_column().data(), static_cast<int>(this->_internal_time_index_column().length()),
@@ -2398,7 +2797,7 @@ uint8_t* Absent::_InternalSerialize(
         4, this->_internal_time_index_column(), target);
   }
 
-  // string value_column = 5;
+  // string value_column = 5 [deprecated = true];
   if (!this->_internal_value_column().empty()) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
       this->_internal_value_column().data(), static_cast<int>(this->_internal_value_column().length()),
@@ -2416,6 +2815,18 @@ uint8_t* Absent::_InternalSerialize(
         InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream);
   }
 
+  // uint64 time_index_column_idx = 7;
+  if (this->_internal_time_index_column_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(7, this->_internal_time_index_column_idx(), target);
+  }
+
+  // uint64 value_column_idx = 8;
+  if (this->_internal_value_column_idx() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(8, this->_internal_value_column_idx(), target);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -2439,14 +2850,14 @@ size_t Absent::ByteSizeLong() const {
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
   }
 
-  // string time_index_column = 4;
+  // string time_index_column = 4 [deprecated = true];
   if (!this->_internal_time_index_column().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
         this->_internal_time_index_column());
   }
 
-  // string value_column = 5;
+  // string value_column = 5 [deprecated = true];
   if (!this->_internal_value_column().empty()) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
@@ -2468,6 +2879,16 @@ size_t Absent::ByteSizeLong() const {
     total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_step());
   }
 
+  // uint64 time_index_column_idx = 7;
+  if (this->_internal_time_index_column_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_time_index_column_idx());
+  }
+
+  // uint64 value_column_idx = 8;
+  if (this->_internal_value_column_idx() != 0) {
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_value_column_idx());
+  }
+
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
@@ -2502,6 +2923,12 @@ void Absent::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBU
   if (from._internal_step() != 0) {
     _this->_internal_set_step(from._internal_step());
   }
+  if (from._internal_time_index_column_idx() != 0) {
+    _this->_internal_set_time_index_column_idx(from._internal_time_index_column_idx());
+  }
+  if (from._internal_value_column_idx() != 0) {
+    _this->_internal_set_value_column_idx(from._internal_value_column_idx());
+  }
   _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -2531,8 +2958,8 @@ void Absent::InternalSwap(Absent* other) {
       &other->_impl_.value_column_, rhs_arena
   );
   ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Absent, _impl_.step_)
-      + sizeof(Absent::_impl_.step_)
+      PROTOBUF_FIELD_OFFSET(Absent, _impl_.value_column_idx_)
+      + sizeof(Absent::_impl_.value_column_idx_)
       - PROTOBUF_FIELD_OFFSET(Absent, _impl_.start_)>(
           reinterpret_cast<char*>(&_impl_.start_),
           reinterpret_cast<char*>(&other->_impl_.start_));
diff --git a/c++/substrait_extension/promql_plan.pb.h b/c++/substrait_extension/promql_plan.pb.h
index 747a7e0b..969f0084 100644
--- a/c++/substrait_extension/promql_plan.pb.h
+++ b/c++/substrait_extension/promql_plan.pb.h
@@ -381,29 +381,31 @@ class InstantManipulate final :
     kEndFieldNumber = 2,
     kIntervalFieldNumber = 3,
     kLookbackDeltaFieldNumber = 4,
+    kTimeIndexIdxFieldNumber = 7,
+    kFieldIndexIdxFieldNumber = 8,
   };
-  // string time_index = 5;
-  void clear_time_index();
-  const std::string& time_index() const;
+  // string time_index = 5 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_time_index();
+  PROTOBUF_DEPRECATED const std::string& time_index() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_time_index(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_time_index();
-  PROTOBUF_NODISCARD std::string* release_time_index();
-  void set_allocated_time_index(std::string* time_index);
+  PROTOBUF_DEPRECATED void set_time_index(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_time_index();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_time_index();
+  PROTOBUF_DEPRECATED void set_allocated_time_index(std::string* time_index);
   private:
   const std::string& _internal_time_index() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_time_index(const std::string& value);
   std::string* _internal_mutable_time_index();
   public:
 
-  // string field_index = 6;
-  void clear_field_index();
-  const std::string& field_index() const;
+  // string field_index = 6 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_field_index();
+  PROTOBUF_DEPRECATED const std::string& field_index() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_field_index(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_field_index();
-  PROTOBUF_NODISCARD std::string* release_field_index();
-  void set_allocated_field_index(std::string* field_index);
+  PROTOBUF_DEPRECATED void set_field_index(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_field_index();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_field_index();
+  PROTOBUF_DEPRECATED void set_allocated_field_index(std::string* field_index);
   private:
   const std::string& _internal_field_index() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_field_index(const std::string& value);
@@ -446,6 +448,24 @@ class InstantManipulate final :
   void _internal_set_lookback_delta(int64_t value);
   public:
 
+  // uint64 time_index_idx = 7;
+  void clear_time_index_idx();
+  uint64_t time_index_idx() const;
+  void set_time_index_idx(uint64_t value);
+  private:
+  uint64_t _internal_time_index_idx() const;
+  void _internal_set_time_index_idx(uint64_t value);
+  public:
+
+  // uint64 field_index_idx = 8;
+  void clear_field_index_idx();
+  uint64_t field_index_idx() const;
+  void set_field_index_idx(uint64_t value);
+  private:
+  uint64_t _internal_field_index_idx() const;
+  void _internal_set_field_index_idx(uint64_t value);
+  public:
+
   // @@protoc_insertion_point(class_scope:substrait_extension.InstantManipulate)
  private:
   class _Internal;
@@ -460,6 +480,8 @@ class InstantManipulate final :
     int64_t end_;
     int64_t interval_;
     int64_t lookback_delta_;
+    uint64_t time_index_idx_;
+    uint64_t field_index_idx_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
@@ -589,42 +611,66 @@ class SeriesNormalize final :
 
   enum : int {
     kTagColumnsFieldNumber = 4,
+    kTagColumnIndicesFieldNumber = 6,
     kTimeIndexFieldNumber = 2,
     kOffsetFieldNumber = 1,
+    kTimeIndexIdxFieldNumber = 5,
     kFilterNanFieldNumber = 3,
   };
-  // repeated string tag_columns = 4;
-  int tag_columns_size() const;
+  // repeated string tag_columns = 4 [deprecated = true];
+  PROTOBUF_DEPRECATED int tag_columns_size() const;
   private:
   int _internal_tag_columns_size() const;
   public:
-  void clear_tag_columns();
-  const std::string& tag_columns(int index) const;
-  std::string* mutable_tag_columns(int index);
-  void set_tag_columns(int index, const std::string& value);
-  void set_tag_columns(int index, std::string&& value);
-  void set_tag_columns(int index, const char* value);
-  void set_tag_columns(int index, const char* value, size_t size);
-  std::string* add_tag_columns();
-  void add_tag_columns(const std::string& value);
-  void add_tag_columns(std::string&& value);
-  void add_tag_columns(const char* value);
-  void add_tag_columns(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
+  PROTOBUF_DEPRECATED void clear_tag_columns();
+  PROTOBUF_DEPRECATED const std::string& tag_columns(int index) const;
+  PROTOBUF_DEPRECATED std::string* mutable_tag_columns(int index);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const std::string& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, std::string&& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value, size_t size);
+  PROTOBUF_DEPRECATED std::string* add_tag_columns();
+  PROTOBUF_DEPRECATED void add_tag_columns(const std::string& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(std::string&& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value, size_t size);
+  PROTOBUF_DEPRECATED const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
+  PROTOBUF_DEPRECATED ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
   private:
   const std::string& _internal_tag_columns(int index) const;
   std::string* _internal_add_tag_columns();
   public:
 
-  // string time_index = 2;
-  void clear_time_index();
-  const std::string& time_index() const;
+  // repeated uint64 tag_column_indices = 6;
+  int tag_column_indices_size() const;
+  private:
+  int _internal_tag_column_indices_size() const;
+  public:
+  void clear_tag_column_indices();
+  private:
+  uint64_t _internal_tag_column_indices(int index) const;
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      _internal_tag_column_indices() const;
+  void _internal_add_tag_column_indices(uint64_t value);
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      _internal_mutable_tag_column_indices();
+  public:
+  uint64_t tag_column_indices(int index) const;
+  void set_tag_column_indices(int index, uint64_t value);
+  void add_tag_column_indices(uint64_t value);
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      tag_column_indices() const;
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      mutable_tag_column_indices();
+
+  // string time_index = 2 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_time_index();
+  PROTOBUF_DEPRECATED const std::string& time_index() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_time_index(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_time_index();
-  PROTOBUF_NODISCARD std::string* release_time_index();
-  void set_allocated_time_index(std::string* time_index);
+  PROTOBUF_DEPRECATED void set_time_index(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_time_index();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_time_index();
+  PROTOBUF_DEPRECATED void set_allocated_time_index(std::string* time_index);
   private:
   const std::string& _internal_time_index() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_time_index(const std::string& value);
@@ -640,6 +686,15 @@ class SeriesNormalize final :
   void _internal_set_offset(int64_t value);
   public:
 
+  // uint64 time_index_idx = 5;
+  void clear_time_index_idx();
+  uint64_t time_index_idx() const;
+  void set_time_index_idx(uint64_t value);
+  private:
+  uint64_t _internal_time_index_idx() const;
+  void _internal_set_time_index_idx(uint64_t value);
+  public:
+
   // bool filter_nan = 3;
   void clear_filter_nan();
   bool filter_nan() const;
@@ -658,8 +713,11 @@ class SeriesNormalize final :
   typedef void DestructorSkippable_;
   struct Impl_ {
     ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> tag_columns_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t > tag_column_indices_;
+    mutable std::atomic<int> _tag_column_indices_cached_byte_size_;
     ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr time_index_;
     int64_t offset_;
+    uint64_t time_index_idx_;
     bool filter_nan_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
@@ -790,46 +848,79 @@ class SeriesDivide final :
 
   enum : int {
     kTagColumnsFieldNumber = 1,
+    kTagColumnIndicesFieldNumber = 3,
     kTimeIndexColumnFieldNumber = 2,
+    kTimeIndexColumnIdxFieldNumber = 4,
   };
-  // repeated string tag_columns = 1;
-  int tag_columns_size() const;
+  // repeated string tag_columns = 1 [deprecated = true];
+  PROTOBUF_DEPRECATED int tag_columns_size() const;
   private:
   int _internal_tag_columns_size() const;
   public:
-  void clear_tag_columns();
-  const std::string& tag_columns(int index) const;
-  std::string* mutable_tag_columns(int index);
-  void set_tag_columns(int index, const std::string& value);
-  void set_tag_columns(int index, std::string&& value);
-  void set_tag_columns(int index, const char* value);
-  void set_tag_columns(int index, const char* value, size_t size);
-  std::string* add_tag_columns();
-  void add_tag_columns(const std::string& value);
-  void add_tag_columns(std::string&& value);
-  void add_tag_columns(const char* value);
-  void add_tag_columns(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
+  PROTOBUF_DEPRECATED void clear_tag_columns();
+  PROTOBUF_DEPRECATED const std::string& tag_columns(int index) const;
+  PROTOBUF_DEPRECATED std::string* mutable_tag_columns(int index);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const std::string& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, std::string&& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value, size_t size);
+  PROTOBUF_DEPRECATED std::string* add_tag_columns();
+  PROTOBUF_DEPRECATED void add_tag_columns(const std::string& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(std::string&& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value, size_t size);
+  PROTOBUF_DEPRECATED const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
+  PROTOBUF_DEPRECATED ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
   private:
   const std::string& _internal_tag_columns(int index) const;
   std::string* _internal_add_tag_columns();
   public:
 
-  // string time_index_column = 2;
-  void clear_time_index_column();
-  const std::string& time_index_column() const;
+  // repeated uint64 tag_column_indices = 3;
+  int tag_column_indices_size() const;
+  private:
+  int _internal_tag_column_indices_size() const;
+  public:
+  void clear_tag_column_indices();
+  private:
+  uint64_t _internal_tag_column_indices(int index) const;
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      _internal_tag_column_indices() const;
+  void _internal_add_tag_column_indices(uint64_t value);
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      _internal_mutable_tag_column_indices();
+  public:
+  uint64_t tag_column_indices(int index) const;
+  void set_tag_column_indices(int index, uint64_t value);
+  void add_tag_column_indices(uint64_t value);
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      tag_column_indices() const;
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      mutable_tag_column_indices();
+
+  // string time_index_column = 2 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_time_index_column();
+  PROTOBUF_DEPRECATED const std::string& time_index_column() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_time_index_column(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_time_index_column();
-  PROTOBUF_NODISCARD std::string* release_time_index_column();
-  void set_allocated_time_index_column(std::string* time_index_column);
+  PROTOBUF_DEPRECATED void set_time_index_column(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_time_index_column();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_time_index_column();
+  PROTOBUF_DEPRECATED void set_allocated_time_index_column(std::string* time_index_column);
   private:
   const std::string& _internal_time_index_column() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_time_index_column(const std::string& value);
   std::string* _internal_mutable_time_index_column();
   public:
 
+  // uint64 time_index_column_idx = 4;
+  void clear_time_index_column_idx();
+  uint64_t time_index_column_idx() const;
+  void set_time_index_column_idx(uint64_t value);
+  private:
+  uint64_t _internal_time_index_column_idx() const;
+  void _internal_set_time_index_column_idx(uint64_t value);
+  public:
+
   // @@protoc_insertion_point(class_scope:substrait_extension.SeriesDivide)
  private:
   class _Internal;
@@ -839,7 +930,10 @@ class SeriesDivide final :
   typedef void DestructorSkippable_;
   struct Impl_ {
     ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> tag_columns_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t > tag_column_indices_;
+    mutable std::atomic<int> _tag_column_indices_cached_byte_size_;
     ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr time_index_column_;
+    uint64_t time_index_column_idx_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
@@ -969,44 +1063,68 @@ class RangeManipulate final :
 
   enum : int {
     kTagColumnsFieldNumber = 6,
+    kTagColumnIndicesFieldNumber = 8,
     kTimeIndexFieldNumber = 5,
     kStartFieldNumber = 1,
     kEndFieldNumber = 2,
     kIntervalFieldNumber = 3,
     kRangeFieldNumber = 4,
+    kTimeIndexIdxFieldNumber = 7,
   };
-  // repeated string tag_columns = 6;
-  int tag_columns_size() const;
+  // repeated string tag_columns = 6 [deprecated = true];
+  PROTOBUF_DEPRECATED int tag_columns_size() const;
   private:
   int _internal_tag_columns_size() const;
   public:
-  void clear_tag_columns();
-  const std::string& tag_columns(int index) const;
-  std::string* mutable_tag_columns(int index);
-  void set_tag_columns(int index, const std::string& value);
-  void set_tag_columns(int index, std::string&& value);
-  void set_tag_columns(int index, const char* value);
-  void set_tag_columns(int index, const char* value, size_t size);
-  std::string* add_tag_columns();
-  void add_tag_columns(const std::string& value);
-  void add_tag_columns(std::string&& value);
-  void add_tag_columns(const char* value);
-  void add_tag_columns(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
+  PROTOBUF_DEPRECATED void clear_tag_columns();
+  PROTOBUF_DEPRECATED const std::string& tag_columns(int index) const;
+  PROTOBUF_DEPRECATED std::string* mutable_tag_columns(int index);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const std::string& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, std::string&& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value, size_t size);
+  PROTOBUF_DEPRECATED std::string* add_tag_columns();
+  PROTOBUF_DEPRECATED void add_tag_columns(const std::string& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(std::string&& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value, size_t size);
+  PROTOBUF_DEPRECATED const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
+  PROTOBUF_DEPRECATED ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
   private:
   const std::string& _internal_tag_columns(int index) const;
   std::string* _internal_add_tag_columns();
   public:
 
-  // string time_index = 5;
-  void clear_time_index();
-  const std::string& time_index() const;
+  // repeated uint64 tag_column_indices = 8;
+  int tag_column_indices_size() const;
+  private:
+  int _internal_tag_column_indices_size() const;
+  public:
+  void clear_tag_column_indices();
+  private:
+  uint64_t _internal_tag_column_indices(int index) const;
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      _internal_tag_column_indices() const;
+  void _internal_add_tag_column_indices(uint64_t value);
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      _internal_mutable_tag_column_indices();
+  public:
+  uint64_t tag_column_indices(int index) const;
+  void set_tag_column_indices(int index, uint64_t value);
+  void add_tag_column_indices(uint64_t value);
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      tag_column_indices() const;
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      mutable_tag_column_indices();
+
+  // string time_index = 5 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_time_index();
+  PROTOBUF_DEPRECATED const std::string& time_index() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_time_index(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_time_index();
-  PROTOBUF_NODISCARD std::string* release_time_index();
-  void set_allocated_time_index(std::string* time_index);
+  PROTOBUF_DEPRECATED void set_time_index(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_time_index();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_time_index();
+  PROTOBUF_DEPRECATED void set_allocated_time_index(std::string* time_index);
   private:
   const std::string& _internal_time_index() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_time_index(const std::string& value);
@@ -1049,6 +1167,15 @@ class RangeManipulate final :
   void _internal_set_range(int64_t value);
   public:
 
+  // uint64 time_index_idx = 7;
+  void clear_time_index_idx();
+  uint64_t time_index_idx() const;
+  void set_time_index_idx(uint64_t value);
+  private:
+  uint64_t _internal_time_index_idx() const;
+  void _internal_set_time_index_idx(uint64_t value);
+  public:
+
   // @@protoc_insertion_point(class_scope:substrait_extension.RangeManipulate)
  private:
   class _Internal;
@@ -1058,11 +1185,14 @@ class RangeManipulate final :
   typedef void DestructorSkippable_;
   struct Impl_ {
     ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> tag_columns_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t > tag_column_indices_;
+    mutable std::atomic<int> _tag_column_indices_cached_byte_size_;
     ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr time_index_;
     int64_t start_;
     int64_t end_;
     int64_t interval_;
     int64_t range_;
+    uint64_t time_index_idx_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
@@ -1192,58 +1322,83 @@ class ScalarCalculate final :
 
   enum : int {
     kTagColumnsFieldNumber = 6,
+    kTagColumnIndicesFieldNumber = 9,
     kTimeIndexFieldNumber = 5,
     kFieldColumnFieldNumber = 7,
     kStartFieldNumber = 1,
     kEndFieldNumber = 2,
     kIntervalFieldNumber = 3,
+    kTimeIndexIdxFieldNumber = 8,
+    kFieldColumnIdxFieldNumber = 10,
   };
-  // repeated string tag_columns = 6;
-  int tag_columns_size() const;
+  // repeated string tag_columns = 6 [deprecated = true];
+  PROTOBUF_DEPRECATED int tag_columns_size() const;
   private:
   int _internal_tag_columns_size() const;
   public:
-  void clear_tag_columns();
-  const std::string& tag_columns(int index) const;
-  std::string* mutable_tag_columns(int index);
-  void set_tag_columns(int index, const std::string& value);
-  void set_tag_columns(int index, std::string&& value);
-  void set_tag_columns(int index, const char* value);
-  void set_tag_columns(int index, const char* value, size_t size);
-  std::string* add_tag_columns();
-  void add_tag_columns(const std::string& value);
-  void add_tag_columns(std::string&& value);
-  void add_tag_columns(const char* value);
-  void add_tag_columns(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
+  PROTOBUF_DEPRECATED void clear_tag_columns();
+  PROTOBUF_DEPRECATED const std::string& tag_columns(int index) const;
+  PROTOBUF_DEPRECATED std::string* mutable_tag_columns(int index);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const std::string& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, std::string&& value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value);
+  PROTOBUF_DEPRECATED void set_tag_columns(int index, const char* value, size_t size);
+  PROTOBUF_DEPRECATED std::string* add_tag_columns();
+  PROTOBUF_DEPRECATED void add_tag_columns(const std::string& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(std::string&& value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value);
+  PROTOBUF_DEPRECATED void add_tag_columns(const char* value, size_t size);
+  PROTOBUF_DEPRECATED const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
+  PROTOBUF_DEPRECATED ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
   private:
   const std::string& _internal_tag_columns(int index) const;
   std::string* _internal_add_tag_columns();
   public:
 
-  // string time_index = 5;
-  void clear_time_index();
-  const std::string& time_index() const;
+  // repeated uint64 tag_column_indices = 9;
+  int tag_column_indices_size() const;
+  private:
+  int _internal_tag_column_indices_size() const;
+  public:
+  void clear_tag_column_indices();
+  private:
+  uint64_t _internal_tag_column_indices(int index) const;
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      _internal_tag_column_indices() const;
+  void _internal_add_tag_column_indices(uint64_t value);
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      _internal_mutable_tag_column_indices();
+  public:
+  uint64_t tag_column_indices(int index) const;
+  void set_tag_column_indices(int index, uint64_t value);
+  void add_tag_column_indices(uint64_t value);
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+      tag_column_indices() const;
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+      mutable_tag_column_indices();
+
+  // string time_index = 5 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_time_index();
+  PROTOBUF_DEPRECATED const std::string& time_index() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_time_index(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_time_index();
-  PROTOBUF_NODISCARD std::string* release_time_index();
-  void set_allocated_time_index(std::string* time_index);
+  PROTOBUF_DEPRECATED void set_time_index(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_time_index();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_time_index();
+  PROTOBUF_DEPRECATED void set_allocated_time_index(std::string* time_index);
   private:
   const std::string& _internal_time_index() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_time_index(const std::string& value);
   std::string* _internal_mutable_time_index();
   public:
 
-  // string field_column = 7;
-  void clear_field_column();
-  const std::string& field_column() const;
+  // string field_column = 7 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_field_column();
+  PROTOBUF_DEPRECATED const std::string& field_column() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_field_column(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_field_column();
-  PROTOBUF_NODISCARD std::string* release_field_column();
-  void set_allocated_field_column(std::string* field_column);
+  PROTOBUF_DEPRECATED void set_field_column(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_field_column();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_field_column();
+  PROTOBUF_DEPRECATED void set_allocated_field_column(std::string* field_column);
   private:
   const std::string& _internal_field_column() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_field_column(const std::string& value);
@@ -1277,6 +1432,24 @@ class ScalarCalculate final :
   void _internal_set_interval(int64_t value);
   public:
 
+  // uint64 time_index_idx = 8;
+  void clear_time_index_idx();
+  uint64_t time_index_idx() const;
+  void set_time_index_idx(uint64_t value);
+  private:
+  uint64_t _internal_time_index_idx() const;
+  void _internal_set_time_index_idx(uint64_t value);
+  public:
+
+  // uint64 field_column_idx = 10;
+  void clear_field_column_idx();
+  uint64_t field_column_idx() const;
+  void set_field_column_idx(uint64_t value);
+  private:
+  uint64_t _internal_field_column_idx() const;
+  void _internal_set_field_column_idx(uint64_t value);
+  public:
+
   // @@protoc_insertion_point(class_scope:substrait_extension.ScalarCalculate)
  private:
   class _Internal;
@@ -1286,11 +1459,15 @@ class ScalarCalculate final :
   typedef void DestructorSkippable_;
   struct Impl_ {
     ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> tag_columns_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t > tag_column_indices_;
+    mutable std::atomic<int> _tag_column_indices_cached_byte_size_;
     ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr time_index_;
     ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr field_column_;
     int64_t start_;
     int64_t end_;
     int64_t interval_;
+    uint64_t time_index_idx_;
+    uint64_t field_column_idx_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
@@ -1425,6 +1602,8 @@ class Absent final :
     kStartFieldNumber = 1,
     kEndFieldNumber = 2,
     kStepFieldNumber = 3,
+    kTimeIndexColumnIdxFieldNumber = 7,
+    kValueColumnIdxFieldNumber = 8,
   };
   // repeated .substrait_extension.LabelPair fake_labels = 6;
   int fake_labels_size() const;
@@ -1444,28 +1623,28 @@ class Absent final :
   const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::substrait_extension::LabelPair >&
       fake_labels() const;
 
-  // string time_index_column = 4;
-  void clear_time_index_column();
-  const std::string& time_index_column() const;
+  // string time_index_column = 4 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_time_index_column();
+  PROTOBUF_DEPRECATED const std::string& time_index_column() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_time_index_column(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_time_index_column();
-  PROTOBUF_NODISCARD std::string* release_time_index_column();
-  void set_allocated_time_index_column(std::string* time_index_column);
+  PROTOBUF_DEPRECATED void set_time_index_column(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_time_index_column();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_time_index_column();
+  PROTOBUF_DEPRECATED void set_allocated_time_index_column(std::string* time_index_column);
   private:
   const std::string& _internal_time_index_column() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_time_index_column(const std::string& value);
   std::string* _internal_mutable_time_index_column();
   public:
 
-  // string value_column = 5;
-  void clear_value_column();
-  const std::string& value_column() const;
+  // string value_column = 5 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_value_column();
+  PROTOBUF_DEPRECATED const std::string& value_column() const;
   template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_value_column(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_value_column();
-  PROTOBUF_NODISCARD std::string* release_value_column();
-  void set_allocated_value_column(std::string* value_column);
+  PROTOBUF_DEPRECATED void set_value_column(ArgT0&& arg0, ArgT... args);
+  PROTOBUF_DEPRECATED std::string* mutable_value_column();
+  PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_value_column();
+  PROTOBUF_DEPRECATED void set_allocated_value_column(std::string* value_column);
   private:
   const std::string& _internal_value_column() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_value_column(const std::string& value);
@@ -1499,6 +1678,24 @@ class Absent final :
   void _internal_set_step(int64_t value);
   public:
 
+  // uint64 time_index_column_idx = 7;
+  void clear_time_index_column_idx();
+  uint64_t time_index_column_idx() const;
+  void set_time_index_column_idx(uint64_t value);
+  private:
+  uint64_t _internal_time_index_column_idx() const;
+  void _internal_set_time_index_column_idx(uint64_t value);
+  public:
+
+  // uint64 value_column_idx = 8;
+  void clear_value_column_idx();
+  uint64_t value_column_idx() const;
+  void set_value_column_idx(uint64_t value);
+  private:
+  uint64_t _internal_value_column_idx() const;
+  void _internal_set_value_column_idx(uint64_t value);
+  public:
+
   // @@protoc_insertion_point(class_scope:substrait_extension.Absent)
  private:
   class _Internal;
@@ -1513,6 +1710,8 @@ class Absent final :
     int64_t start_;
     int64_t end_;
     int64_t step_;
+    uint64_t time_index_column_idx_;
+    uint64_t value_column_idx_;
     mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   };
   union { Impl_ _impl_; };
@@ -1842,7 +2041,7 @@ inline void InstantManipulate::set_lookback_delta(int64_t value) {
   // @@protoc_insertion_point(field_set:substrait_extension.InstantManipulate.lookback_delta)
 }
 
-// string time_index = 5;
+// string time_index = 5 [deprecated = true];
 inline void InstantManipulate::clear_time_index() {
   _impl_.time_index_.ClearToEmpty();
 }
@@ -1892,7 +2091,7 @@ inline void InstantManipulate::set_allocated_time_index(std::string* time_index)
   // @@protoc_insertion_point(field_set_allocated:substrait_extension.InstantManipulate.time_index)
 }
 
-// string field_index = 6;
+// string field_index = 6 [deprecated = true];
 inline void InstantManipulate::clear_field_index() {
   _impl_.field_index_.ClearToEmpty();
 }
@@ -1942,6 +2141,46 @@ inline void InstantManipulate::set_allocated_field_index(std::string* field_inde
   // @@protoc_insertion_point(field_set_allocated:substrait_extension.InstantManipulate.field_index)
 }
 
+// uint64 time_index_idx = 7;
+inline void InstantManipulate::clear_time_index_idx() {
+  _impl_.time_index_idx_ = uint64_t{0u};
+}
+inline uint64_t InstantManipulate::_internal_time_index_idx() const {
+  return _impl_.time_index_idx_;
+}
+inline uint64_t InstantManipulate::time_index_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.InstantManipulate.time_index_idx)
+  return _internal_time_index_idx();
+}
+inline void InstantManipulate::_internal_set_time_index_idx(uint64_t value) {
+  
+  _impl_.time_index_idx_ = value;
+}
+inline void InstantManipulate::set_time_index_idx(uint64_t value) {
+  _internal_set_time_index_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.InstantManipulate.time_index_idx)
+}
+
+// uint64 field_index_idx = 8;
+inline void InstantManipulate::clear_field_index_idx() {
+  _impl_.field_index_idx_ = uint64_t{0u};
+}
+inline uint64_t InstantManipulate::_internal_field_index_idx() const {
+  return _impl_.field_index_idx_;
+}
+inline uint64_t InstantManipulate::field_index_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.InstantManipulate.field_index_idx)
+  return _internal_field_index_idx();
+}
+inline void InstantManipulate::_internal_set_field_index_idx(uint64_t value) {
+  
+  _impl_.field_index_idx_ = value;
+}
+inline void InstantManipulate::set_field_index_idx(uint64_t value) {
+  _internal_set_field_index_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.InstantManipulate.field_index_idx)
+}
+
 // -------------------------------------------------------------------
 
 // SeriesNormalize
@@ -1966,7 +2205,7 @@ inline void SeriesNormalize::set_offset(int64_t value) {
   // @@protoc_insertion_point(field_set:substrait_extension.SeriesNormalize.offset)
 }
 
-// string time_index = 2;
+// string time_index = 2 [deprecated = true];
 inline void SeriesNormalize::clear_time_index() {
   _impl_.time_index_.ClearToEmpty();
 }
@@ -2036,7 +2275,7 @@ inline void SeriesNormalize::set_filter_nan(bool value) {
   // @@protoc_insertion_point(field_set:substrait_extension.SeriesNormalize.filter_nan)
 }
 
-// repeated string tag_columns = 4;
+// repeated string tag_columns = 4 [deprecated = true];
 inline int SeriesNormalize::_internal_tag_columns_size() const {
   return _impl_.tag_columns_.size();
 }
@@ -2111,11 +2350,78 @@ SeriesNormalize::mutable_tag_columns() {
   return &_impl_.tag_columns_;
 }
 
+// uint64 time_index_idx = 5;
+inline void SeriesNormalize::clear_time_index_idx() {
+  _impl_.time_index_idx_ = uint64_t{0u};
+}
+inline uint64_t SeriesNormalize::_internal_time_index_idx() const {
+  return _impl_.time_index_idx_;
+}
+inline uint64_t SeriesNormalize::time_index_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.SeriesNormalize.time_index_idx)
+  return _internal_time_index_idx();
+}
+inline void SeriesNormalize::_internal_set_time_index_idx(uint64_t value) {
+  
+  _impl_.time_index_idx_ = value;
+}
+inline void SeriesNormalize::set_time_index_idx(uint64_t value) {
+  _internal_set_time_index_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.SeriesNormalize.time_index_idx)
+}
+
+// repeated uint64 tag_column_indices = 6;
+inline int SeriesNormalize::_internal_tag_column_indices_size() const {
+  return _impl_.tag_column_indices_.size();
+}
+inline int SeriesNormalize::tag_column_indices_size() const {
+  return _internal_tag_column_indices_size();
+}
+inline void SeriesNormalize::clear_tag_column_indices() {
+  _impl_.tag_column_indices_.Clear();
+}
+inline uint64_t SeriesNormalize::_internal_tag_column_indices(int index) const {
+  return _impl_.tag_column_indices_.Get(index);
+}
+inline uint64_t SeriesNormalize::tag_column_indices(int index) const {
+  // @@protoc_insertion_point(field_get:substrait_extension.SeriesNormalize.tag_column_indices)
+  return _internal_tag_column_indices(index);
+}
+inline void SeriesNormalize::set_tag_column_indices(int index, uint64_t value) {
+  _impl_.tag_column_indices_.Set(index, value);
+  // @@protoc_insertion_point(field_set:substrait_extension.SeriesNormalize.tag_column_indices)
+}
+inline void SeriesNormalize::_internal_add_tag_column_indices(uint64_t value) {
+  _impl_.tag_column_indices_.Add(value);
+}
+inline void SeriesNormalize::add_tag_column_indices(uint64_t value) {
+  _internal_add_tag_column_indices(value);
+  // @@protoc_insertion_point(field_add:substrait_extension.SeriesNormalize.tag_column_indices)
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+SeriesNormalize::_internal_tag_column_indices() const {
+  return _impl_.tag_column_indices_;
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+SeriesNormalize::tag_column_indices() const {
+  // @@protoc_insertion_point(field_list:substrait_extension.SeriesNormalize.tag_column_indices)
+  return _internal_tag_column_indices();
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+SeriesNormalize::_internal_mutable_tag_column_indices() {
+  return &_impl_.tag_column_indices_;
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+SeriesNormalize::mutable_tag_column_indices() {
+  // @@protoc_insertion_point(field_mutable_list:substrait_extension.SeriesNormalize.tag_column_indices)
+  return _internal_mutable_tag_column_indices();
+}
+
 // -------------------------------------------------------------------
 
 // SeriesDivide
 
-// repeated string tag_columns = 1;
+// repeated string tag_columns = 1 [deprecated = true];
 inline int SeriesDivide::_internal_tag_columns_size() const {
   return _impl_.tag_columns_.size();
 }
@@ -2190,7 +2496,7 @@ SeriesDivide::mutable_tag_columns() {
   return &_impl_.tag_columns_;
 }
 
-// string time_index_column = 2;
+// string time_index_column = 2 [deprecated = true];
 inline void SeriesDivide::clear_time_index_column() {
   _impl_.time_index_column_.ClearToEmpty();
 }
@@ -2240,6 +2546,73 @@ inline void SeriesDivide::set_allocated_time_index_column(std::string* time_inde
   // @@protoc_insertion_point(field_set_allocated:substrait_extension.SeriesDivide.time_index_column)
 }
 
+// repeated uint64 tag_column_indices = 3;
+inline int SeriesDivide::_internal_tag_column_indices_size() const {
+  return _impl_.tag_column_indices_.size();
+}
+inline int SeriesDivide::tag_column_indices_size() const {
+  return _internal_tag_column_indices_size();
+}
+inline void SeriesDivide::clear_tag_column_indices() {
+  _impl_.tag_column_indices_.Clear();
+}
+inline uint64_t SeriesDivide::_internal_tag_column_indices(int index) const {
+  return _impl_.tag_column_indices_.Get(index);
+}
+inline uint64_t SeriesDivide::tag_column_indices(int index) const {
+  // @@protoc_insertion_point(field_get:substrait_extension.SeriesDivide.tag_column_indices)
+  return _internal_tag_column_indices(index);
+}
+inline void SeriesDivide::set_tag_column_indices(int index, uint64_t value) {
+  _impl_.tag_column_indices_.Set(index, value);
+  // @@protoc_insertion_point(field_set:substrait_extension.SeriesDivide.tag_column_indices)
+}
+inline void SeriesDivide::_internal_add_tag_column_indices(uint64_t value) {
+  _impl_.tag_column_indices_.Add(value);
+}
+inline void SeriesDivide::add_tag_column_indices(uint64_t value) {
+  _internal_add_tag_column_indices(value);
+  // @@protoc_insertion_point(field_add:substrait_extension.SeriesDivide.tag_column_indices)
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+SeriesDivide::_internal_tag_column_indices() const {
+  return _impl_.tag_column_indices_;
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+SeriesDivide::tag_column_indices() const {
+  // @@protoc_insertion_point(field_list:substrait_extension.SeriesDivide.tag_column_indices)
+  return _internal_tag_column_indices();
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+SeriesDivide::_internal_mutable_tag_column_indices() {
+  return &_impl_.tag_column_indices_;
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+SeriesDivide::mutable_tag_column_indices() {
+  // @@protoc_insertion_point(field_mutable_list:substrait_extension.SeriesDivide.tag_column_indices)
+  return _internal_mutable_tag_column_indices();
+}
+
+// uint64 time_index_column_idx = 4;
+inline void SeriesDivide::clear_time_index_column_idx() {
+  _impl_.time_index_column_idx_ = uint64_t{0u};
+}
+inline uint64_t SeriesDivide::_internal_time_index_column_idx() const {
+  return _impl_.time_index_column_idx_;
+}
+inline uint64_t SeriesDivide::time_index_column_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.SeriesDivide.time_index_column_idx)
+  return _internal_time_index_column_idx();
+}
+inline void SeriesDivide::_internal_set_time_index_column_idx(uint64_t value) {
+  
+  _impl_.time_index_column_idx_ = value;
+}
+inline void SeriesDivide::set_time_index_column_idx(uint64_t value) {
+  _internal_set_time_index_column_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.SeriesDivide.time_index_column_idx)
+}
+
 // -------------------------------------------------------------------
 
 // RangeManipulate
@@ -2324,7 +2697,7 @@ inline void RangeManipulate::set_range(int64_t value) {
   // @@protoc_insertion_point(field_set:substrait_extension.RangeManipulate.range)
 }
 
-// string time_index = 5;
+// string time_index = 5 [deprecated = true];
 inline void RangeManipulate::clear_time_index() {
   _impl_.time_index_.ClearToEmpty();
 }
@@ -2374,7 +2747,7 @@ inline void RangeManipulate::set_allocated_time_index(std::string* time_index) {
   // @@protoc_insertion_point(field_set_allocated:substrait_extension.RangeManipulate.time_index)
 }
 
-// repeated string tag_columns = 6;
+// repeated string tag_columns = 6 [deprecated = true];
 inline int RangeManipulate::_internal_tag_columns_size() const {
   return _impl_.tag_columns_.size();
 }
@@ -2449,6 +2822,73 @@ RangeManipulate::mutable_tag_columns() {
   return &_impl_.tag_columns_;
 }
 
+// uint64 time_index_idx = 7;
+inline void RangeManipulate::clear_time_index_idx() {
+  _impl_.time_index_idx_ = uint64_t{0u};
+}
+inline uint64_t RangeManipulate::_internal_time_index_idx() const {
+  return _impl_.time_index_idx_;
+}
+inline uint64_t RangeManipulate::time_index_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.RangeManipulate.time_index_idx)
+  return _internal_time_index_idx();
+}
+inline void RangeManipulate::_internal_set_time_index_idx(uint64_t value) {
+  
+  _impl_.time_index_idx_ = value;
+}
+inline void RangeManipulate::set_time_index_idx(uint64_t value) {
+  _internal_set_time_index_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.RangeManipulate.time_index_idx)
+}
+
+// repeated uint64 tag_column_indices = 8;
+inline int RangeManipulate::_internal_tag_column_indices_size() const {
+  return _impl_.tag_column_indices_.size();
+}
+inline int RangeManipulate::tag_column_indices_size() const {
+  return _internal_tag_column_indices_size();
+}
+inline void RangeManipulate::clear_tag_column_indices() {
+  _impl_.tag_column_indices_.Clear();
+}
+inline uint64_t RangeManipulate::_internal_tag_column_indices(int index) const {
+  return _impl_.tag_column_indices_.Get(index);
+}
+inline uint64_t RangeManipulate::tag_column_indices(int index) const {
+  // @@protoc_insertion_point(field_get:substrait_extension.RangeManipulate.tag_column_indices)
+  return _internal_tag_column_indices(index);
+}
+inline void RangeManipulate::set_tag_column_indices(int index, uint64_t value) {
+  _impl_.tag_column_indices_.Set(index, value);
+  // @@protoc_insertion_point(field_set:substrait_extension.RangeManipulate.tag_column_indices)
+}
+inline void RangeManipulate::_internal_add_tag_column_indices(uint64_t value) {
+  _impl_.tag_column_indices_.Add(value);
+}
+inline void RangeManipulate::add_tag_column_indices(uint64_t value) {
+  _internal_add_tag_column_indices(value);
+  // @@protoc_insertion_point(field_add:substrait_extension.RangeManipulate.tag_column_indices)
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+RangeManipulate::_internal_tag_column_indices() const {
+  return _impl_.tag_column_indices_;
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+RangeManipulate::tag_column_indices() const {
+  // @@protoc_insertion_point(field_list:substrait_extension.RangeManipulate.tag_column_indices)
+  return _internal_tag_column_indices();
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+RangeManipulate::_internal_mutable_tag_column_indices() {
+  return &_impl_.tag_column_indices_;
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+RangeManipulate::mutable_tag_column_indices() {
+  // @@protoc_insertion_point(field_mutable_list:substrait_extension.RangeManipulate.tag_column_indices)
+  return _internal_mutable_tag_column_indices();
+}
+
 // -------------------------------------------------------------------
 
 // ScalarCalculate
@@ -2513,7 +2953,7 @@ inline void ScalarCalculate::set_interval(int64_t value) {
   // @@protoc_insertion_point(field_set:substrait_extension.ScalarCalculate.interval)
 }
 
-// string time_index = 5;
+// string time_index = 5 [deprecated = true];
 inline void ScalarCalculate::clear_time_index() {
   _impl_.time_index_.ClearToEmpty();
 }
@@ -2563,7 +3003,7 @@ inline void ScalarCalculate::set_allocated_time_index(std::string* time_index) {
   // @@protoc_insertion_point(field_set_allocated:substrait_extension.ScalarCalculate.time_index)
 }
 
-// repeated string tag_columns = 6;
+// repeated string tag_columns = 6 [deprecated = true];
 inline int ScalarCalculate::_internal_tag_columns_size() const {
   return _impl_.tag_columns_.size();
 }
@@ -2638,7 +3078,7 @@ ScalarCalculate::mutable_tag_columns() {
   return &_impl_.tag_columns_;
 }
 
-// string field_column = 7;
+// string field_column = 7 [deprecated = true];
 inline void ScalarCalculate::clear_field_column() {
   _impl_.field_column_.ClearToEmpty();
 }
@@ -2688,6 +3128,93 @@ inline void ScalarCalculate::set_allocated_field_column(std::string* field_colum
   // @@protoc_insertion_point(field_set_allocated:substrait_extension.ScalarCalculate.field_column)
 }
 
+// uint64 time_index_idx = 8;
+inline void ScalarCalculate::clear_time_index_idx() {
+  _impl_.time_index_idx_ = uint64_t{0u};
+}
+inline uint64_t ScalarCalculate::_internal_time_index_idx() const {
+  return _impl_.time_index_idx_;
+}
+inline uint64_t ScalarCalculate::time_index_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.ScalarCalculate.time_index_idx)
+  return _internal_time_index_idx();
+}
+inline void ScalarCalculate::_internal_set_time_index_idx(uint64_t value) {
+  
+  _impl_.time_index_idx_ = value;
+}
+inline void ScalarCalculate::set_time_index_idx(uint64_t value) {
+  _internal_set_time_index_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.ScalarCalculate.time_index_idx)
+}
+
+// repeated uint64 tag_column_indices = 9;
+inline int ScalarCalculate::_internal_tag_column_indices_size() const {
+  return _impl_.tag_column_indices_.size();
+}
+inline int ScalarCalculate::tag_column_indices_size() const {
+  return _internal_tag_column_indices_size();
+}
+inline void ScalarCalculate::clear_tag_column_indices() {
+  _impl_.tag_column_indices_.Clear();
+}
+inline uint64_t ScalarCalculate::_internal_tag_column_indices(int index) const {
+  return _impl_.tag_column_indices_.Get(index);
+}
+inline uint64_t ScalarCalculate::tag_column_indices(int index) const {
+  // @@protoc_insertion_point(field_get:substrait_extension.ScalarCalculate.tag_column_indices)
+  return _internal_tag_column_indices(index);
+}
+inline void ScalarCalculate::set_tag_column_indices(int index, uint64_t value) {
+  _impl_.tag_column_indices_.Set(index, value);
+  // @@protoc_insertion_point(field_set:substrait_extension.ScalarCalculate.tag_column_indices)
+}
+inline void ScalarCalculate::_internal_add_tag_column_indices(uint64_t value) {
+  _impl_.tag_column_indices_.Add(value);
+}
+inline void ScalarCalculate::add_tag_column_indices(uint64_t value) {
+  _internal_add_tag_column_indices(value);
+  // @@protoc_insertion_point(field_add:substrait_extension.ScalarCalculate.tag_column_indices)
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+ScalarCalculate::_internal_tag_column_indices() const {
+  return _impl_.tag_column_indices_;
+}
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >&
+ScalarCalculate::tag_column_indices() const {
+  // @@protoc_insertion_point(field_list:substrait_extension.ScalarCalculate.tag_column_indices)
+  return _internal_tag_column_indices();
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+ScalarCalculate::_internal_mutable_tag_column_indices() {
+  return &_impl_.tag_column_indices_;
+}
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >*
+ScalarCalculate::mutable_tag_column_indices() {
+  // @@protoc_insertion_point(field_mutable_list:substrait_extension.ScalarCalculate.tag_column_indices)
+  return _internal_mutable_tag_column_indices();
+}
+
+// uint64 field_column_idx = 10;
+inline void ScalarCalculate::clear_field_column_idx() {
+  _impl_.field_column_idx_ = uint64_t{0u};
+}
+inline uint64_t ScalarCalculate::_internal_field_column_idx() const {
+  return _impl_.field_column_idx_;
+}
+inline uint64_t ScalarCalculate::field_column_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.ScalarCalculate.field_column_idx)
+  return _internal_field_column_idx();
+}
+inline void ScalarCalculate::_internal_set_field_column_idx(uint64_t value) {
+  
+  _impl_.field_column_idx_ = value;
+}
+inline void ScalarCalculate::set_field_column_idx(uint64_t value) {
+  _internal_set_field_column_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.ScalarCalculate.field_column_idx)
+}
+
 // -------------------------------------------------------------------
 
 // Absent
@@ -2752,7 +3279,7 @@ inline void Absent::set_step(int64_t value) {
   // @@protoc_insertion_point(field_set:substrait_extension.Absent.step)
 }
 
-// string time_index_column = 4;
+// string time_index_column = 4 [deprecated = true];
 inline void Absent::clear_time_index_column() {
   _impl_.time_index_column_.ClearToEmpty();
 }
@@ -2802,7 +3329,7 @@ inline void Absent::set_allocated_time_index_column(std::string* time_index_colu
   // @@protoc_insertion_point(field_set_allocated:substrait_extension.Absent.time_index_column)
 }
 
-// string value_column = 5;
+// string value_column = 5 [deprecated = true];
 inline void Absent::clear_value_column() {
   _impl_.value_column_.ClearToEmpty();
 }
@@ -2892,6 +3419,46 @@ Absent::fake_labels() const {
   return _impl_.fake_labels_;
 }
 
+// uint64 time_index_column_idx = 7;
+inline void Absent::clear_time_index_column_idx() {
+  _impl_.time_index_column_idx_ = uint64_t{0u};
+}
+inline uint64_t Absent::_internal_time_index_column_idx() const {
+  return _impl_.time_index_column_idx_;
+}
+inline uint64_t Absent::time_index_column_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.Absent.time_index_column_idx)
+  return _internal_time_index_column_idx();
+}
+inline void Absent::_internal_set_time_index_column_idx(uint64_t value) {
+  
+  _impl_.time_index_column_idx_ = value;
+}
+inline void Absent::set_time_index_column_idx(uint64_t value) {
+  _internal_set_time_index_column_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.Absent.time_index_column_idx)
+}
+
+// uint64 value_column_idx = 8;
+inline void Absent::clear_value_column_idx() {
+  _impl_.value_column_idx_ = uint64_t{0u};
+}
+inline uint64_t Absent::_internal_value_column_idx() const {
+  return _impl_.value_column_idx_;
+}
+inline uint64_t Absent::value_column_idx() const {
+  // @@protoc_insertion_point(field_get:substrait_extension.Absent.value_column_idx)
+  return _internal_value_column_idx();
+}
+inline void Absent::_internal_set_value_column_idx(uint64_t value) {
+  
+  _impl_.value_column_idx_ = value;
+}
+inline void Absent::set_value_column_idx(uint64_t value) {
+  _internal_set_value_column_idx(value);
+  // @@protoc_insertion_point(field_set:substrait_extension.Absent.value_column_idx)
+}
+
 // -------------------------------------------------------------------
 
 // LabelPair
diff --git a/go/substrait_extension/promql_plan.pb.go b/go/substrait_extension/promql_plan.pb.go
index 95d9dcd1..bff162b1 100644
--- a/go/substrait_extension/promql_plan.pb.go
+++ b/go/substrait_extension/promql_plan.pb.go
@@ -113,10 +113,20 @@ type InstantManipulate struct {
 	Interval int64 `protobuf:"varint,3,opt,name=interval,proto3" json:"interval,omitempty"`
 	// Look-back delta in millisecond
 	LookbackDelta int64 `protobuf:"varint,4,opt,name=lookback_delta,json=lookbackDelta,proto3" json:"lookback_delta,omitempty"`
-	// Column name of time index column
+	// [DEPRECATED] Column name of time index column.
+	// Use `time_index_idx` instead.
+	//
+	// Deprecated: Do not use.
 	TimeIndex string `protobuf:"bytes,5,opt,name=time_index,json=timeIndex,proto3" json:"time_index,omitempty"`
-	// Optional field column name for validating staleness
+	// [DEPRECATED] Optional field column name for validating staleness.
+	// Use `field_index_idx` instead.
+	//
+	// Deprecated: Do not use.
 	FieldIndex string `protobuf:"bytes,6,opt,name=field_index,json=fieldIndex,proto3" json:"field_index,omitempty"`
+	// Column index of time index column
+	TimeIndexIdx uint64 `protobuf:"varint,7,opt,name=time_index_idx,json=timeIndexIdx,proto3" json:"time_index_idx,omitempty"`
+	// Optional field column index for validating staleness
+	FieldIndexIdx uint64 `protobuf:"varint,8,opt,name=field_index_idx,json=fieldIndexIdx,proto3" json:"field_index_idx,omitempty"`
 }
 
 func (x *InstantManipulate) Reset() {
@@ -179,6 +189,7 @@ func (x *InstantManipulate) GetLookbackDelta() int64 {
 	return 0
 }
 
+// Deprecated: Do not use.
 func (x *InstantManipulate) GetTimeIndex() string {
 	if x != nil {
 		return x.TimeIndex
@@ -186,6 +197,7 @@ func (x *InstantManipulate) GetTimeIndex() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (x *InstantManipulate) GetFieldIndex() string {
 	if x != nil {
 		return x.FieldIndex
@@ -193,6 +205,20 @@ func (x *InstantManipulate) GetFieldIndex() string {
 	return ""
 }
 
+func (x *InstantManipulate) GetTimeIndexIdx() uint64 {
+	if x != nil {
+		return x.TimeIndexIdx
+	}
+	return 0
+}
+
+func (x *InstantManipulate) GetFieldIndexIdx() uint64 {
+	if x != nil {
+		return x.FieldIndexIdx
+	}
+	return 0
+}
+
 type SeriesNormalize struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -200,12 +226,22 @@ type SeriesNormalize struct {
 
 	// Offset in millisecond
 	Offset int64 `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"`
-	// Column name of time index column
+	// [DEPRECATED] Column name of time index column.
+	// Use `time_index_idx` instead.
+	//
+	// Deprecated: Do not use.
 	TimeIndex string `protobuf:"bytes,2,opt,name=time_index,json=timeIndex,proto3" json:"time_index,omitempty"`
 	// Whether to filter out NaN value
 	FilterNan bool `protobuf:"varint,3,opt,name=filter_nan,json=filterNan,proto3" json:"filter_nan,omitempty"`
-	// Names of tag columns
+	// [DEPRECATED] Names of tag columns.
+	// Use `tag_column_indices` instead.
+	//
+	// Deprecated: Do not use.
 	TagColumns []string `protobuf:"bytes,4,rep,name=tag_columns,json=tagColumns,proto3" json:"tag_columns,omitempty"`
+	// Column index of time index column
+	TimeIndexIdx uint64 `protobuf:"varint,5,opt,name=time_index_idx,json=timeIndexIdx,proto3" json:"time_index_idx,omitempty"`
+	// Indices of tag columns
+	TagColumnIndices []uint64 `protobuf:"varint,6,rep,packed,name=tag_column_indices,json=tagColumnIndices,proto3" json:"tag_column_indices,omitempty"`
 }
 
 func (x *SeriesNormalize) Reset() {
@@ -247,6 +283,7 @@ func (x *SeriesNormalize) GetOffset() int64 {
 	return 0
 }
 
+// Deprecated: Do not use.
 func (x *SeriesNormalize) GetTimeIndex() string {
 	if x != nil {
 		return x.TimeIndex
@@ -261,6 +298,7 @@ func (x *SeriesNormalize) GetFilterNan() bool {
 	return false
 }
 
+// Deprecated: Do not use.
 func (x *SeriesNormalize) GetTagColumns() []string {
 	if x != nil {
 		return x.TagColumns
@@ -268,15 +306,39 @@ func (x *SeriesNormalize) GetTagColumns() []string {
 	return nil
 }
 
+func (x *SeriesNormalize) GetTimeIndexIdx() uint64 {
+	if x != nil {
+		return x.TimeIndexIdx
+	}
+	return 0
+}
+
+func (x *SeriesNormalize) GetTagColumnIndices() []uint64 {
+	if x != nil {
+		return x.TagColumnIndices
+	}
+	return nil
+}
+
 type SeriesDivide struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Names of tag columns
+	// [DEPRECATED] Names of tag columns.
+	// Use `tag_column_indices` instead.
+	//
+	// Deprecated: Do not use.
 	TagColumns []string `protobuf:"bytes,1,rep,name=tag_columns,json=tagColumns,proto3" json:"tag_columns,omitempty"`
-	// Name of time index column
+	// [DEPRECATED] Name of time index column.
+	// Use `time_index_column_idx` instead.
+	//
+	// Deprecated: Do not use.
 	TimeIndexColumn string `protobuf:"bytes,2,opt,name=time_index_column,json=timeIndexColumn,proto3" json:"time_index_column,omitempty"`
+	// Indices of tag columns
+	TagColumnIndices []uint64 `protobuf:"varint,3,rep,packed,name=tag_column_indices,json=tagColumnIndices,proto3" json:"tag_column_indices,omitempty"`
+	// Index of time index column
+	TimeIndexColumnIdx uint64 `protobuf:"varint,4,opt,name=time_index_column_idx,json=timeIndexColumnIdx,proto3" json:"time_index_column_idx,omitempty"`
 }
 
 func (x *SeriesDivide) Reset() {
@@ -311,6 +373,7 @@ func (*SeriesDivide) Descriptor() ([]byte, []int) {
 	return file_substrait_extension_promql_plan_proto_rawDescGZIP(), []int{3}
 }
 
+// Deprecated: Do not use.
 func (x *SeriesDivide) GetTagColumns() []string {
 	if x != nil {
 		return x.TagColumns
@@ -318,6 +381,7 @@ func (x *SeriesDivide) GetTagColumns() []string {
 	return nil
 }
 
+// Deprecated: Do not use.
 func (x *SeriesDivide) GetTimeIndexColumn() string {
 	if x != nil {
 		return x.TimeIndexColumn
@@ -325,6 +389,20 @@ func (x *SeriesDivide) GetTimeIndexColumn() string {
 	return ""
 }
 
+func (x *SeriesDivide) GetTagColumnIndices() []uint64 {
+	if x != nil {
+		return x.TagColumnIndices
+	}
+	return nil
+}
+
+func (x *SeriesDivide) GetTimeIndexColumnIdx() uint64 {
+	if x != nil {
+		return x.TimeIndexColumnIdx
+	}
+	return 0
+}
+
 type RangeManipulate struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -338,10 +416,20 @@ type RangeManipulate struct {
 	Interval int64 `protobuf:"varint,3,opt,name=interval,proto3" json:"interval,omitempty"`
 	// Range in millisecond
 	Range int64 `protobuf:"varint,4,opt,name=range,proto3" json:"range,omitempty"`
-	// Column name of time index column
+	// [DEPRECATED] Column name of time index column.
+	// Use `time_index_idx` instead.
+	//
+	// Deprecated: Do not use.
 	TimeIndex string `protobuf:"bytes,5,opt,name=time_index,json=timeIndex,proto3" json:"time_index,omitempty"`
-	// Names of tag columns
+	// [DEPRECATED] Names of tag columns.
+	// Use `tag_column_indices` instead.
+	//
+	// Deprecated: Do not use.
 	TagColumns []string `protobuf:"bytes,6,rep,name=tag_columns,json=tagColumns,proto3" json:"tag_columns,omitempty"`
+	// Column index of time index column
+	TimeIndexIdx uint64 `protobuf:"varint,7,opt,name=time_index_idx,json=timeIndexIdx,proto3" json:"time_index_idx,omitempty"`
+	// Indices of tag columns
+	TagColumnIndices []uint64 `protobuf:"varint,8,rep,packed,name=tag_column_indices,json=tagColumnIndices,proto3" json:"tag_column_indices,omitempty"`
 }
 
 func (x *RangeManipulate) Reset() {
@@ -404,6 +492,7 @@ func (x *RangeManipulate) GetRange() int64 {
 	return 0
 }
 
+// Deprecated: Do not use.
 func (x *RangeManipulate) GetTimeIndex() string {
 	if x != nil {
 		return x.TimeIndex
@@ -411,6 +500,7 @@ func (x *RangeManipulate) GetTimeIndex() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (x *RangeManipulate) GetTagColumns() []string {
 	if x != nil {
 		return x.TagColumns
@@ -418,6 +508,20 @@ func (x *RangeManipulate) GetTagColumns() []string {
 	return nil
 }
 
+func (x *RangeManipulate) GetTimeIndexIdx() uint64 {
+	if x != nil {
+		return x.TimeIndexIdx
+	}
+	return 0
+}
+
+func (x *RangeManipulate) GetTagColumnIndices() []uint64 {
+	if x != nil {
+		return x.TagColumnIndices
+	}
+	return nil
+}
+
 type ScalarCalculate struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -429,12 +533,27 @@ type ScalarCalculate struct {
 	End int64 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
 	// Interval in millisecond
 	Interval int64 `protobuf:"varint,3,opt,name=interval,proto3" json:"interval,omitempty"`
-	// Column name of time index column
+	// [DEPRECATED] Column name of time index column.
+	// Use `time_index_idx` instead.
+	//
+	// Deprecated: Do not use.
 	TimeIndex string `protobuf:"bytes,5,opt,name=time_index,json=timeIndex,proto3" json:"time_index,omitempty"`
-	// Names of tag columns
+	// [DEPRECATED] Names of tag columns.
+	// Use `tag_column_indices` instead.
+	//
+	// Deprecated: Do not use.
 	TagColumns []string `protobuf:"bytes,6,rep,name=tag_columns,json=tagColumns,proto3" json:"tag_columns,omitempty"`
-	// Column name of field column
+	// [DEPRECATED] Column name of field column.
+	// Use `field_column_idx` instead.
+	//
+	// Deprecated: Do not use.
 	FieldColumn string `protobuf:"bytes,7,opt,name=field_column,json=fieldColumn,proto3" json:"field_column,omitempty"`
+	// Column index of time index column
+	TimeIndexIdx uint64 `protobuf:"varint,8,opt,name=time_index_idx,json=timeIndexIdx,proto3" json:"time_index_idx,omitempty"`
+	// Indices of tag columns
+	TagColumnIndices []uint64 `protobuf:"varint,9,rep,packed,name=tag_column_indices,json=tagColumnIndices,proto3" json:"tag_column_indices,omitempty"`
+	// Column index of field column
+	FieldColumnIdx uint64 `protobuf:"varint,10,opt,name=field_column_idx,json=fieldColumnIdx,proto3" json:"field_column_idx,omitempty"`
 }
 
 func (x *ScalarCalculate) Reset() {
@@ -490,6 +609,7 @@ func (x *ScalarCalculate) GetInterval() int64 {
 	return 0
 }
 
+// Deprecated: Do not use.
 func (x *ScalarCalculate) GetTimeIndex() string {
 	if x != nil {
 		return x.TimeIndex
@@ -497,6 +617,7 @@ func (x *ScalarCalculate) GetTimeIndex() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (x *ScalarCalculate) GetTagColumns() []string {
 	if x != nil {
 		return x.TagColumns
@@ -504,6 +625,7 @@ func (x *ScalarCalculate) GetTagColumns() []string {
 	return nil
 }
 
+// Deprecated: Do not use.
 func (x *ScalarCalculate) GetFieldColumn() string {
 	if x != nil {
 		return x.FieldColumn
@@ -511,6 +633,27 @@ func (x *ScalarCalculate) GetFieldColumn() string {
 	return ""
 }
 
+func (x *ScalarCalculate) GetTimeIndexIdx() uint64 {
+	if x != nil {
+		return x.TimeIndexIdx
+	}
+	return 0
+}
+
+func (x *ScalarCalculate) GetTagColumnIndices() []uint64 {
+	if x != nil {
+		return x.TagColumnIndices
+	}
+	return nil
+}
+
+func (x *ScalarCalculate) GetFieldColumnIdx() uint64 {
+	if x != nil {
+		return x.FieldColumnIdx
+	}
+	return 0
+}
+
 type Absent struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -522,12 +665,22 @@ type Absent struct {
 	End int64 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"`
 	// Step in millisecond
 	Step int64 `protobuf:"varint,3,opt,name=step,proto3" json:"step,omitempty"`
-	// Column name of time index column
+	// [DEPRECATED] Column name of time index column.
+	// Use `time_index_column_idx` instead.
+	//
+	// Deprecated: Do not use.
 	TimeIndexColumn string `protobuf:"bytes,4,opt,name=time_index_column,json=timeIndexColumn,proto3" json:"time_index_column,omitempty"`
-	// Column name of value column
+	// [DEPRECATED] Column name of value column.
+	// Use `value_column_idx` instead.
+	//
+	// Deprecated: Do not use.
 	ValueColumn string `protobuf:"bytes,5,opt,name=value_column,json=valueColumn,proto3" json:"value_column,omitempty"`
 	// Fake labels as key-value pairs
 	FakeLabels []*LabelPair `protobuf:"bytes,6,rep,name=fake_labels,json=fakeLabels,proto3" json:"fake_labels,omitempty"`
+	// Column index of time index column
+	TimeIndexColumnIdx uint64 `protobuf:"varint,7,opt,name=time_index_column_idx,json=timeIndexColumnIdx,proto3" json:"time_index_column_idx,omitempty"`
+	// Column index of value column
+	ValueColumnIdx uint64 `protobuf:"varint,8,opt,name=value_column_idx,json=valueColumnIdx,proto3" json:"value_column_idx,omitempty"`
 }
 
 func (x *Absent) Reset() {
@@ -583,6 +736,7 @@ func (x *Absent) GetStep() int64 {
 	return 0
 }
 
+// Deprecated: Do not use.
 func (x *Absent) GetTimeIndexColumn() string {
 	if x != nil {
 		return x.TimeIndexColumn
@@ -590,6 +744,7 @@ func (x *Absent) GetTimeIndexColumn() string {
 	return ""
 }
 
+// Deprecated: Do not use.
 func (x *Absent) GetValueColumn() string {
 	if x != nil {
 		return x.ValueColumn
@@ -604,6 +759,20 @@ func (x *Absent) GetFakeLabels() []*LabelPair {
 	return nil
 }
 
+func (x *Absent) GetTimeIndexColumnIdx() uint64 {
+	if x != nil {
+		return x.TimeIndexColumnIdx
+	}
+	return 0
+}
+
+func (x *Absent) GetValueColumnIdx() uint64 {
+	if x != nil {
+		return x.ValueColumnIdx
+	}
+	return 0
+}
+
 type LabelPair struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -671,7 +840,7 @@ var file_substrait_extension_promql_plan_proto_rawDesc = []byte{
 	0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
 	0x65, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18,
 	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22,
-	0xbe, 0x01, 0x0a, 0x11, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x6e, 0x69, 0x70,
+	0x94, 0x02, 0x0a, 0x11, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x6e, 0x69, 0x70,
 	0x75, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65,
 	0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, 0x1a, 0x0a,
@@ -679,69 +848,107 @@ var file_substrait_extension_promql_plan_proto_rawDesc = []byte{
 	0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x25, 0x0a, 0x0e, 0x6c, 0x6f, 0x6f,
 	0x6b, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x0d, 0x6c, 0x6f, 0x6f, 0x6b, 0x62, 0x61, 0x63, 0x6b, 0x44, 0x65, 0x6c, 0x74, 0x61,
-	0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12,
-	0x1f, 0x0a, 0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78,
-	0x22, 0x88, 0x01, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x4e, 0x6f, 0x72, 0x6d, 0x61,
-	0x6c, 0x69, 0x7a, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x1d, 0x0a, 0x0a,
-	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x66,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x09, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x61,
-	0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0a, 0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x5b, 0x0a, 0x0c, 0x53,
-	0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x69, 0x76, 0x69, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74,
-	0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x0a, 0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x2a, 0x0a, 0x11,
-	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64,
-	0x65, 0x78, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0xab, 0x01, 0x0a, 0x0f, 0x52, 0x61, 0x6e,
-	0x67, 0x65, 0x4d, 0x61, 0x6e, 0x69, 0x70, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61,
-	0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x03, 0x65, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c,
-	0x12, 0x14, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69,
-	0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65,
-	0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x61, 0x67, 0x43,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0xb8, 0x01, 0x0a, 0x0f, 0x53, 0x63, 0x61, 0x6c, 0x61,
-	0x72, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
-	0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74,
-	0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65,
-	0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x1d,
-	0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1f, 0x0a,
-	0x0b, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x0a, 0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x21,
+	0x12, 0x21, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x12, 0x23, 0x0a, 0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x69, 0x6e, 0x64,
+	0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x66, 0x69,
+	0x65, 0x6c, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x0e, 0x74, 0x69, 0x6d, 0x65,
+	0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04,
+	0x52, 0x0c, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x64, 0x78, 0x12, 0x26,
+	0x0a, 0x0f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x69, 0x64,
+	0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x49, 0x64, 0x78, 0x22, 0xe4, 0x01, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x69, 0x65,
+	0x73, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x12, 0x21, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f,
+	0x6e, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x4e, 0x61, 0x6e, 0x12, 0x23, 0x0a, 0x0b, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x74,
+	0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x74, 0x69, 0x6d,
+	0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x0c, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x64, 0x78, 0x12,
+	0x2c, 0x0a, 0x12, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x69, 0x6e,
+	0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x04, 0x52, 0x10, 0x74, 0x61, 0x67,
+	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0xc4, 0x01,
+	0x0a, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x69, 0x76, 0x69, 0x64, 0x65, 0x12, 0x23,
+	0x0a, 0x0b, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x11, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65,
+	0x78, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02,
+	0x18, 0x01, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x04, 0x52,
+	0x10, 0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65,
+	0x73, 0x12, 0x31, 0x0a, 0x15, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04,
+	0x52, 0x12, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x49, 0x64, 0x78, 0x22, 0x87, 0x02, 0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61,
+	0x6e, 0x69, 0x70, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10,
+	0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x6e, 0x64,
+	0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05,
+	0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x61, 0x6e,
+	0x67, 0x65, 0x12, 0x21, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x23, 0x0a, 0x0b, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a,
+	0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x24, 0x0a, 0x0e, 0x74, 0x69,
+	0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x04, 0x52, 0x0c, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x64, 0x78,
+	0x12, 0x2c, 0x0a, 0x12, 0x74, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x69,
+	0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x04, 0x52, 0x10, 0x74, 0x61,
+	0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0xc2,
+	0x02, 0x0a, 0x0f, 0x53, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61,
+	0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x21, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09,
+	0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x23, 0x0a, 0x0b, 0x74, 0x61, 0x67,
+	0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x42, 0x02,
+	0x18, 0x01, 0x52, 0x0a, 0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x25,
 	0x0a, 0x0c, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x22, 0xd4, 0x01, 0x0a, 0x06, 0x41, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61,
-	0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x03, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x65, 0x70, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x04, 0x73, 0x74, 0x65, 0x70, 0x12, 0x2a, 0x0a, 0x11, 0x74, 0x69, 0x6d, 0x65,
-	0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x3f, 0x0a, 0x0b, 0x66, 0x61, 0x6b, 0x65, 0x5f,
-	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73,
-	0x75, 0x62, 0x73, 0x74, 0x72, 0x61, 0x69, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x50, 0x61, 0x69, 0x72, 0x52, 0x0a, 0x66, 0x61,
-	0x6b, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x22, 0x33, 0x0a, 0x09, 0x4c, 0x61, 0x62, 0x65,
-	0x6c, 0x50, 0x61, 0x69, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x3f, 0x5a,
-	0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x47, 0x72, 0x65, 0x70,
-	0x74, 0x69, 0x6d, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d,
-	0x65, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x74,
-	0x72, 0x61, 0x69, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e,
+	0x64, 0x65, 0x78, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x74,
+	0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x64, 0x78, 0x12, 0x2c, 0x0a, 0x12, 0x74,
+	0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65,
+	0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x04, 0x52, 0x10, 0x74, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x66, 0x69, 0x65,
+	0x6c, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x0e, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x49, 0x64, 0x78, 0x22, 0xb9, 0x02, 0x0a, 0x06, 0x41, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x12, 0x14,
+	0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73,
+	0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x65, 0x70, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x74, 0x65, 0x70, 0x12, 0x2e, 0x0a, 0x11, 0x74, 0x69,
+	0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x25, 0x0a, 0x0c, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x02, 0x18, 0x01, 0x52, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x12, 0x3f, 0x0a, 0x0b, 0x66, 0x61, 0x6b, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x74, 0x72, 0x61,
+	0x69, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x61, 0x62,
+	0x65, 0x6c, 0x50, 0x61, 0x69, 0x72, 0x52, 0x0a, 0x66, 0x61, 0x6b, 0x65, 0x4c, 0x61, 0x62, 0x65,
+	0x6c, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78,
+	0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x12, 0x74, 0x69, 0x6d, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x49, 0x64, 0x78, 0x12, 0x28, 0x0a, 0x10, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x69, 0x64, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x0e, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x49, 0x64, 0x78, 0x22,
+	0x33, 0x0a, 0x09, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x50, 0x61, 0x69, 0x72, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x47, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x2f,
+	0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67,
+	0x6f, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x74, 0x72, 0x61, 0x69, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/java/src/main/java/substrait_extension/PromqlPlan.java b/java/src/main/java/substrait_extension/PromqlPlan.java
index 9f577608..611065bd 100644
--- a/java/src/main/java/substrait_extension/PromqlPlan.java
+++ b/java/src/main/java/substrait_extension/PromqlPlan.java
@@ -753,43 +753,75 @@ public interface InstantManipulateOrBuilder extends
 
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=40
      * @return The timeIndex.
      */
-    java.lang.String getTimeIndex();
+    @java.lang.Deprecated java.lang.String getTimeIndex();
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=40
      * @return The bytes for timeIndex.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTimeIndexBytes();
 
     /**
      * <pre>
-     * Optional field column name for validating staleness
+     * [DEPRECATED] Optional field column name for validating staleness.
+     * Use `field_index_idx` instead.
      * </pre>
      *
-     * <code>string field_index = 6;</code>
+     * <code>string field_index = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=43
      * @return The fieldIndex.
      */
-    java.lang.String getFieldIndex();
+    @java.lang.Deprecated java.lang.String getFieldIndex();
     /**
      * <pre>
-     * Optional field column name for validating staleness
+     * [DEPRECATED] Optional field column name for validating staleness.
+     * Use `field_index_idx` instead.
      * </pre>
      *
-     * <code>string field_index = 6;</code>
+     * <code>string field_index = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=43
      * @return The bytes for fieldIndex.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getFieldIndexBytes();
+
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_idx = 7;</code>
+     * @return The timeIndexIdx.
+     */
+    long getTimeIndexIdx();
+
+    /**
+     * <pre>
+     * Optional field column index for validating staleness
+     * </pre>
+     *
+     * <code>uint64 field_index_idx = 8;</code>
+     * @return The fieldIndexIdx.
+     */
+    long getFieldIndexIdx();
   }
   /**
    * Protobuf type {@code substrait_extension.InstantManipulate}
@@ -870,6 +902,16 @@ private InstantManipulate(
               fieldIndex_ = s;
               break;
             }
+            case 56: {
+
+              timeIndexIdx_ = input.readUInt64();
+              break;
+            }
+            case 64: {
+
+              fieldIndexIdx_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -968,14 +1010,17 @@ public long getLookbackDelta() {
     private volatile java.lang.Object timeIndex_;
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=40
      * @return The timeIndex.
      */
     @java.lang.Override
-    public java.lang.String getTimeIndex() {
+    @java.lang.Deprecated public java.lang.String getTimeIndex() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -989,14 +1034,17 @@ public java.lang.String getTimeIndex() {
     }
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=40
      * @return The bytes for timeIndex.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTimeIndexBytes() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
@@ -1014,14 +1062,17 @@ public java.lang.String getTimeIndex() {
     private volatile java.lang.Object fieldIndex_;
     /**
      * <pre>
-     * Optional field column name for validating staleness
+     * [DEPRECATED] Optional field column name for validating staleness.
+     * Use `field_index_idx` instead.
      * </pre>
      *
-     * <code>string field_index = 6;</code>
+     * <code>string field_index = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=43
      * @return The fieldIndex.
      */
     @java.lang.Override
-    public java.lang.String getFieldIndex() {
+    @java.lang.Deprecated public java.lang.String getFieldIndex() {
       java.lang.Object ref = fieldIndex_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -1035,14 +1086,17 @@ public java.lang.String getFieldIndex() {
     }
     /**
      * <pre>
-     * Optional field column name for validating staleness
+     * [DEPRECATED] Optional field column name for validating staleness.
+     * Use `field_index_idx` instead.
      * </pre>
      *
-     * <code>string field_index = 6;</code>
+     * <code>string field_index = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=43
      * @return The bytes for fieldIndex.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getFieldIndexBytes() {
       java.lang.Object ref = fieldIndex_;
       if (ref instanceof java.lang.String) {
@@ -1056,6 +1110,36 @@ public java.lang.String getFieldIndex() {
       }
     }
 
+    public static final int TIME_INDEX_IDX_FIELD_NUMBER = 7;
+    private long timeIndexIdx_;
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_idx = 7;</code>
+     * @return The timeIndexIdx.
+     */
+    @java.lang.Override
+    public long getTimeIndexIdx() {
+      return timeIndexIdx_;
+    }
+
+    public static final int FIELD_INDEX_IDX_FIELD_NUMBER = 8;
+    private long fieldIndexIdx_;
+    /**
+     * <pre>
+     * Optional field column index for validating staleness
+     * </pre>
+     *
+     * <code>uint64 field_index_idx = 8;</code>
+     * @return The fieldIndexIdx.
+     */
+    @java.lang.Override
+    public long getFieldIndexIdx() {
+      return fieldIndexIdx_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1088,6 +1172,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fieldIndex_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 6, fieldIndex_);
       }
+      if (timeIndexIdx_ != 0L) {
+        output.writeUInt64(7, timeIndexIdx_);
+      }
+      if (fieldIndexIdx_ != 0L) {
+        output.writeUInt64(8, fieldIndexIdx_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -1119,6 +1209,14 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fieldIndex_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, fieldIndex_);
       }
+      if (timeIndexIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(7, timeIndexIdx_);
+      }
+      if (fieldIndexIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(8, fieldIndexIdx_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1146,6 +1244,10 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getTimeIndex())) return false;
       if (!getFieldIndex()
           .equals(other.getFieldIndex())) return false;
+      if (getTimeIndexIdx()
+          != other.getTimeIndexIdx()) return false;
+      if (getFieldIndexIdx()
+          != other.getFieldIndexIdx()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1173,6 +1275,12 @@ public int hashCode() {
       hash = (53 * hash) + getTimeIndex().hashCode();
       hash = (37 * hash) + FIELD_INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getFieldIndex().hashCode();
+      hash = (37 * hash) + TIME_INDEX_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTimeIndexIdx());
+      hash = (37 * hash) + FIELD_INDEX_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getFieldIndexIdx());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1318,6 +1426,10 @@ public Builder clear() {
 
         fieldIndex_ = "";
 
+        timeIndexIdx_ = 0L;
+
+        fieldIndexIdx_ = 0L;
+
         return this;
       }
 
@@ -1350,6 +1462,8 @@ public substrait_extension.PromqlPlan.InstantManipulate buildPartial() {
         result.lookbackDelta_ = lookbackDelta_;
         result.timeIndex_ = timeIndex_;
         result.fieldIndex_ = fieldIndex_;
+        result.timeIndexIdx_ = timeIndexIdx_;
+        result.fieldIndexIdx_ = fieldIndexIdx_;
         onBuilt();
         return result;
       }
@@ -1418,6 +1532,12 @@ public Builder mergeFrom(substrait_extension.PromqlPlan.InstantManipulate other)
           fieldIndex_ = other.fieldIndex_;
           onChanged();
         }
+        if (other.getTimeIndexIdx() != 0L) {
+          setTimeIndexIdx(other.getTimeIndexIdx());
+        }
+        if (other.getFieldIndexIdx() != 0L) {
+          setFieldIndexIdx(other.getFieldIndexIdx());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1622,13 +1742,16 @@ public Builder clearLookbackDelta() {
       private java.lang.Object timeIndex_ = "";
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=40
        * @return The timeIndex.
        */
-      public java.lang.String getTimeIndex() {
+      @java.lang.Deprecated public java.lang.String getTimeIndex() {
         java.lang.Object ref = timeIndex_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -1642,13 +1765,16 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=40
        * @return The bytes for timeIndex.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTimeIndexBytes() {
         java.lang.Object ref = timeIndex_;
         if (ref instanceof String) {
@@ -1663,14 +1789,17 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=40
        * @param value The timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndex(
+      @java.lang.Deprecated public Builder setTimeIndex(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -1682,13 +1811,16 @@ public Builder setTimeIndex(
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=40
        * @return This builder for chaining.
        */
-      public Builder clearTimeIndex() {
+      @java.lang.Deprecated public Builder clearTimeIndex() {
         
         timeIndex_ = getDefaultInstance().getTimeIndex();
         onChanged();
@@ -1696,14 +1828,17 @@ public Builder clearTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=40
        * @param value The bytes for timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexBytes(
+      @java.lang.Deprecated public Builder setTimeIndexBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -1718,13 +1853,16 @@ public Builder setTimeIndexBytes(
       private java.lang.Object fieldIndex_ = "";
       /**
        * <pre>
-       * Optional field column name for validating staleness
+       * [DEPRECATED] Optional field column name for validating staleness.
+       * Use `field_index_idx` instead.
        * </pre>
        *
-       * <code>string field_index = 6;</code>
+       * <code>string field_index = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=43
        * @return The fieldIndex.
        */
-      public java.lang.String getFieldIndex() {
+      @java.lang.Deprecated public java.lang.String getFieldIndex() {
         java.lang.Object ref = fieldIndex_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -1738,13 +1876,16 @@ public java.lang.String getFieldIndex() {
       }
       /**
        * <pre>
-       * Optional field column name for validating staleness
+       * [DEPRECATED] Optional field column name for validating staleness.
+       * Use `field_index_idx` instead.
        * </pre>
        *
-       * <code>string field_index = 6;</code>
+       * <code>string field_index = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=43
        * @return The bytes for fieldIndex.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getFieldIndexBytes() {
         java.lang.Object ref = fieldIndex_;
         if (ref instanceof String) {
@@ -1759,14 +1900,17 @@ public java.lang.String getFieldIndex() {
       }
       /**
        * <pre>
-       * Optional field column name for validating staleness
+       * [DEPRECATED] Optional field column name for validating staleness.
+       * Use `field_index_idx` instead.
        * </pre>
        *
-       * <code>string field_index = 6;</code>
+       * <code>string field_index = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=43
        * @param value The fieldIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setFieldIndex(
+      @java.lang.Deprecated public Builder setFieldIndex(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -1778,13 +1922,16 @@ public Builder setFieldIndex(
       }
       /**
        * <pre>
-       * Optional field column name for validating staleness
+       * [DEPRECATED] Optional field column name for validating staleness.
+       * Use `field_index_idx` instead.
        * </pre>
        *
-       * <code>string field_index = 6;</code>
+       * <code>string field_index = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=43
        * @return This builder for chaining.
        */
-      public Builder clearFieldIndex() {
+      @java.lang.Deprecated public Builder clearFieldIndex() {
         
         fieldIndex_ = getDefaultInstance().getFieldIndex();
         onChanged();
@@ -1792,14 +1939,17 @@ public Builder clearFieldIndex() {
       }
       /**
        * <pre>
-       * Optional field column name for validating staleness
+       * [DEPRECATED] Optional field column name for validating staleness.
+       * Use `field_index_idx` instead.
        * </pre>
        *
-       * <code>string field_index = 6;</code>
+       * <code>string field_index = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.InstantManipulate.field_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=43
        * @param value The bytes for fieldIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setFieldIndexBytes(
+      @java.lang.Deprecated public Builder setFieldIndexBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -1810,6 +1960,92 @@ public Builder setFieldIndexBytes(
         onChanged();
         return this;
       }
+
+      private long timeIndexIdx_ ;
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 7;</code>
+       * @return The timeIndexIdx.
+       */
+      @java.lang.Override
+      public long getTimeIndexIdx() {
+        return timeIndexIdx_;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 7;</code>
+       * @param value The timeIndexIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeIndexIdx(long value) {
+        
+        timeIndexIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeIndexIdx() {
+        
+        timeIndexIdx_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private long fieldIndexIdx_ ;
+      /**
+       * <pre>
+       * Optional field column index for validating staleness
+       * </pre>
+       *
+       * <code>uint64 field_index_idx = 8;</code>
+       * @return The fieldIndexIdx.
+       */
+      @java.lang.Override
+      public long getFieldIndexIdx() {
+        return fieldIndexIdx_;
+      }
+      /**
+       * <pre>
+       * Optional field column index for validating staleness
+       * </pre>
+       *
+       * <code>uint64 field_index_idx = 8;</code>
+       * @param value The fieldIndexIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFieldIndexIdx(long value) {
+        
+        fieldIndexIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Optional field column index for validating staleness
+       * </pre>
+       *
+       * <code>uint64 field_index_idx = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFieldIndexIdx() {
+        
+        fieldIndexIdx_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1879,22 +2115,28 @@ public interface SeriesNormalizeOrBuilder extends
 
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 2;</code>
+     * <code>string time_index = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=55
      * @return The timeIndex.
      */
-    java.lang.String getTimeIndex();
+    @java.lang.Deprecated java.lang.String getTimeIndex();
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 2;</code>
+     * <code>string time_index = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=55
      * @return The bytes for timeIndex.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTimeIndexBytes();
 
     /**
@@ -1909,44 +2151,95 @@ public interface SeriesNormalizeOrBuilder extends
 
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @return A list containing the tagColumns.
      */
-    java.util.List<java.lang.String>
+    @java.lang.Deprecated java.util.List<java.lang.String>
         getTagColumnsList();
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @return The count of tagColumns.
      */
-    int getTagColumnsCount();
+    @java.lang.Deprecated int getTagColumnsCount();
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @param index The index of the element to return.
      * @return The tagColumns at the given index.
      */
-    java.lang.String getTagColumns(int index);
+    @java.lang.Deprecated java.lang.String getTagColumns(int index);
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @param index The index of the value to return.
      * @return The bytes of the tagColumns at the given index.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTagColumnsBytes(int index);
+
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_idx = 5;</code>
+     * @return The timeIndexIdx.
+     */
+    long getTimeIndexIdx();
+
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 6;</code>
+     * @return A list containing the tagColumnIndices.
+     */
+    java.util.List<java.lang.Long> getTagColumnIndicesList();
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 6;</code>
+     * @return The count of tagColumnIndices.
+     */
+    int getTagColumnIndicesCount();
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 6;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
+     */
+    long getTagColumnIndices(int index);
   }
   /**
    * Protobuf type {@code substrait_extension.SeriesNormalize}
@@ -1963,6 +2256,7 @@ private SeriesNormalize(com.google.protobuf.GeneratedMessageV3.Builder<?> builde
     private SeriesNormalize() {
       timeIndex_ = "";
       tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      tagColumnIndices_ = emptyLongList();
     }
 
     @java.lang.Override
@@ -2021,6 +2315,32 @@ private SeriesNormalize(
               tagColumns_.add(s);
               break;
             }
+            case 40: {
+
+              timeIndexIdx_ = input.readUInt64();
+              break;
+            }
+            case 48: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              tagColumnIndices_.addLong(input.readUInt64());
+              break;
+            }
+            case 50: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -2041,6 +2361,9 @@ private SeriesNormalize(
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           tagColumns_ = tagColumns_.getUnmodifiableView();
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -2077,14 +2400,17 @@ public long getOffset() {
     private volatile java.lang.Object timeIndex_;
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 2;</code>
+     * <code>string time_index = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=55
      * @return The timeIndex.
      */
     @java.lang.Override
-    public java.lang.String getTimeIndex() {
+    @java.lang.Deprecated public java.lang.String getTimeIndex() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -2098,14 +2424,17 @@ public java.lang.String getTimeIndex() {
     }
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 2;</code>
+     * <code>string time_index = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=55
      * @return The bytes for timeIndex.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTimeIndexBytes() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
@@ -2138,53 +2467,120 @@ public boolean getFilterNan() {
     private com.google.protobuf.LazyStringList tagColumns_;
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @return A list containing the tagColumns.
      */
-    public com.google.protobuf.ProtocolStringList
+    @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
         getTagColumnsList() {
       return tagColumns_;
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @return The count of tagColumns.
      */
-    public int getTagColumnsCount() {
+    @java.lang.Deprecated public int getTagColumnsCount() {
       return tagColumns_.size();
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @param index The index of the element to return.
      * @return The tagColumns at the given index.
      */
-    public java.lang.String getTagColumns(int index) {
+    @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
       return tagColumns_.get(index);
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 4;</code>
+     * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=60
      * @param index The index of the value to return.
      * @return The bytes of the tagColumns at the given index.
      */
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTagColumnsBytes(int index) {
       return tagColumns_.getByteString(index);
     }
 
+    public static final int TIME_INDEX_IDX_FIELD_NUMBER = 5;
+    private long timeIndexIdx_;
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_idx = 5;</code>
+     * @return The timeIndexIdx.
+     */
+    @java.lang.Override
+    public long getTimeIndexIdx() {
+      return timeIndexIdx_;
+    }
+
+    public static final int TAG_COLUMN_INDICES_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.LongList tagColumnIndices_;
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 6;</code>
+     * @return A list containing the tagColumnIndices.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getTagColumnIndicesList() {
+      return tagColumnIndices_;
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 6;</code>
+     * @return The count of tagColumnIndices.
+     */
+    public int getTagColumnIndicesCount() {
+      return tagColumnIndices_.size();
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 6;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
+     */
+    public long getTagColumnIndices(int index) {
+      return tagColumnIndices_.getLong(index);
+    }
+    private int tagColumnIndicesMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -2199,6 +2595,7 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       if (offset_ != 0L) {
         output.writeInt64(1, offset_);
       }
@@ -2211,6 +2608,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < tagColumns_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 4, tagColumns_.getRaw(i));
       }
+      if (timeIndexIdx_ != 0L) {
+        output.writeUInt64(5, timeIndexIdx_);
+      }
+      if (getTagColumnIndicesList().size() > 0) {
+        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(tagColumnIndicesMemoizedSerializedSize);
+      }
+      for (int i = 0; i < tagColumnIndices_.size(); i++) {
+        output.writeUInt64NoTag(tagColumnIndices_.getLong(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -2239,6 +2646,24 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getTagColumnsList().size();
       }
+      if (timeIndexIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(5, timeIndexIdx_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < tagColumnIndices_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(tagColumnIndices_.getLong(i));
+        }
+        size += dataSize;
+        if (!getTagColumnIndicesList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        tagColumnIndicesMemoizedSerializedSize = dataSize;
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -2262,6 +2687,10 @@ public boolean equals(final java.lang.Object obj) {
           != other.getFilterNan()) return false;
       if (!getTagColumnsList()
           .equals(other.getTagColumnsList())) return false;
+      if (getTimeIndexIdx()
+          != other.getTimeIndexIdx()) return false;
+      if (!getTagColumnIndicesList()
+          .equals(other.getTagColumnIndicesList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -2285,6 +2714,13 @@ public int hashCode() {
         hash = (37 * hash) + TAG_COLUMNS_FIELD_NUMBER;
         hash = (53 * hash) + getTagColumnsList().hashCode();
       }
+      hash = (37 * hash) + TIME_INDEX_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTimeIndexIdx());
+      if (getTagColumnIndicesCount() > 0) {
+        hash = (37 * hash) + TAG_COLUMN_INDICES_FIELD_NUMBER;
+        hash = (53 * hash) + getTagColumnIndicesList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2426,6 +2862,10 @@ public Builder clear() {
 
         tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
+        timeIndexIdx_ = 0L;
+
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -2461,6 +2901,12 @@ public substrait_extension.PromqlPlan.SeriesNormalize buildPartial() {
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.tagColumns_ = tagColumns_;
+        result.timeIndexIdx_ = timeIndexIdx_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.tagColumnIndices_ = tagColumnIndices_;
         onBuilt();
         return result;
       }
@@ -2529,6 +2975,19 @@ public Builder mergeFrom(substrait_extension.PromqlPlan.SeriesNormalize other) {
           }
           onChanged();
         }
+        if (other.getTimeIndexIdx() != 0L) {
+          setTimeIndexIdx(other.getTimeIndexIdx());
+        }
+        if (!other.tagColumnIndices_.isEmpty()) {
+          if (tagColumnIndices_.isEmpty()) {
+            tagColumnIndices_ = other.tagColumnIndices_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureTagColumnIndicesIsMutable();
+            tagColumnIndices_.addAll(other.tagColumnIndices_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -2605,13 +3064,16 @@ public Builder clearOffset() {
       private java.lang.Object timeIndex_ = "";
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 2;</code>
+       * <code>string time_index = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=55
        * @return The timeIndex.
        */
-      public java.lang.String getTimeIndex() {
+      @java.lang.Deprecated public java.lang.String getTimeIndex() {
         java.lang.Object ref = timeIndex_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -2625,13 +3087,16 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 2;</code>
+       * <code>string time_index = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=55
        * @return The bytes for timeIndex.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTimeIndexBytes() {
         java.lang.Object ref = timeIndex_;
         if (ref instanceof String) {
@@ -2646,14 +3111,17 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 2;</code>
+       * <code>string time_index = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=55
        * @param value The timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndex(
+      @java.lang.Deprecated public Builder setTimeIndex(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2665,13 +3133,16 @@ public Builder setTimeIndex(
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 2;</code>
+       * <code>string time_index = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=55
        * @return This builder for chaining.
        */
-      public Builder clearTimeIndex() {
+      @java.lang.Deprecated public Builder clearTimeIndex() {
         
         timeIndex_ = getDefaultInstance().getTimeIndex();
         onChanged();
@@ -2679,14 +3150,17 @@ public Builder clearTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 2;</code>
+       * <code>string time_index = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=55
        * @param value The bytes for timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexBytes(
+      @java.lang.Deprecated public Builder setTimeIndexBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2750,63 +3224,78 @@ private void ensureTagColumnsIsMutable() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @return A list containing the tagColumns.
        */
-      public com.google.protobuf.ProtocolStringList
+      @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
           getTagColumnsList() {
         return tagColumns_.getUnmodifiableView();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @return The count of tagColumns.
        */
-      public int getTagColumnsCount() {
+      @java.lang.Deprecated public int getTagColumnsCount() {
         return tagColumns_.size();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @param index The index of the element to return.
        * @return The tagColumns at the given index.
        */
-      public java.lang.String getTagColumns(int index) {
+      @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
         return tagColumns_.get(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @param index The index of the value to return.
        * @return The bytes of the tagColumns at the given index.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTagColumnsBytes(int index) {
         return tagColumns_.getByteString(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @param index The index to set the value at.
        * @param value The tagColumns to set.
        * @return This builder for chaining.
        */
-      public Builder setTagColumns(
+      @java.lang.Deprecated public Builder setTagColumns(
           int index, java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2818,14 +3307,17 @@ public Builder setTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @param value The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumns(
+      @java.lang.Deprecated public Builder addTagColumns(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2837,14 +3329,17 @@ public Builder addTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @param values The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addAllTagColumns(
+      @java.lang.Deprecated public Builder addAllTagColumns(
           java.lang.Iterable<java.lang.String> values) {
         ensureTagColumnsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -2854,13 +3349,16 @@ public Builder addAllTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @return This builder for chaining.
        */
-      public Builder clearTagColumns() {
+      @java.lang.Deprecated public Builder clearTagColumns() {
         tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
@@ -2868,14 +3366,17 @@ public Builder clearTagColumns() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 4;</code>
+       * <code>repeated string tag_columns = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesNormalize.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=60
        * @param value The bytes of the tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumnsBytes(
+      @java.lang.Deprecated public Builder addTagColumnsBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -2886,45 +3387,195 @@ public Builder addTagColumnsBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
 
+      private long timeIndexIdx_ ;
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 5;</code>
+       * @return The timeIndexIdx.
+       */
       @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
+      public long getTimeIndexIdx() {
+        return timeIndexIdx_;
       }
-
-
-      // @@protoc_insertion_point(builder_scope:substrait_extension.SeriesNormalize)
-    }
-
-    // @@protoc_insertion_point(class_scope:substrait_extension.SeriesNormalize)
-    private static final substrait_extension.PromqlPlan.SeriesNormalize DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new substrait_extension.PromqlPlan.SeriesNormalize();
-    }
-
-    public static substrait_extension.PromqlPlan.SeriesNormalize getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser<SeriesNormalize>
-        PARSER = new com.google.protobuf.AbstractParser<SeriesNormalize>() {
-      @java.lang.Override
-      public SeriesNormalize parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SeriesNormalize(input, extensionRegistry);
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 5;</code>
+       * @param value The timeIndexIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeIndexIdx(long value) {
+        
+        timeIndexIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeIndexIdx() {
+        
+        timeIndexIdx_ = 0L;
+        onChanged();
+        return this;
       }
-    };
 
-    public static com.google.protobuf.Parser<SeriesNormalize> parser() {
-      return PARSER;
+      private com.google.protobuf.Internal.LongList tagColumnIndices_ = emptyLongList();
+      private void ensureTagColumnIndicesIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_ = mutableCopy(tagColumnIndices_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 6;</code>
+       * @return A list containing the tagColumnIndices.
+       */
+      public java.util.List<java.lang.Long>
+          getTagColumnIndicesList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(tagColumnIndices_) : tagColumnIndices_;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 6;</code>
+       * @return The count of tagColumnIndices.
+       */
+      public int getTagColumnIndicesCount() {
+        return tagColumnIndices_.size();
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 6;</code>
+       * @param index The index of the element to return.
+       * @return The tagColumnIndices at the given index.
+       */
+      public long getTagColumnIndices(int index) {
+        return tagColumnIndices_.getLong(index);
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 6;</code>
+       * @param index The index to set the value at.
+       * @param value The tagColumnIndices to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTagColumnIndices(
+          int index, long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 6;</code>
+       * @param value The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTagColumnIndices(long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 6;</code>
+       * @param values The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTagColumnIndices(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureTagColumnIndicesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, tagColumnIndices_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTagColumnIndices() {
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:substrait_extension.SeriesNormalize)
+    }
+
+    // @@protoc_insertion_point(class_scope:substrait_extension.SeriesNormalize)
+    private static final substrait_extension.PromqlPlan.SeriesNormalize DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new substrait_extension.PromqlPlan.SeriesNormalize();
+    }
+
+    public static substrait_extension.PromqlPlan.SeriesNormalize getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<SeriesNormalize>
+        PARSER = new com.google.protobuf.AbstractParser<SeriesNormalize>() {
+      @java.lang.Override
+      public SeriesNormalize parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new SeriesNormalize(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<SeriesNormalize> parser() {
+      return PARSER;
     }
 
     @java.lang.Override
@@ -2945,64 +3596,121 @@ public interface SeriesDivideOrBuilder extends
 
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @return A list containing the tagColumns.
      */
-    java.util.List<java.lang.String>
+    @java.lang.Deprecated java.util.List<java.lang.String>
         getTagColumnsList();
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @return The count of tagColumns.
      */
-    int getTagColumnsCount();
+    @java.lang.Deprecated int getTagColumnsCount();
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @param index The index of the element to return.
      * @return The tagColumns at the given index.
      */
-    java.lang.String getTagColumns(int index);
+    @java.lang.Deprecated java.lang.String getTagColumns(int index);
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @param index The index of the value to return.
      * @return The bytes of the tagColumns at the given index.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTagColumnsBytes(int index);
 
     /**
      * <pre>
-     * Name of time index column
+     * [DEPRECATED] Name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 2;</code>
+     * <code>string time_index_column = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=73
      * @return The timeIndexColumn.
      */
-    java.lang.String getTimeIndexColumn();
+    @java.lang.Deprecated java.lang.String getTimeIndexColumn();
     /**
      * <pre>
-     * Name of time index column
+     * [DEPRECATED] Name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 2;</code>
+     * <code>string time_index_column = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=73
      * @return The bytes for timeIndexColumn.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTimeIndexColumnBytes();
+
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 3;</code>
+     * @return A list containing the tagColumnIndices.
+     */
+    java.util.List<java.lang.Long> getTagColumnIndicesList();
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 3;</code>
+     * @return The count of tagColumnIndices.
+     */
+    int getTagColumnIndicesCount();
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 3;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
+     */
+    long getTagColumnIndices(int index);
+
+    /**
+     * <pre>
+     * Index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_column_idx = 4;</code>
+     * @return The timeIndexColumnIdx.
+     */
+    long getTimeIndexColumnIdx();
   }
   /**
    * Protobuf type {@code substrait_extension.SeriesDivide}
@@ -3019,6 +3727,7 @@ private SeriesDivide(com.google.protobuf.GeneratedMessageV3.Builder<?> builder)
     private SeriesDivide() {
       tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       timeIndexColumn_ = "";
+      tagColumnIndices_ = emptyLongList();
     }
 
     @java.lang.Override
@@ -3067,6 +3776,32 @@ private SeriesDivide(
               timeIndexColumn_ = s;
               break;
             }
+            case 24: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              tagColumnIndices_.addLong(input.readUInt64());
+              break;
+            }
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 32: {
+
+              timeIndexColumnIdx_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -3087,6 +3822,9 @@ private SeriesDivide(
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           tagColumns_ = tagColumns_.getUnmodifiableView();
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -3108,49 +3846,61 @@ private SeriesDivide(
     private com.google.protobuf.LazyStringList tagColumns_;
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @return A list containing the tagColumns.
      */
-    public com.google.protobuf.ProtocolStringList
+    @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
         getTagColumnsList() {
       return tagColumns_;
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @return The count of tagColumns.
      */
-    public int getTagColumnsCount() {
+    @java.lang.Deprecated public int getTagColumnsCount() {
       return tagColumns_.size();
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @param index The index of the element to return.
      * @return The tagColumns at the given index.
      */
-    public java.lang.String getTagColumns(int index) {
+    @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
       return tagColumns_.get(index);
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 1;</code>
+     * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=70
      * @param index The index of the value to return.
      * @return The bytes of the tagColumns at the given index.
      */
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTagColumnsBytes(int index) {
       return tagColumns_.getByteString(index);
     }
@@ -3159,14 +3909,17 @@ public java.lang.String getTagColumns(int index) {
     private volatile java.lang.Object timeIndexColumn_;
     /**
      * <pre>
-     * Name of time index column
+     * [DEPRECATED] Name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 2;</code>
+     * <code>string time_index_column = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=73
      * @return The timeIndexColumn.
      */
     @java.lang.Override
-    public java.lang.String getTimeIndexColumn() {
+    @java.lang.Deprecated public java.lang.String getTimeIndexColumn() {
       java.lang.Object ref = timeIndexColumn_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -3180,14 +3933,17 @@ public java.lang.String getTimeIndexColumn() {
     }
     /**
      * <pre>
-     * Name of time index column
+     * [DEPRECATED] Name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 2;</code>
+     * <code>string time_index_column = 2 [deprecated = true];</code>
+     * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=73
      * @return The bytes for timeIndexColumn.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTimeIndexColumnBytes() {
       java.lang.Object ref = timeIndexColumn_;
       if (ref instanceof java.lang.String) {
@@ -3201,6 +3957,61 @@ public java.lang.String getTimeIndexColumn() {
       }
     }
 
+    public static final int TAG_COLUMN_INDICES_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.LongList tagColumnIndices_;
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 3;</code>
+     * @return A list containing the tagColumnIndices.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getTagColumnIndicesList() {
+      return tagColumnIndices_;
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 3;</code>
+     * @return The count of tagColumnIndices.
+     */
+    public int getTagColumnIndicesCount() {
+      return tagColumnIndices_.size();
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 3;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
+     */
+    public long getTagColumnIndices(int index) {
+      return tagColumnIndices_.getLong(index);
+    }
+    private int tagColumnIndicesMemoizedSerializedSize = -1;
+
+    public static final int TIME_INDEX_COLUMN_IDX_FIELD_NUMBER = 4;
+    private long timeIndexColumnIdx_;
+    /**
+     * <pre>
+     * Index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_column_idx = 4;</code>
+     * @return The timeIndexColumnIdx.
+     */
+    @java.lang.Override
+    public long getTimeIndexColumnIdx() {
+      return timeIndexColumnIdx_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -3215,12 +4026,23 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       for (int i = 0; i < tagColumns_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tagColumns_.getRaw(i));
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(timeIndexColumn_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, timeIndexColumn_);
       }
+      if (getTagColumnIndicesList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(tagColumnIndicesMemoizedSerializedSize);
+      }
+      for (int i = 0; i < tagColumnIndices_.size(); i++) {
+        output.writeUInt64NoTag(tagColumnIndices_.getLong(i));
+      }
+      if (timeIndexColumnIdx_ != 0L) {
+        output.writeUInt64(4, timeIndexColumnIdx_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -3241,6 +4063,24 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(timeIndexColumn_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, timeIndexColumn_);
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < tagColumnIndices_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(tagColumnIndices_.getLong(i));
+        }
+        size += dataSize;
+        if (!getTagColumnIndicesList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        tagColumnIndicesMemoizedSerializedSize = dataSize;
+      }
+      if (timeIndexColumnIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, timeIndexColumnIdx_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -3260,6 +4100,10 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getTagColumnsList())) return false;
       if (!getTimeIndexColumn()
           .equals(other.getTimeIndexColumn())) return false;
+      if (!getTagColumnIndicesList()
+          .equals(other.getTagColumnIndicesList())) return false;
+      if (getTimeIndexColumnIdx()
+          != other.getTimeIndexColumnIdx()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -3277,6 +4121,13 @@ public int hashCode() {
       }
       hash = (37 * hash) + TIME_INDEX_COLUMN_FIELD_NUMBER;
       hash = (53 * hash) + getTimeIndexColumn().hashCode();
+      if (getTagColumnIndicesCount() > 0) {
+        hash = (37 * hash) + TAG_COLUMN_INDICES_FIELD_NUMBER;
+        hash = (53 * hash) + getTagColumnIndicesList().hashCode();
+      }
+      hash = (37 * hash) + TIME_INDEX_COLUMN_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTimeIndexColumnIdx());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -3414,6 +4265,10 @@ public Builder clear() {
         bitField0_ = (bitField0_ & ~0x00000001);
         timeIndexColumn_ = "";
 
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        timeIndexColumnIdx_ = 0L;
+
         return this;
       }
 
@@ -3447,6 +4302,12 @@ public substrait_extension.PromqlPlan.SeriesDivide buildPartial() {
         }
         result.tagColumns_ = tagColumns_;
         result.timeIndexColumn_ = timeIndexColumn_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.tagColumnIndices_ = tagColumnIndices_;
+        result.timeIndexColumnIdx_ = timeIndexColumnIdx_;
         onBuilt();
         return result;
       }
@@ -3509,6 +4370,19 @@ public Builder mergeFrom(substrait_extension.PromqlPlan.SeriesDivide other) {
           timeIndexColumn_ = other.timeIndexColumn_;
           onChanged();
         }
+        if (!other.tagColumnIndices_.isEmpty()) {
+          if (tagColumnIndices_.isEmpty()) {
+            tagColumnIndices_ = other.tagColumnIndices_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureTagColumnIndicesIsMutable();
+            tagColumnIndices_.addAll(other.tagColumnIndices_);
+          }
+          onChanged();
+        }
+        if (other.getTimeIndexColumnIdx() != 0L) {
+          setTimeIndexColumnIdx(other.getTimeIndexColumnIdx());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -3548,63 +4422,78 @@ private void ensureTagColumnsIsMutable() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @return A list containing the tagColumns.
        */
-      public com.google.protobuf.ProtocolStringList
+      @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
           getTagColumnsList() {
         return tagColumns_.getUnmodifiableView();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @return The count of tagColumns.
        */
-      public int getTagColumnsCount() {
+      @java.lang.Deprecated public int getTagColumnsCount() {
         return tagColumns_.size();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @param index The index of the element to return.
        * @return The tagColumns at the given index.
        */
-      public java.lang.String getTagColumns(int index) {
+      @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
         return tagColumns_.get(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @param index The index of the value to return.
        * @return The bytes of the tagColumns at the given index.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTagColumnsBytes(int index) {
         return tagColumns_.getByteString(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @param index The index to set the value at.
        * @param value The tagColumns to set.
        * @return This builder for chaining.
        */
-      public Builder setTagColumns(
+      @java.lang.Deprecated public Builder setTagColumns(
           int index, java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -3616,14 +4505,17 @@ public Builder setTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @param value The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumns(
+      @java.lang.Deprecated public Builder addTagColumns(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -3635,14 +4527,17 @@ public Builder addTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @param values The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addAllTagColumns(
+      @java.lang.Deprecated public Builder addAllTagColumns(
           java.lang.Iterable<java.lang.String> values) {
         ensureTagColumnsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -3652,13 +4547,16 @@ public Builder addAllTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @return This builder for chaining.
        */
-      public Builder clearTagColumns() {
+      @java.lang.Deprecated public Builder clearTagColumns() {
         tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
@@ -3666,14 +4564,17 @@ public Builder clearTagColumns() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 1;</code>
+       * <code>repeated string tag_columns = 1 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=70
        * @param value The bytes of the tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumnsBytes(
+      @java.lang.Deprecated public Builder addTagColumnsBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -3688,13 +4589,16 @@ public Builder addTagColumnsBytes(
       private java.lang.Object timeIndexColumn_ = "";
       /**
        * <pre>
-       * Name of time index column
+       * [DEPRECATED] Name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 2;</code>
+       * <code>string time_index_column = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=73
        * @return The timeIndexColumn.
        */
-      public java.lang.String getTimeIndexColumn() {
+      @java.lang.Deprecated public java.lang.String getTimeIndexColumn() {
         java.lang.Object ref = timeIndexColumn_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -3708,13 +4612,16 @@ public java.lang.String getTimeIndexColumn() {
       }
       /**
        * <pre>
-       * Name of time index column
+       * [DEPRECATED] Name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 2;</code>
+       * <code>string time_index_column = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=73
        * @return The bytes for timeIndexColumn.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTimeIndexColumnBytes() {
         java.lang.Object ref = timeIndexColumn_;
         if (ref instanceof String) {
@@ -3729,14 +4636,17 @@ public java.lang.String getTimeIndexColumn() {
       }
       /**
        * <pre>
-       * Name of time index column
+       * [DEPRECATED] Name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 2;</code>
+       * <code>string time_index_column = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=73
        * @param value The timeIndexColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexColumn(
+      @java.lang.Deprecated public Builder setTimeIndexColumn(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -3748,13 +4658,16 @@ public Builder setTimeIndexColumn(
       }
       /**
        * <pre>
-       * Name of time index column
+       * [DEPRECATED] Name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 2;</code>
+       * <code>string time_index_column = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=73
        * @return This builder for chaining.
        */
-      public Builder clearTimeIndexColumn() {
+      @java.lang.Deprecated public Builder clearTimeIndexColumn() {
         
         timeIndexColumn_ = getDefaultInstance().getTimeIndexColumn();
         onChanged();
@@ -3762,14 +4675,17 @@ public Builder clearTimeIndexColumn() {
       }
       /**
        * <pre>
-       * Name of time index column
+       * [DEPRECATED] Name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 2;</code>
+       * <code>string time_index_column = 2 [deprecated = true];</code>
+       * @deprecated substrait_extension.SeriesDivide.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=73
        * @param value The bytes for timeIndexColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexColumnBytes(
+      @java.lang.Deprecated public Builder setTimeIndexColumnBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -3780,6 +4696,156 @@ public Builder setTimeIndexColumnBytes(
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Internal.LongList tagColumnIndices_ = emptyLongList();
+      private void ensureTagColumnIndicesIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_ = mutableCopy(tagColumnIndices_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 3;</code>
+       * @return A list containing the tagColumnIndices.
+       */
+      public java.util.List<java.lang.Long>
+          getTagColumnIndicesList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(tagColumnIndices_) : tagColumnIndices_;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 3;</code>
+       * @return The count of tagColumnIndices.
+       */
+      public int getTagColumnIndicesCount() {
+        return tagColumnIndices_.size();
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 3;</code>
+       * @param index The index of the element to return.
+       * @return The tagColumnIndices at the given index.
+       */
+      public long getTagColumnIndices(int index) {
+        return tagColumnIndices_.getLong(index);
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The tagColumnIndices to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTagColumnIndices(
+          int index, long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 3;</code>
+       * @param value The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTagColumnIndices(long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 3;</code>
+       * @param values The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTagColumnIndices(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureTagColumnIndicesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, tagColumnIndices_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTagColumnIndices() {
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private long timeIndexColumnIdx_ ;
+      /**
+       * <pre>
+       * Index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_column_idx = 4;</code>
+       * @return The timeIndexColumnIdx.
+       */
+      @java.lang.Override
+      public long getTimeIndexColumnIdx() {
+        return timeIndexColumnIdx_;
+      }
+      /**
+       * <pre>
+       * Index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_column_idx = 4;</code>
+       * @param value The timeIndexColumnIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeIndexColumnIdx(long value) {
+        
+        timeIndexColumnIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_column_idx = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeIndexColumnIdx() {
+        
+        timeIndexColumnIdx_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -3879,64 +4945,121 @@ public interface RangeManipulateOrBuilder extends
 
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
+     * </pre>
+     *
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=91
+     * @return The timeIndex.
+     */
+    @java.lang.Deprecated java.lang.String getTimeIndex();
+    /**
+     * <pre>
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
+     * </pre>
+     *
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=91
+     * @return The bytes for timeIndex.
+     */
+    @java.lang.Deprecated com.google.protobuf.ByteString
+        getTimeIndexBytes();
+
+    /**
+     * <pre>
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
+     * </pre>
+     *
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
+     * @return A list containing the tagColumns.
+     */
+    @java.lang.Deprecated java.util.List<java.lang.String>
+        getTagColumnsList();
+    /**
+     * <pre>
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
+     * </pre>
+     *
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
+     * @return The count of tagColumns.
+     */
+    @java.lang.Deprecated int getTagColumnsCount();
+    /**
+     * <pre>
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
-     * @return The timeIndex.
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
+     * @param index The index of the element to return.
+     * @return The tagColumns at the given index.
      */
-    java.lang.String getTimeIndex();
+    @java.lang.Deprecated java.lang.String getTagColumns(int index);
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
-     * @return The bytes for timeIndex.
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
+     * @param index The index of the value to return.
+     * @return The bytes of the tagColumns at the given index.
      */
-    com.google.protobuf.ByteString
-        getTimeIndexBytes();
+    @java.lang.Deprecated com.google.protobuf.ByteString
+        getTagColumnsBytes(int index);
 
     /**
      * <pre>
-     * Names of tag columns
+     * Column index of time index column
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
-     * @return A list containing the tagColumns.
+     * <code>uint64 time_index_idx = 7;</code>
+     * @return The timeIndexIdx.
      */
-    java.util.List<java.lang.String>
-        getTagColumnsList();
+    long getTimeIndexIdx();
+
     /**
      * <pre>
-     * Names of tag columns
+     * Indices of tag columns
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
-     * @return The count of tagColumns.
+     * <code>repeated uint64 tag_column_indices = 8;</code>
+     * @return A list containing the tagColumnIndices.
      */
-    int getTagColumnsCount();
+    java.util.List<java.lang.Long> getTagColumnIndicesList();
     /**
      * <pre>
-     * Names of tag columns
+     * Indices of tag columns
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
-     * @param index The index of the element to return.
-     * @return The tagColumns at the given index.
+     * <code>repeated uint64 tag_column_indices = 8;</code>
+     * @return The count of tagColumnIndices.
      */
-    java.lang.String getTagColumns(int index);
+    int getTagColumnIndicesCount();
     /**
      * <pre>
-     * Names of tag columns
+     * Indices of tag columns
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the tagColumns at the given index.
+     * <code>repeated uint64 tag_column_indices = 8;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
      */
-    com.google.protobuf.ByteString
-        getTagColumnsBytes(int index);
+    long getTagColumnIndices(int index);
   }
   /**
    * Protobuf type {@code substrait_extension.RangeManipulate}
@@ -3953,6 +5076,7 @@ private RangeManipulate(com.google.protobuf.GeneratedMessageV3.Builder<?> builde
     private RangeManipulate() {
       timeIndex_ = "";
       tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      tagColumnIndices_ = emptyLongList();
     }
 
     @java.lang.Override
@@ -4021,6 +5145,32 @@ private RangeManipulate(
               tagColumns_.add(s);
               break;
             }
+            case 56: {
+
+              timeIndexIdx_ = input.readUInt64();
+              break;
+            }
+            case 64: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              tagColumnIndices_.addLong(input.readUInt64());
+              break;
+            }
+            case 66: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -4041,6 +5191,9 @@ private RangeManipulate(
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           tagColumns_ = tagColumns_.getUnmodifiableView();
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -4122,14 +5275,17 @@ public long getRange() {
     private volatile java.lang.Object timeIndex_;
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=91
      * @return The timeIndex.
      */
     @java.lang.Override
-    public java.lang.String getTimeIndex() {
+    @java.lang.Deprecated public java.lang.String getTimeIndex() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -4143,14 +5299,17 @@ public java.lang.String getTimeIndex() {
     }
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=91
      * @return The bytes for timeIndex.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTimeIndexBytes() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
@@ -4168,53 +5327,120 @@ public java.lang.String getTimeIndex() {
     private com.google.protobuf.LazyStringList tagColumns_;
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
      * @return A list containing the tagColumns.
      */
-    public com.google.protobuf.ProtocolStringList
+    @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
         getTagColumnsList() {
       return tagColumns_;
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
      * @return The count of tagColumns.
      */
-    public int getTagColumnsCount() {
+    @java.lang.Deprecated public int getTagColumnsCount() {
       return tagColumns_.size();
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
      * @param index The index of the element to return.
      * @return The tagColumns at the given index.
      */
-    public java.lang.String getTagColumns(int index) {
+    @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
       return tagColumns_.get(index);
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=94
      * @param index The index of the value to return.
      * @return The bytes of the tagColumns at the given index.
      */
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTagColumnsBytes(int index) {
       return tagColumns_.getByteString(index);
     }
 
+    public static final int TIME_INDEX_IDX_FIELD_NUMBER = 7;
+    private long timeIndexIdx_;
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_idx = 7;</code>
+     * @return The timeIndexIdx.
+     */
+    @java.lang.Override
+    public long getTimeIndexIdx() {
+      return timeIndexIdx_;
+    }
+
+    public static final int TAG_COLUMN_INDICES_FIELD_NUMBER = 8;
+    private com.google.protobuf.Internal.LongList tagColumnIndices_;
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 8;</code>
+     * @return A list containing the tagColumnIndices.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getTagColumnIndicesList() {
+      return tagColumnIndices_;
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 8;</code>
+     * @return The count of tagColumnIndices.
+     */
+    public int getTagColumnIndicesCount() {
+      return tagColumnIndices_.size();
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 8;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
+     */
+    public long getTagColumnIndices(int index) {
+      return tagColumnIndices_.getLong(index);
+    }
+    private int tagColumnIndicesMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -4229,6 +5455,7 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       if (start_ != 0L) {
         output.writeInt64(1, start_);
       }
@@ -4247,6 +5474,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < tagColumns_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 6, tagColumns_.getRaw(i));
       }
+      if (timeIndexIdx_ != 0L) {
+        output.writeUInt64(7, timeIndexIdx_);
+      }
+      if (getTagColumnIndicesList().size() > 0) {
+        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(tagColumnIndicesMemoizedSerializedSize);
+      }
+      for (int i = 0; i < tagColumnIndices_.size(); i++) {
+        output.writeUInt64NoTag(tagColumnIndices_.getLong(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -4283,6 +5520,24 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getTagColumnsList().size();
       }
+      if (timeIndexIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(7, timeIndexIdx_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < tagColumnIndices_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(tagColumnIndices_.getLong(i));
+        }
+        size += dataSize;
+        if (!getTagColumnIndicesList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        tagColumnIndicesMemoizedSerializedSize = dataSize;
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -4310,6 +5565,10 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getTimeIndex())) return false;
       if (!getTagColumnsList()
           .equals(other.getTagColumnsList())) return false;
+      if (getTimeIndexIdx()
+          != other.getTimeIndexIdx()) return false;
+      if (!getTagColumnIndicesList()
+          .equals(other.getTagColumnIndicesList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -4339,6 +5598,13 @@ public int hashCode() {
         hash = (37 * hash) + TAG_COLUMNS_FIELD_NUMBER;
         hash = (53 * hash) + getTagColumnsList().hashCode();
       }
+      hash = (37 * hash) + TIME_INDEX_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTimeIndexIdx());
+      if (getTagColumnIndicesCount() > 0) {
+        hash = (37 * hash) + TAG_COLUMN_INDICES_FIELD_NUMBER;
+        hash = (53 * hash) + getTagColumnIndicesList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -4484,6 +5750,10 @@ public Builder clear() {
 
         tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
+        timeIndexIdx_ = 0L;
+
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -4521,6 +5791,12 @@ public substrait_extension.PromqlPlan.RangeManipulate buildPartial() {
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.tagColumns_ = tagColumns_;
+        result.timeIndexIdx_ = timeIndexIdx_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.tagColumnIndices_ = tagColumnIndices_;
         onBuilt();
         return result;
       }
@@ -4595,6 +5871,19 @@ public Builder mergeFrom(substrait_extension.PromqlPlan.RangeManipulate other) {
           }
           onChanged();
         }
+        if (other.getTimeIndexIdx() != 0L) {
+          setTimeIndexIdx(other.getTimeIndexIdx());
+        }
+        if (!other.tagColumnIndices_.isEmpty()) {
+          if (tagColumnIndices_.isEmpty()) {
+            tagColumnIndices_ = other.tagColumnIndices_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureTagColumnIndicesIsMutable();
+            tagColumnIndices_.addAll(other.tagColumnIndices_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -4800,13 +6089,16 @@ public Builder clearRange() {
       private java.lang.Object timeIndex_ = "";
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=91
        * @return The timeIndex.
        */
-      public java.lang.String getTimeIndex() {
+      @java.lang.Deprecated public java.lang.String getTimeIndex() {
         java.lang.Object ref = timeIndex_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -4820,13 +6112,16 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=91
        * @return The bytes for timeIndex.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTimeIndexBytes() {
         java.lang.Object ref = timeIndex_;
         if (ref instanceof String) {
@@ -4841,14 +6136,17 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=91
        * @param value The timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndex(
+      @java.lang.Deprecated public Builder setTimeIndex(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -4860,13 +6158,16 @@ public Builder setTimeIndex(
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=91
        * @return This builder for chaining.
        */
-      public Builder clearTimeIndex() {
+      @java.lang.Deprecated public Builder clearTimeIndex() {
         
         timeIndex_ = getDefaultInstance().getTimeIndex();
         onChanged();
@@ -4874,14 +6175,17 @@ public Builder clearTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=91
        * @param value The bytes for timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexBytes(
+      @java.lang.Deprecated public Builder setTimeIndexBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -4902,63 +6206,78 @@ private void ensureTagColumnsIsMutable() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @return A list containing the tagColumns.
        */
-      public com.google.protobuf.ProtocolStringList
+      @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
           getTagColumnsList() {
         return tagColumns_.getUnmodifiableView();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @return The count of tagColumns.
        */
-      public int getTagColumnsCount() {
+      @java.lang.Deprecated public int getTagColumnsCount() {
         return tagColumns_.size();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @param index The index of the element to return.
        * @return The tagColumns at the given index.
        */
-      public java.lang.String getTagColumns(int index) {
+      @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
         return tagColumns_.get(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @param index The index of the value to return.
        * @return The bytes of the tagColumns at the given index.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTagColumnsBytes(int index) {
         return tagColumns_.getByteString(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @param index The index to set the value at.
        * @param value The tagColumns to set.
        * @return This builder for chaining.
        */
-      public Builder setTagColumns(
+      @java.lang.Deprecated public Builder setTagColumns(
           int index, java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -4970,14 +6289,17 @@ public Builder setTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @param value The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumns(
+      @java.lang.Deprecated public Builder addTagColumns(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -4989,14 +6311,17 @@ public Builder addTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @param values The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addAllTagColumns(
+      @java.lang.Deprecated public Builder addAllTagColumns(
           java.lang.Iterable<java.lang.String> values) {
         ensureTagColumnsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -5006,13 +6331,16 @@ public Builder addAllTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @return This builder for chaining.
        */
-      public Builder clearTagColumns() {
+      @java.lang.Deprecated public Builder clearTagColumns() {
         tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
@@ -5020,14 +6348,17 @@ public Builder clearTagColumns() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.RangeManipulate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=94
        * @param value The bytes of the tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumnsBytes(
+      @java.lang.Deprecated public Builder addTagColumnsBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -5038,6 +6369,156 @@ public Builder addTagColumnsBytes(
         onChanged();
         return this;
       }
+
+      private long timeIndexIdx_ ;
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 7;</code>
+       * @return The timeIndexIdx.
+       */
+      @java.lang.Override
+      public long getTimeIndexIdx() {
+        return timeIndexIdx_;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 7;</code>
+       * @param value The timeIndexIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeIndexIdx(long value) {
+        
+        timeIndexIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeIndexIdx() {
+        
+        timeIndexIdx_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList tagColumnIndices_ = emptyLongList();
+      private void ensureTagColumnIndicesIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_ = mutableCopy(tagColumnIndices_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 8;</code>
+       * @return A list containing the tagColumnIndices.
+       */
+      public java.util.List<java.lang.Long>
+          getTagColumnIndicesList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(tagColumnIndices_) : tagColumnIndices_;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 8;</code>
+       * @return The count of tagColumnIndices.
+       */
+      public int getTagColumnIndicesCount() {
+        return tagColumnIndices_.size();
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 8;</code>
+       * @param index The index of the element to return.
+       * @return The tagColumnIndices at the given index.
+       */
+      public long getTagColumnIndices(int index) {
+        return tagColumnIndices_.getLong(index);
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The tagColumnIndices to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTagColumnIndices(
+          int index, long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 8;</code>
+       * @param value The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTagColumnIndices(long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 8;</code>
+       * @param values The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTagColumnIndices(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureTagColumnIndicesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, tagColumnIndices_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTagColumnIndices() {
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -5127,84 +6608,157 @@ public interface ScalarCalculateOrBuilder extends
 
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=110
      * @return The timeIndex.
      */
-    java.lang.String getTimeIndex();
+    @java.lang.Deprecated java.lang.String getTimeIndex();
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=110
      * @return The bytes for timeIndex.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTimeIndexBytes();
 
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @return A list containing the tagColumns.
      */
-    java.util.List<java.lang.String>
+    @java.lang.Deprecated java.util.List<java.lang.String>
         getTagColumnsList();
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @return The count of tagColumns.
      */
-    int getTagColumnsCount();
+    @java.lang.Deprecated int getTagColumnsCount();
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @param index The index of the element to return.
      * @return The tagColumns at the given index.
      */
-    java.lang.String getTagColumns(int index);
+    @java.lang.Deprecated java.lang.String getTagColumns(int index);
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @param index The index of the value to return.
      * @return The bytes of the tagColumns at the given index.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTagColumnsBytes(int index);
 
     /**
      * <pre>
-     * Column name of field column
+     * [DEPRECATED] Column name of field column.
+     * Use `field_column_idx` instead.
      * </pre>
      *
-     * <code>string field_column = 7;</code>
+     * <code>string field_column = 7 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=116
      * @return The fieldColumn.
      */
-    java.lang.String getFieldColumn();
+    @java.lang.Deprecated java.lang.String getFieldColumn();
     /**
      * <pre>
-     * Column name of field column
+     * [DEPRECATED] Column name of field column.
+     * Use `field_column_idx` instead.
      * </pre>
      *
-     * <code>string field_column = 7;</code>
+     * <code>string field_column = 7 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=116
      * @return The bytes for fieldColumn.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getFieldColumnBytes();
+
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_idx = 8;</code>
+     * @return The timeIndexIdx.
+     */
+    long getTimeIndexIdx();
+
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 9;</code>
+     * @return A list containing the tagColumnIndices.
+     */
+    java.util.List<java.lang.Long> getTagColumnIndicesList();
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 9;</code>
+     * @return The count of tagColumnIndices.
+     */
+    int getTagColumnIndicesCount();
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 9;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
+     */
+    long getTagColumnIndices(int index);
+
+    /**
+     * <pre>
+     * Column index of field column
+     * </pre>
+     *
+     * <code>uint64 field_column_idx = 10;</code>
+     * @return The fieldColumnIdx.
+     */
+    long getFieldColumnIdx();
   }
   /**
    * Protobuf type {@code substrait_extension.ScalarCalculate}
@@ -5222,6 +6776,7 @@ private ScalarCalculate() {
       timeIndex_ = "";
       tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       fieldColumn_ = "";
+      tagColumnIndices_ = emptyLongList();
     }
 
     @java.lang.Override
@@ -5291,6 +6846,37 @@ private ScalarCalculate(
               fieldColumn_ = s;
               break;
             }
+            case 64: {
+
+              timeIndexIdx_ = input.readUInt64();
+              break;
+            }
+            case 72: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              tagColumnIndices_.addLong(input.readUInt64());
+              break;
+            }
+            case 74: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tagColumnIndices_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 80: {
+
+              fieldColumnIdx_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -5311,6 +6897,9 @@ private ScalarCalculate(
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           tagColumns_ = tagColumns_.getUnmodifiableView();
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -5377,14 +6966,17 @@ public long getInterval() {
     private volatile java.lang.Object timeIndex_;
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=110
      * @return The timeIndex.
      */
     @java.lang.Override
-    public java.lang.String getTimeIndex() {
+    @java.lang.Deprecated public java.lang.String getTimeIndex() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -5398,14 +6990,17 @@ public java.lang.String getTimeIndex() {
     }
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_idx` instead.
      * </pre>
      *
-     * <code>string time_index = 5;</code>
+     * <code>string time_index = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=110
      * @return The bytes for timeIndex.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTimeIndexBytes() {
       java.lang.Object ref = timeIndex_;
       if (ref instanceof java.lang.String) {
@@ -5423,49 +7018,61 @@ public java.lang.String getTimeIndex() {
     private com.google.protobuf.LazyStringList tagColumns_;
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @return A list containing the tagColumns.
      */
-    public com.google.protobuf.ProtocolStringList
+    @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
         getTagColumnsList() {
       return tagColumns_;
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @return The count of tagColumns.
      */
-    public int getTagColumnsCount() {
+    @java.lang.Deprecated public int getTagColumnsCount() {
       return tagColumns_.size();
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @param index The index of the element to return.
      * @return The tagColumns at the given index.
      */
-    public java.lang.String getTagColumns(int index) {
+    @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
       return tagColumns_.get(index);
     }
     /**
      * <pre>
-     * Names of tag columns
+     * [DEPRECATED] Names of tag columns.
+     * Use `tag_column_indices` instead.
      * </pre>
      *
-     * <code>repeated string tag_columns = 6;</code>
+     * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=113
      * @param index The index of the value to return.
      * @return The bytes of the tagColumns at the given index.
      */
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTagColumnsBytes(int index) {
       return tagColumns_.getByteString(index);
     }
@@ -5474,14 +7081,17 @@ public java.lang.String getTagColumns(int index) {
     private volatile java.lang.Object fieldColumn_;
     /**
      * <pre>
-     * Column name of field column
+     * [DEPRECATED] Column name of field column.
+     * Use `field_column_idx` instead.
      * </pre>
      *
-     * <code>string field_column = 7;</code>
+     * <code>string field_column = 7 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=116
      * @return The fieldColumn.
      */
     @java.lang.Override
-    public java.lang.String getFieldColumn() {
+    @java.lang.Deprecated public java.lang.String getFieldColumn() {
       java.lang.Object ref = fieldColumn_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -5495,14 +7105,17 @@ public java.lang.String getFieldColumn() {
     }
     /**
      * <pre>
-     * Column name of field column
+     * [DEPRECATED] Column name of field column.
+     * Use `field_column_idx` instead.
      * </pre>
      *
-     * <code>string field_column = 7;</code>
+     * <code>string field_column = 7 [deprecated = true];</code>
+     * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=116
      * @return The bytes for fieldColumn.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getFieldColumnBytes() {
       java.lang.Object ref = fieldColumn_;
       if (ref instanceof java.lang.String) {
@@ -5516,6 +7129,76 @@ public java.lang.String getFieldColumn() {
       }
     }
 
+    public static final int TIME_INDEX_IDX_FIELD_NUMBER = 8;
+    private long timeIndexIdx_;
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_idx = 8;</code>
+     * @return The timeIndexIdx.
+     */
+    @java.lang.Override
+    public long getTimeIndexIdx() {
+      return timeIndexIdx_;
+    }
+
+    public static final int TAG_COLUMN_INDICES_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.LongList tagColumnIndices_;
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 9;</code>
+     * @return A list containing the tagColumnIndices.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getTagColumnIndicesList() {
+      return tagColumnIndices_;
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 9;</code>
+     * @return The count of tagColumnIndices.
+     */
+    public int getTagColumnIndicesCount() {
+      return tagColumnIndices_.size();
+    }
+    /**
+     * <pre>
+     * Indices of tag columns
+     * </pre>
+     *
+     * <code>repeated uint64 tag_column_indices = 9;</code>
+     * @param index The index of the element to return.
+     * @return The tagColumnIndices at the given index.
+     */
+    public long getTagColumnIndices(int index) {
+      return tagColumnIndices_.getLong(index);
+    }
+    private int tagColumnIndicesMemoizedSerializedSize = -1;
+
+    public static final int FIELD_COLUMN_IDX_FIELD_NUMBER = 10;
+    private long fieldColumnIdx_;
+    /**
+     * <pre>
+     * Column index of field column
+     * </pre>
+     *
+     * <code>uint64 field_column_idx = 10;</code>
+     * @return The fieldColumnIdx.
+     */
+    @java.lang.Override
+    public long getFieldColumnIdx() {
+      return fieldColumnIdx_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -5530,6 +7213,7 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       if (start_ != 0L) {
         output.writeInt64(1, start_);
       }
@@ -5548,6 +7232,19 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fieldColumn_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, fieldColumn_);
       }
+      if (timeIndexIdx_ != 0L) {
+        output.writeUInt64(8, timeIndexIdx_);
+      }
+      if (getTagColumnIndicesList().size() > 0) {
+        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(tagColumnIndicesMemoizedSerializedSize);
+      }
+      for (int i = 0; i < tagColumnIndices_.size(); i++) {
+        output.writeUInt64NoTag(tagColumnIndices_.getLong(i));
+      }
+      if (fieldColumnIdx_ != 0L) {
+        output.writeUInt64(10, fieldColumnIdx_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -5583,6 +7280,28 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fieldColumn_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, fieldColumn_);
       }
+      if (timeIndexIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(8, timeIndexIdx_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < tagColumnIndices_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(tagColumnIndices_.getLong(i));
+        }
+        size += dataSize;
+        if (!getTagColumnIndicesList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        tagColumnIndicesMemoizedSerializedSize = dataSize;
+      }
+      if (fieldColumnIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(10, fieldColumnIdx_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -5610,6 +7329,12 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getTagColumnsList())) return false;
       if (!getFieldColumn()
           .equals(other.getFieldColumn())) return false;
+      if (getTimeIndexIdx()
+          != other.getTimeIndexIdx()) return false;
+      if (!getTagColumnIndicesList()
+          .equals(other.getTagColumnIndicesList())) return false;
+      if (getFieldColumnIdx()
+          != other.getFieldColumnIdx()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -5638,6 +7363,16 @@ public int hashCode() {
       }
       hash = (37 * hash) + FIELD_COLUMN_FIELD_NUMBER;
       hash = (53 * hash) + getFieldColumn().hashCode();
+      hash = (37 * hash) + TIME_INDEX_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTimeIndexIdx());
+      if (getTagColumnIndicesCount() > 0) {
+        hash = (37 * hash) + TAG_COLUMN_INDICES_FIELD_NUMBER;
+        hash = (53 * hash) + getTagColumnIndicesList().hashCode();
+      }
+      hash = (37 * hash) + FIELD_COLUMN_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getFieldColumnIdx());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -5783,6 +7518,12 @@ public Builder clear() {
         bitField0_ = (bitField0_ & ~0x00000001);
         fieldColumn_ = "";
 
+        timeIndexIdx_ = 0L;
+
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        fieldColumnIdx_ = 0L;
+
         return this;
       }
 
@@ -5820,6 +7561,13 @@ public substrait_extension.PromqlPlan.ScalarCalculate buildPartial() {
         }
         result.tagColumns_ = tagColumns_;
         result.fieldColumn_ = fieldColumn_;
+        result.timeIndexIdx_ = timeIndexIdx_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.tagColumnIndices_ = tagColumnIndices_;
+        result.fieldColumnIdx_ = fieldColumnIdx_;
         onBuilt();
         return result;
       }
@@ -5895,6 +7643,22 @@ public Builder mergeFrom(substrait_extension.PromqlPlan.ScalarCalculate other) {
           fieldColumn_ = other.fieldColumn_;
           onChanged();
         }
+        if (other.getTimeIndexIdx() != 0L) {
+          setTimeIndexIdx(other.getTimeIndexIdx());
+        }
+        if (!other.tagColumnIndices_.isEmpty()) {
+          if (tagColumnIndices_.isEmpty()) {
+            tagColumnIndices_ = other.tagColumnIndices_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureTagColumnIndicesIsMutable();
+            tagColumnIndices_.addAll(other.tagColumnIndices_);
+          }
+          onChanged();
+        }
+        if (other.getFieldColumnIdx() != 0L) {
+          setFieldColumnIdx(other.getFieldColumnIdx());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -6057,13 +7821,16 @@ public Builder clearInterval() {
       private java.lang.Object timeIndex_ = "";
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=110
        * @return The timeIndex.
        */
-      public java.lang.String getTimeIndex() {
+      @java.lang.Deprecated public java.lang.String getTimeIndex() {
         java.lang.Object ref = timeIndex_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -6077,13 +7844,16 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=110
        * @return The bytes for timeIndex.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTimeIndexBytes() {
         java.lang.Object ref = timeIndex_;
         if (ref instanceof String) {
@@ -6098,14 +7868,17 @@ public java.lang.String getTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=110
        * @param value The timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndex(
+      @java.lang.Deprecated public Builder setTimeIndex(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -6117,13 +7890,16 @@ public Builder setTimeIndex(
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=110
        * @return This builder for chaining.
        */
-      public Builder clearTimeIndex() {
+      @java.lang.Deprecated public Builder clearTimeIndex() {
         
         timeIndex_ = getDefaultInstance().getTimeIndex();
         onChanged();
@@ -6131,14 +7907,17 @@ public Builder clearTimeIndex() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_idx` instead.
        * </pre>
        *
-       * <code>string time_index = 5;</code>
+       * <code>string time_index = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.time_index is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=110
        * @param value The bytes for timeIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexBytes(
+      @java.lang.Deprecated public Builder setTimeIndexBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -6159,63 +7938,78 @@ private void ensureTagColumnsIsMutable() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @return A list containing the tagColumns.
        */
-      public com.google.protobuf.ProtocolStringList
+      @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
           getTagColumnsList() {
         return tagColumns_.getUnmodifiableView();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @return The count of tagColumns.
        */
-      public int getTagColumnsCount() {
+      @java.lang.Deprecated public int getTagColumnsCount() {
         return tagColumns_.size();
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @param index The index of the element to return.
        * @return The tagColumns at the given index.
        */
-      public java.lang.String getTagColumns(int index) {
+      @java.lang.Deprecated public java.lang.String getTagColumns(int index) {
         return tagColumns_.get(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @param index The index of the value to return.
        * @return The bytes of the tagColumns at the given index.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTagColumnsBytes(int index) {
         return tagColumns_.getByteString(index);
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @param index The index to set the value at.
        * @param value The tagColumns to set.
        * @return This builder for chaining.
        */
-      public Builder setTagColumns(
+      @java.lang.Deprecated public Builder setTagColumns(
           int index, java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -6227,14 +8021,17 @@ public Builder setTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @param value The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumns(
+      @java.lang.Deprecated public Builder addTagColumns(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -6246,14 +8043,17 @@ public Builder addTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @param values The tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addAllTagColumns(
+      @java.lang.Deprecated public Builder addAllTagColumns(
           java.lang.Iterable<java.lang.String> values) {
         ensureTagColumnsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -6263,13 +8063,16 @@ public Builder addAllTagColumns(
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @return This builder for chaining.
        */
-      public Builder clearTagColumns() {
+      @java.lang.Deprecated public Builder clearTagColumns() {
         tagColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
@@ -6277,14 +8080,17 @@ public Builder clearTagColumns() {
       }
       /**
        * <pre>
-       * Names of tag columns
+       * [DEPRECATED] Names of tag columns.
+       * Use `tag_column_indices` instead.
        * </pre>
        *
-       * <code>repeated string tag_columns = 6;</code>
+       * <code>repeated string tag_columns = 6 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.tag_columns is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=113
        * @param value The bytes of the tagColumns to add.
        * @return This builder for chaining.
        */
-      public Builder addTagColumnsBytes(
+      @java.lang.Deprecated public Builder addTagColumnsBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -6299,13 +8105,16 @@ public Builder addTagColumnsBytes(
       private java.lang.Object fieldColumn_ = "";
       /**
        * <pre>
-       * Column name of field column
+       * [DEPRECATED] Column name of field column.
+       * Use `field_column_idx` instead.
        * </pre>
        *
-       * <code>string field_column = 7;</code>
+       * <code>string field_column = 7 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=116
        * @return The fieldColumn.
        */
-      public java.lang.String getFieldColumn() {
+      @java.lang.Deprecated public java.lang.String getFieldColumn() {
         java.lang.Object ref = fieldColumn_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -6319,13 +8128,16 @@ public java.lang.String getFieldColumn() {
       }
       /**
        * <pre>
-       * Column name of field column
+       * [DEPRECATED] Column name of field column.
+       * Use `field_column_idx` instead.
        * </pre>
        *
-       * <code>string field_column = 7;</code>
+       * <code>string field_column = 7 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=116
        * @return The bytes for fieldColumn.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getFieldColumnBytes() {
         java.lang.Object ref = fieldColumn_;
         if (ref instanceof String) {
@@ -6340,14 +8152,17 @@ public java.lang.String getFieldColumn() {
       }
       /**
        * <pre>
-       * Column name of field column
+       * [DEPRECATED] Column name of field column.
+       * Use `field_column_idx` instead.
        * </pre>
        *
-       * <code>string field_column = 7;</code>
+       * <code>string field_column = 7 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=116
        * @param value The fieldColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setFieldColumn(
+      @java.lang.Deprecated public Builder setFieldColumn(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -6359,13 +8174,16 @@ public Builder setFieldColumn(
       }
       /**
        * <pre>
-       * Column name of field column
+       * [DEPRECATED] Column name of field column.
+       * Use `field_column_idx` instead.
        * </pre>
        *
-       * <code>string field_column = 7;</code>
+       * <code>string field_column = 7 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=116
        * @return This builder for chaining.
        */
-      public Builder clearFieldColumn() {
+      @java.lang.Deprecated public Builder clearFieldColumn() {
         
         fieldColumn_ = getDefaultInstance().getFieldColumn();
         onChanged();
@@ -6373,14 +8191,17 @@ public Builder clearFieldColumn() {
       }
       /**
        * <pre>
-       * Column name of field column
+       * [DEPRECATED] Column name of field column.
+       * Use `field_column_idx` instead.
        * </pre>
        *
-       * <code>string field_column = 7;</code>
+       * <code>string field_column = 7 [deprecated = true];</code>
+       * @deprecated substrait_extension.ScalarCalculate.field_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=116
        * @param value The bytes for fieldColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setFieldColumnBytes(
+      @java.lang.Deprecated public Builder setFieldColumnBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -6391,6 +8212,199 @@ public Builder setFieldColumnBytes(
         onChanged();
         return this;
       }
+
+      private long timeIndexIdx_ ;
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 8;</code>
+       * @return The timeIndexIdx.
+       */
+      @java.lang.Override
+      public long getTimeIndexIdx() {
+        return timeIndexIdx_;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 8;</code>
+       * @param value The timeIndexIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeIndexIdx(long value) {
+        
+        timeIndexIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_idx = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeIndexIdx() {
+        
+        timeIndexIdx_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList tagColumnIndices_ = emptyLongList();
+      private void ensureTagColumnIndicesIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          tagColumnIndices_ = mutableCopy(tagColumnIndices_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 9;</code>
+       * @return A list containing the tagColumnIndices.
+       */
+      public java.util.List<java.lang.Long>
+          getTagColumnIndicesList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(tagColumnIndices_) : tagColumnIndices_;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 9;</code>
+       * @return The count of tagColumnIndices.
+       */
+      public int getTagColumnIndicesCount() {
+        return tagColumnIndices_.size();
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 9;</code>
+       * @param index The index of the element to return.
+       * @return The tagColumnIndices at the given index.
+       */
+      public long getTagColumnIndices(int index) {
+        return tagColumnIndices_.getLong(index);
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 9;</code>
+       * @param index The index to set the value at.
+       * @param value The tagColumnIndices to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTagColumnIndices(
+          int index, long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 9;</code>
+       * @param value The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTagColumnIndices(long value) {
+        ensureTagColumnIndicesIsMutable();
+        tagColumnIndices_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 9;</code>
+       * @param values The tagColumnIndices to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTagColumnIndices(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureTagColumnIndicesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, tagColumnIndices_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Indices of tag columns
+       * </pre>
+       *
+       * <code>repeated uint64 tag_column_indices = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTagColumnIndices() {
+        tagColumnIndices_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private long fieldColumnIdx_ ;
+      /**
+       * <pre>
+       * Column index of field column
+       * </pre>
+       *
+       * <code>uint64 field_column_idx = 10;</code>
+       * @return The fieldColumnIdx.
+       */
+      @java.lang.Override
+      public long getFieldColumnIdx() {
+        return fieldColumnIdx_;
+      }
+      /**
+       * <pre>
+       * Column index of field column
+       * </pre>
+       *
+       * <code>uint64 field_column_idx = 10;</code>
+       * @param value The fieldColumnIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFieldColumnIdx(long value) {
+        
+        fieldColumnIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Column index of field column
+       * </pre>
+       *
+       * <code>uint64 field_column_idx = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFieldColumnIdx() {
+        
+        fieldColumnIdx_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -6480,42 +8494,54 @@ public interface AbsentOrBuilder extends
 
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 4;</code>
+     * <code>string time_index_column = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=134
      * @return The timeIndexColumn.
      */
-    java.lang.String getTimeIndexColumn();
+    @java.lang.Deprecated java.lang.String getTimeIndexColumn();
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 4;</code>
+     * <code>string time_index_column = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=134
      * @return The bytes for timeIndexColumn.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getTimeIndexColumnBytes();
 
     /**
      * <pre>
-     * Column name of value column
+     * [DEPRECATED] Column name of value column.
+     * Use `value_column_idx` instead.
      * </pre>
      *
-     * <code>string value_column = 5;</code>
+     * <code>string value_column = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.value_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=137
      * @return The valueColumn.
      */
-    java.lang.String getValueColumn();
+    @java.lang.Deprecated java.lang.String getValueColumn();
     /**
      * <pre>
-     * Column name of value column
+     * [DEPRECATED] Column name of value column.
+     * Use `value_column_idx` instead.
      * </pre>
      *
-     * <code>string value_column = 5;</code>
+     * <code>string value_column = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.value_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=137
      * @return The bytes for valueColumn.
      */
-    com.google.protobuf.ByteString
+    @java.lang.Deprecated com.google.protobuf.ByteString
         getValueColumnBytes();
 
     /**
@@ -6561,6 +8587,26 @@ public interface AbsentOrBuilder extends
      */
     substrait_extension.PromqlPlan.LabelPairOrBuilder getFakeLabelsOrBuilder(
         int index);
+
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_column_idx = 7;</code>
+     * @return The timeIndexColumnIdx.
+     */
+    long getTimeIndexColumnIdx();
+
+    /**
+     * <pre>
+     * Column index of value column
+     * </pre>
+     *
+     * <code>uint64 value_column_idx = 8;</code>
+     * @return The valueColumnIdx.
+     */
+    long getValueColumnIdx();
   }
   /**
    * Protobuf type {@code substrait_extension.Absent}
@@ -6647,6 +8693,16 @@ private Absent(
                   input.readMessage(substrait_extension.PromqlPlan.LabelPair.parser(), extensionRegistry));
               break;
             }
+            case 56: {
+
+              timeIndexColumnIdx_ = input.readUInt64();
+              break;
+            }
+            case 64: {
+
+              valueColumnIdx_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -6733,14 +8789,17 @@ public long getStep() {
     private volatile java.lang.Object timeIndexColumn_;
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 4;</code>
+     * <code>string time_index_column = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=134
      * @return The timeIndexColumn.
      */
     @java.lang.Override
-    public java.lang.String getTimeIndexColumn() {
+    @java.lang.Deprecated public java.lang.String getTimeIndexColumn() {
       java.lang.Object ref = timeIndexColumn_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -6754,14 +8813,17 @@ public java.lang.String getTimeIndexColumn() {
     }
     /**
      * <pre>
-     * Column name of time index column
+     * [DEPRECATED] Column name of time index column.
+     * Use `time_index_column_idx` instead.
      * </pre>
      *
-     * <code>string time_index_column = 4;</code>
+     * <code>string time_index_column = 4 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=134
      * @return The bytes for timeIndexColumn.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getTimeIndexColumnBytes() {
       java.lang.Object ref = timeIndexColumn_;
       if (ref instanceof java.lang.String) {
@@ -6779,14 +8841,17 @@ public java.lang.String getTimeIndexColumn() {
     private volatile java.lang.Object valueColumn_;
     /**
      * <pre>
-     * Column name of value column
+     * [DEPRECATED] Column name of value column.
+     * Use `value_column_idx` instead.
      * </pre>
      *
-     * <code>string value_column = 5;</code>
+     * <code>string value_column = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.value_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=137
      * @return The valueColumn.
      */
     @java.lang.Override
-    public java.lang.String getValueColumn() {
+    @java.lang.Deprecated public java.lang.String getValueColumn() {
       java.lang.Object ref = valueColumn_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -6800,14 +8865,17 @@ public java.lang.String getValueColumn() {
     }
     /**
      * <pre>
-     * Column name of value column
+     * [DEPRECATED] Column name of value column.
+     * Use `value_column_idx` instead.
      * </pre>
      *
-     * <code>string value_column = 5;</code>
+     * <code>string value_column = 5 [deprecated = true];</code>
+     * @deprecated substrait_extension.Absent.value_column is deprecated.
+     *     See substrait_extension/promql_plan.proto;l=137
      * @return The bytes for valueColumn.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
+    @java.lang.Deprecated public com.google.protobuf.ByteString
         getValueColumnBytes() {
       java.lang.Object ref = valueColumn_;
       if (ref instanceof java.lang.String) {
@@ -6881,6 +8949,36 @@ public substrait_extension.PromqlPlan.LabelPairOrBuilder getFakeLabelsOrBuilder(
       return fakeLabels_.get(index);
     }
 
+    public static final int TIME_INDEX_COLUMN_IDX_FIELD_NUMBER = 7;
+    private long timeIndexColumnIdx_;
+    /**
+     * <pre>
+     * Column index of time index column
+     * </pre>
+     *
+     * <code>uint64 time_index_column_idx = 7;</code>
+     * @return The timeIndexColumnIdx.
+     */
+    @java.lang.Override
+    public long getTimeIndexColumnIdx() {
+      return timeIndexColumnIdx_;
+    }
+
+    public static final int VALUE_COLUMN_IDX_FIELD_NUMBER = 8;
+    private long valueColumnIdx_;
+    /**
+     * <pre>
+     * Column index of value column
+     * </pre>
+     *
+     * <code>uint64 value_column_idx = 8;</code>
+     * @return The valueColumnIdx.
+     */
+    @java.lang.Override
+    public long getValueColumnIdx() {
+      return valueColumnIdx_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -6913,6 +9011,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < fakeLabels_.size(); i++) {
         output.writeMessage(6, fakeLabels_.get(i));
       }
+      if (timeIndexColumnIdx_ != 0L) {
+        output.writeUInt64(7, timeIndexColumnIdx_);
+      }
+      if (valueColumnIdx_ != 0L) {
+        output.writeUInt64(8, valueColumnIdx_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -6944,6 +9048,14 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(6, fakeLabels_.get(i));
       }
+      if (timeIndexColumnIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(7, timeIndexColumnIdx_);
+      }
+      if (valueColumnIdx_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(8, valueColumnIdx_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -6971,6 +9083,10 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getValueColumn())) return false;
       if (!getFakeLabelsList()
           .equals(other.getFakeLabelsList())) return false;
+      if (getTimeIndexColumnIdx()
+          != other.getTimeIndexColumnIdx()) return false;
+      if (getValueColumnIdx()
+          != other.getValueColumnIdx()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -6999,6 +9115,12 @@ public int hashCode() {
         hash = (37 * hash) + FAKE_LABELS_FIELD_NUMBER;
         hash = (53 * hash) + getFakeLabelsList().hashCode();
       }
+      hash = (37 * hash) + TIME_INDEX_COLUMN_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTimeIndexColumnIdx());
+      hash = (37 * hash) + VALUE_COLUMN_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getValueColumnIdx());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -7149,6 +9271,10 @@ public Builder clear() {
         } else {
           fakeLabelsBuilder_.clear();
         }
+        timeIndexColumnIdx_ = 0L;
+
+        valueColumnIdx_ = 0L;
+
         return this;
       }
 
@@ -7190,6 +9316,8 @@ public substrait_extension.PromqlPlan.Absent buildPartial() {
         } else {
           result.fakeLabels_ = fakeLabelsBuilder_.build();
         }
+        result.timeIndexColumnIdx_ = timeIndexColumnIdx_;
+        result.valueColumnIdx_ = valueColumnIdx_;
         onBuilt();
         return result;
       }
@@ -7281,6 +9409,12 @@ public Builder mergeFrom(substrait_extension.PromqlPlan.Absent other) {
             }
           }
         }
+        if (other.getTimeIndexColumnIdx() != 0L) {
+          setTimeIndexColumnIdx(other.getTimeIndexColumnIdx());
+        }
+        if (other.getValueColumnIdx() != 0L) {
+          setValueColumnIdx(other.getValueColumnIdx());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -7443,13 +9577,16 @@ public Builder clearStep() {
       private java.lang.Object timeIndexColumn_ = "";
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 4;</code>
+       * <code>string time_index_column = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=134
        * @return The timeIndexColumn.
        */
-      public java.lang.String getTimeIndexColumn() {
+      @java.lang.Deprecated public java.lang.String getTimeIndexColumn() {
         java.lang.Object ref = timeIndexColumn_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -7463,13 +9600,16 @@ public java.lang.String getTimeIndexColumn() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 4;</code>
+       * <code>string time_index_column = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=134
        * @return The bytes for timeIndexColumn.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getTimeIndexColumnBytes() {
         java.lang.Object ref = timeIndexColumn_;
         if (ref instanceof String) {
@@ -7484,14 +9624,17 @@ public java.lang.String getTimeIndexColumn() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 4;</code>
+       * <code>string time_index_column = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=134
        * @param value The timeIndexColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexColumn(
+      @java.lang.Deprecated public Builder setTimeIndexColumn(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -7503,13 +9646,16 @@ public Builder setTimeIndexColumn(
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 4;</code>
+       * <code>string time_index_column = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=134
        * @return This builder for chaining.
        */
-      public Builder clearTimeIndexColumn() {
+      @java.lang.Deprecated public Builder clearTimeIndexColumn() {
         
         timeIndexColumn_ = getDefaultInstance().getTimeIndexColumn();
         onChanged();
@@ -7517,14 +9663,17 @@ public Builder clearTimeIndexColumn() {
       }
       /**
        * <pre>
-       * Column name of time index column
+       * [DEPRECATED] Column name of time index column.
+       * Use `time_index_column_idx` instead.
        * </pre>
        *
-       * <code>string time_index_column = 4;</code>
+       * <code>string time_index_column = 4 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.time_index_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=134
        * @param value The bytes for timeIndexColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setTimeIndexColumnBytes(
+      @java.lang.Deprecated public Builder setTimeIndexColumnBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -7539,13 +9688,16 @@ public Builder setTimeIndexColumnBytes(
       private java.lang.Object valueColumn_ = "";
       /**
        * <pre>
-       * Column name of value column
+       * [DEPRECATED] Column name of value column.
+       * Use `value_column_idx` instead.
        * </pre>
        *
-       * <code>string value_column = 5;</code>
+       * <code>string value_column = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.value_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=137
        * @return The valueColumn.
        */
-      public java.lang.String getValueColumn() {
+      @java.lang.Deprecated public java.lang.String getValueColumn() {
         java.lang.Object ref = valueColumn_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
@@ -7559,13 +9711,16 @@ public java.lang.String getValueColumn() {
       }
       /**
        * <pre>
-       * Column name of value column
+       * [DEPRECATED] Column name of value column.
+       * Use `value_column_idx` instead.
        * </pre>
        *
-       * <code>string value_column = 5;</code>
+       * <code>string value_column = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.value_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=137
        * @return The bytes for valueColumn.
        */
-      public com.google.protobuf.ByteString
+      @java.lang.Deprecated public com.google.protobuf.ByteString
           getValueColumnBytes() {
         java.lang.Object ref = valueColumn_;
         if (ref instanceof String) {
@@ -7580,14 +9735,17 @@ public java.lang.String getValueColumn() {
       }
       /**
        * <pre>
-       * Column name of value column
+       * [DEPRECATED] Column name of value column.
+       * Use `value_column_idx` instead.
        * </pre>
        *
-       * <code>string value_column = 5;</code>
+       * <code>string value_column = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.value_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=137
        * @param value The valueColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setValueColumn(
+      @java.lang.Deprecated public Builder setValueColumn(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
@@ -7599,13 +9757,16 @@ public Builder setValueColumn(
       }
       /**
        * <pre>
-       * Column name of value column
+       * [DEPRECATED] Column name of value column.
+       * Use `value_column_idx` instead.
        * </pre>
        *
-       * <code>string value_column = 5;</code>
+       * <code>string value_column = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.value_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=137
        * @return This builder for chaining.
        */
-      public Builder clearValueColumn() {
+      @java.lang.Deprecated public Builder clearValueColumn() {
         
         valueColumn_ = getDefaultInstance().getValueColumn();
         onChanged();
@@ -7613,14 +9774,17 @@ public Builder clearValueColumn() {
       }
       /**
        * <pre>
-       * Column name of value column
+       * [DEPRECATED] Column name of value column.
+       * Use `value_column_idx` instead.
        * </pre>
        *
-       * <code>string value_column = 5;</code>
+       * <code>string value_column = 5 [deprecated = true];</code>
+       * @deprecated substrait_extension.Absent.value_column is deprecated.
+       *     See substrait_extension/promql_plan.proto;l=137
        * @param value The bytes for valueColumn to set.
        * @return This builder for chaining.
        */
-      public Builder setValueColumnBytes(
+      @java.lang.Deprecated public Builder setValueColumnBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
@@ -7943,6 +10107,92 @@ public substrait_extension.PromqlPlan.LabelPair.Builder addFakeLabelsBuilder(
         }
         return fakeLabelsBuilder_;
       }
+
+      private long timeIndexColumnIdx_ ;
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_column_idx = 7;</code>
+       * @return The timeIndexColumnIdx.
+       */
+      @java.lang.Override
+      public long getTimeIndexColumnIdx() {
+        return timeIndexColumnIdx_;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_column_idx = 7;</code>
+       * @param value The timeIndexColumnIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeIndexColumnIdx(long value) {
+        
+        timeIndexColumnIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Column index of time index column
+       * </pre>
+       *
+       * <code>uint64 time_index_column_idx = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeIndexColumnIdx() {
+        
+        timeIndexColumnIdx_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private long valueColumnIdx_ ;
+      /**
+       * <pre>
+       * Column index of value column
+       * </pre>
+       *
+       * <code>uint64 value_column_idx = 8;</code>
+       * @return The valueColumnIdx.
+       */
+      @java.lang.Override
+      public long getValueColumnIdx() {
+        return valueColumnIdx_;
+      }
+      /**
+       * <pre>
+       * Column index of value column
+       * </pre>
+       *
+       * <code>uint64 value_column_idx = 8;</code>
+       * @param value The valueColumnIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setValueColumnIdx(long value) {
+        
+        valueColumnIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Column index of value column
+       * </pre>
+       *
+       * <code>uint64 value_column_idx = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearValueColumnIdx() {
+        
+        valueColumnIdx_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -8768,27 +11018,37 @@ public substrait_extension.PromqlPlan.LabelPair getDefaultInstanceForType() {
       "\n%substrait_extension/promql_plan.proto\022" +
       "\023substrait_extension\";\n\013EmptyMetric\022\r\n\005s" +
       "tart\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(" +
-      "\003\"\202\001\n\021InstantManipulate\022\r\n\005start\030\001 \001(\003\022\013" +
+      "\003\"\273\001\n\021InstantManipulate\022\r\n\005start\030\001 \001(\003\022\013" +
       "\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022\026\n\016lookbac" +
-      "k_delta\030\004 \001(\003\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013fie" +
-      "ld_index\030\006 \001(\t\"^\n\017SeriesNormalize\022\016\n\006off" +
-      "set\030\001 \001(\003\022\022\n\ntime_index\030\002 \001(\t\022\022\n\nfilter_" +
-      "nan\030\003 \001(\010\022\023\n\013tag_columns\030\004 \003(\t\">\n\014Series" +
-      "Divide\022\023\n\013tag_columns\030\001 \003(\t\022\031\n\021time_inde" +
-      "x_column\030\002 \001(\t\"w\n\017RangeManipulate\022\r\n\005sta" +
-      "rt\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022" +
-      "\r\n\005range\030\004 \001(\003\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013ta" +
-      "g_columns\030\006 \003(\t\"~\n\017ScalarCalculate\022\r\n\005st" +
-      "art\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003" +
-      "\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013tag_columns\030\006 \003(" +
-      "\t\022\024\n\014field_column\030\007 \001(\t\"\230\001\n\006Absent\022\r\n\005st" +
-      "art\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\014\n\004step\030\003 \001(\003\022\031\n\021" +
-      "time_index_column\030\004 \001(\t\022\024\n\014value_column\030" +
-      "\005 \001(\t\0223\n\013fake_labels\030\006 \003(\0132\036.substrait_e" +
-      "xtension.LabelPair\"\'\n\tLabelPair\022\013\n\003key\030\001" +
-      " \001(\t\022\r\n\005value\030\002 \001(\tB?Z=github.com/Grepti" +
-      "meTeam/greptime-proto/go/substrait_exten" +
-      "sionb\006proto3"
+      "k_delta\030\004 \001(\003\022\026\n\ntime_index\030\005 \001(\tB\002\030\001\022\027\n" +
+      "\013field_index\030\006 \001(\tB\002\030\001\022\026\n\016time_index_idx" +
+      "\030\007 \001(\004\022\027\n\017field_index_idx\030\010 \001(\004\"\232\001\n\017Seri" +
+      "esNormalize\022\016\n\006offset\030\001 \001(\003\022\026\n\ntime_inde" +
+      "x\030\002 \001(\tB\002\030\001\022\022\n\nfilter_nan\030\003 \001(\010\022\027\n\013tag_c" +
+      "olumns\030\004 \003(\tB\002\030\001\022\026\n\016time_index_idx\030\005 \001(\004" +
+      "\022\032\n\022tag_column_indices\030\006 \003(\004\"\201\001\n\014SeriesD" +
+      "ivide\022\027\n\013tag_columns\030\001 \003(\tB\002\030\001\022\035\n\021time_i" +
+      "ndex_column\030\002 \001(\tB\002\030\001\022\032\n\022tag_column_indi" +
+      "ces\030\003 \003(\004\022\035\n\025time_index_column_idx\030\004 \001(\004" +
+      "\"\263\001\n\017RangeManipulate\022\r\n\005start\030\001 \001(\003\022\013\n\003e" +
+      "nd\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022\r\n\005range\030\004 \001(" +
+      "\003\022\026\n\ntime_index\030\005 \001(\tB\002\030\001\022\027\n\013tag_columns" +
+      "\030\006 \003(\tB\002\030\001\022\026\n\016time_index_idx\030\007 \001(\004\022\032\n\022ta" +
+      "g_column_indices\030\010 \003(\004\"\330\001\n\017ScalarCalcula" +
+      "te\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interv" +
+      "al\030\003 \001(\003\022\026\n\ntime_index\030\005 \001(\tB\002\030\001\022\027\n\013tag_" +
+      "columns\030\006 \003(\tB\002\030\001\022\030\n\014field_column\030\007 \001(\tB" +
+      "\002\030\001\022\026\n\016time_index_idx\030\010 \001(\004\022\032\n\022tag_colum" +
+      "n_indices\030\t \003(\004\022\030\n\020field_column_idx\030\n \001(" +
+      "\004\"\331\001\n\006Absent\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003" +
+      "\022\014\n\004step\030\003 \001(\003\022\035\n\021time_index_column\030\004 \001(" +
+      "\tB\002\030\001\022\030\n\014value_column\030\005 \001(\tB\002\030\001\0223\n\013fake_" +
+      "labels\030\006 \003(\0132\036.substrait_extension.Label" +
+      "Pair\022\035\n\025time_index_column_idx\030\007 \001(\004\022\030\n\020v" +
+      "alue_column_idx\030\010 \001(\004\"\'\n\tLabelPair\022\013\n\003ke" +
+      "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\tB?Z=github.com/Gre" +
+      "ptimeTeam/greptime-proto/go/substrait_ex" +
+      "tensionb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -8805,37 +11065,37 @@ public substrait_extension.PromqlPlan.LabelPair getDefaultInstanceForType() {
     internal_static_substrait_extension_InstantManipulate_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_substrait_extension_InstantManipulate_descriptor,
-        new java.lang.String[] { "Start", "End", "Interval", "LookbackDelta", "TimeIndex", "FieldIndex", });
+        new java.lang.String[] { "Start", "End", "Interval", "LookbackDelta", "TimeIndex", "FieldIndex", "TimeIndexIdx", "FieldIndexIdx", });
     internal_static_substrait_extension_SeriesNormalize_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_substrait_extension_SeriesNormalize_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_substrait_extension_SeriesNormalize_descriptor,
-        new java.lang.String[] { "Offset", "TimeIndex", "FilterNan", "TagColumns", });
+        new java.lang.String[] { "Offset", "TimeIndex", "FilterNan", "TagColumns", "TimeIndexIdx", "TagColumnIndices", });
     internal_static_substrait_extension_SeriesDivide_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_substrait_extension_SeriesDivide_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_substrait_extension_SeriesDivide_descriptor,
-        new java.lang.String[] { "TagColumns", "TimeIndexColumn", });
+        new java.lang.String[] { "TagColumns", "TimeIndexColumn", "TagColumnIndices", "TimeIndexColumnIdx", });
     internal_static_substrait_extension_RangeManipulate_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_substrait_extension_RangeManipulate_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_substrait_extension_RangeManipulate_descriptor,
-        new java.lang.String[] { "Start", "End", "Interval", "Range", "TimeIndex", "TagColumns", });
+        new java.lang.String[] { "Start", "End", "Interval", "Range", "TimeIndex", "TagColumns", "TimeIndexIdx", "TagColumnIndices", });
     internal_static_substrait_extension_ScalarCalculate_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_substrait_extension_ScalarCalculate_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_substrait_extension_ScalarCalculate_descriptor,
-        new java.lang.String[] { "Start", "End", "Interval", "TimeIndex", "TagColumns", "FieldColumn", });
+        new java.lang.String[] { "Start", "End", "Interval", "TimeIndex", "TagColumns", "FieldColumn", "TimeIndexIdx", "TagColumnIndices", "FieldColumnIdx", });
     internal_static_substrait_extension_Absent_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_substrait_extension_Absent_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_substrait_extension_Absent_descriptor,
-        new java.lang.String[] { "Start", "End", "Step", "TimeIndexColumn", "ValueColumn", "FakeLabels", });
+        new java.lang.String[] { "Start", "End", "Step", "TimeIndexColumn", "ValueColumn", "FakeLabels", "TimeIndexColumnIdx", "ValueColumnIdx", });
     internal_static_substrait_extension_LabelPair_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_substrait_extension_LabelPair_fieldAccessorTable = new
diff --git a/proto/substrait_extension/promql_plan.proto b/proto/substrait_extension/promql_plan.proto
index f554e2fa..ab14ecba 100644
--- a/proto/substrait_extension/promql_plan.proto
+++ b/proto/substrait_extension/promql_plan.proto
@@ -36,28 +36,46 @@ message InstantManipulate {
   int64 interval = 3;
   // Look-back delta in millisecond
   int64 lookback_delta = 4;
-  // Column name of time index column
-  string time_index = 5;
-  // Optional field column name for validating staleness
-  string field_index = 6;
+  // [DEPRECATED] Column name of time index column.
+  // Use `time_index_idx` instead.
+  string time_index = 5 [deprecated = true];
+  // [DEPRECATED] Optional field column name for validating staleness.
+  // Use `field_index_idx` instead.
+  string field_index = 6 [deprecated = true];
+  // Column index of time index column
+  uint64 time_index_idx = 7;
+  // Optional field column index for validating staleness
+  uint64 field_index_idx = 8;
 }
 
 message SeriesNormalize {
   // Offset in millisecond
   int64 offset = 1;
-  // Column name of time index column
-  string time_index = 2;
+  // [DEPRECATED] Column name of time index column.
+  // Use `time_index_idx` instead.
+  string time_index = 2 [deprecated = true];
   // Whether to filter out NaN value
   bool filter_nan = 3;
-  // Names of tag columns
-  repeated string tag_columns = 4;
+  // [DEPRECATED] Names of tag columns.
+  // Use `tag_column_indices` instead.
+  repeated string tag_columns = 4 [deprecated = true];
+  // Column index of time index column
+  uint64 time_index_idx = 5;
+  // Indices of tag columns
+  repeated uint64 tag_column_indices = 6;
 }
 
 message SeriesDivide {
-  // Names of tag columns
-  repeated string tag_columns = 1;
-  // Name of time index column
-  string time_index_column = 2;
+  // [DEPRECATED] Names of tag columns.
+  // Use `tag_column_indices` instead.
+  repeated string tag_columns = 1 [deprecated = true];
+  // [DEPRECATED] Name of time index column.
+  // Use `time_index_column_idx` instead.
+  string time_index_column = 2 [deprecated = true];
+  // Indices of tag columns
+  repeated uint64 tag_column_indices = 3;
+  // Index of time index column
+  uint64 time_index_column_idx = 4;
 }
 
 message RangeManipulate {
@@ -69,10 +87,16 @@ message RangeManipulate {
   int64 interval = 3;
   // Range in millisecond
   int64 range = 4;
-  // Column name of time index column
-  string time_index = 5;
-  // Names of tag columns
-  repeated string tag_columns = 6;
+  // [DEPRECATED] Column name of time index column.
+  // Use `time_index_idx` instead.
+  string time_index = 5 [deprecated = true];
+  // [DEPRECATED] Names of tag columns.
+  // Use `tag_column_indices` instead.
+  repeated string tag_columns = 6 [deprecated = true];
+  // Column index of time index column
+  uint64 time_index_idx = 7;
+  // Indices of tag columns
+  repeated uint64 tag_column_indices = 8;
 }
 
 message ScalarCalculate {
@@ -82,12 +106,21 @@ message ScalarCalculate {
   int64 end = 2;
   // Interval in millisecond
   int64 interval = 3;
-  // Column name of time index column
-  string time_index = 5;
-  // Names of tag columns
-  repeated string tag_columns = 6;
-  // Column name of field column
-  string field_column = 7;
+  // [DEPRECATED] Column name of time index column.
+  // Use `time_index_idx` instead.
+  string time_index = 5 [deprecated = true];
+  // [DEPRECATED] Names of tag columns.
+  // Use `tag_column_indices` instead.
+  repeated string tag_columns = 6 [deprecated = true];
+  // [DEPRECATED] Column name of field column.
+  // Use `field_column_idx` instead.
+  string field_column = 7 [deprecated = true];
+  // Column index of time index column
+  uint64 time_index_idx = 8;
+  // Indices of tag columns
+  repeated uint64 tag_column_indices = 9;
+  // Column index of field column
+  uint64 field_column_idx = 10;
 }
 
 message Absent {
@@ -97,12 +130,18 @@ message Absent {
   int64 end = 2;
   // Step in millisecond
   int64 step = 3;
-  // Column name of time index column
-  string time_index_column = 4;
-  // Column name of value column
-  string value_column = 5;
+  // [DEPRECATED] Column name of time index column.
+  // Use `time_index_column_idx` instead.
+  string time_index_column = 4 [deprecated = true];
+  // [DEPRECATED] Column name of value column.
+  // Use `value_column_idx` instead.
+  string value_column = 5 [deprecated = true];
   // Fake labels as key-value pairs
   repeated LabelPair fake_labels = 6;
+  // Column index of time index column
+  uint64 time_index_column_idx = 7;
+  // Column index of value column
+  uint64 value_column_idx = 8;
 }
 
 message LabelPair {