diff --git a/gen/pb-cpp/flyteidl/core/tasks.pb.cc b/gen/pb-cpp/flyteidl/core/tasks.pb.cc
index 77417341d..e0f691c89 100644
--- a/gen/pb-cpp/flyteidl/core/tasks.pb.cc
+++ b/gen/pb-cpp/flyteidl/core/tasks.pb.cc
@@ -453,14 +453,14 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fcore_2ftasks_2eproto::of
   PROTOBUF_FIELD_OFFSET(::flyteidl::core::GPUAccelerator, device_),
   offsetof(::flyteidl::core::GPUAcceleratorDefaultTypeInternal, unpartitioned_),
   offsetof(::flyteidl::core::GPUAcceleratorDefaultTypeInternal, partition_size_),
-  PROTOBUF_FIELD_OFFSET(::flyteidl::core::GPUAccelerator, partition_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::core::GPUAccelerator, partition_size_value_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::flyteidl::core::ResourceMetadata, _internal_metadata_),
   ~0u,  // no _extensions_
   PROTOBUF_FIELD_OFFSET(::flyteidl::core::ResourceMetadata, _oneof_case_[0]),
   ~0u,  // no _weak_field_map_
   offsetof(::flyteidl::core::ResourceMetadataDefaultTypeInternal, gpu_accelerator_),
-  PROTOBUF_FIELD_OFFSET(::flyteidl::core::ResourceMetadata, accelerator_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::core::ResourceMetadata, accelerator_value_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::core::TaskMetadata_TagsEntry_DoNotUse, _has_bits_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::core::TaskMetadata_TagsEntry_DoNotUse, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -658,83 +658,84 @@ const char descriptor_table_protodef_flyteidl_2fcore_2ftasks_2eproto[] =
   "ype\030\001 \001(\0162*.flyteidl.core.RuntimeMetadat"
   "a.RuntimeType\022\017\n\007version\030\002 \001(\t\022\016\n\006flavor"
   "\030\003 \001(\t\"\'\n\013RuntimeType\022\t\n\005OTHER\020\000\022\r\n\tFLYT"
-  "E_SDK\020\001\"`\n\016GPUAccelerator\022\016\n\006device\030\001 \001("
+  "E_SDK\020\001\"k\n\016GPUAccelerator\022\016\n\006device\030\001 \001("
   "\t\022\027\n\runpartitioned\030\002 \001(\010H\000\022\030\n\016partition_"
-  "size\030\003 \001(\tH\000B\013\n\tpartition\"[\n\020ResourceMet"
-  "adata\0228\n\017gpu_accelerator\030\001 \001(\0132\035.flyteid"
-  "l.core.GPUAcceleratorH\000B\r\n\013accelerator\"\212"
-  "\004\n\014TaskMetadata\022\024\n\014discoverable\030\001 \001(\010\022/\n"
-  "\007runtime\030\002 \001(\0132\036.flyteidl.core.RuntimeMe"
-  "tadata\022*\n\007timeout\030\004 \001(\0132\031.google.protobu"
-  "f.Duration\022-\n\007retries\030\005 \001(\0132\034.flyteidl.c"
-  "ore.RetryStrategy\022\031\n\021discovery_version\030\006"
-  " \001(\t\022 \n\030deprecated_error_message\030\007 \001(\t\022\027"
-  "\n\rinterruptible\030\010 \001(\010H\000\022\032\n\022cache_seriali"
-  "zable\030\t \001(\010\022\026\n\016generates_deck\030\n \001(\010\0223\n\004t"
-  "ags\030\013 \003(\0132%.flyteidl.core.TaskMetadata.T"
-  "agsEntry\022\031\n\021pod_template_name\030\014 \001(\t\022:\n\021r"
-  "esource_metadata\030\r \001(\0132\037.flyteidl.core.R"
-  "esourceMetadata\032+\n\tTagsEntry\022\013\n\003key\030\001 \001("
-  "\t\022\r\n\005value\030\002 \001(\t:\0028\001B\025\n\023interruptible_va"
-  "lue\"\220\004\n\014TaskTemplate\022%\n\002id\030\001 \001(\0132\031.flyte"
-  "idl.core.Identifier\022\014\n\004type\030\002 \001(\t\022-\n\010met"
-  "adata\030\003 \001(\0132\033.flyteidl.core.TaskMetadata"
-  "\0220\n\tinterface\030\004 \001(\0132\035.flyteidl.core.Type"
-  "dInterface\022\'\n\006custom\030\005 \001(\0132\027.google.prot"
-  "obuf.Struct\022-\n\tcontainer\030\006 \001(\0132\030.flyteid"
-  "l.core.ContainerH\000\022(\n\007k8s_pod\030\021 \001(\0132\025.fl"
-  "yteidl.core.K8sPodH\000\022!\n\003sql\030\022 \001(\0132\022.flyt"
-  "eidl.core.SqlH\000\022\031\n\021task_type_version\030\007 \001"
-  "(\005\0228\n\020security_context\030\010 \001(\0132\036.flyteidl."
-  "core.SecurityContext\0227\n\006config\030\020 \003(\0132\'.f"
-  "lyteidl.core.TaskTemplate.ConfigEntry\032-\n"
-  "\013ConfigEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t"
-  ":\0028\001B\010\n\006target\"\'\n\rContainerPort\022\026\n\016conta"
-  "iner_port\030\001 \001(\r\"\255\003\n\tContainer\022\r\n\005image\030\001"
-  " \001(\t\022\017\n\007command\030\002 \003(\t\022\014\n\004args\030\003 \003(\t\022+\n\tr"
-  "esources\030\004 \001(\0132\030.flyteidl.core.Resources"
-  "\022(\n\003env\030\005 \003(\0132\033.flyteidl.core.KeyValuePa"
-  "ir\022/\n\006config\030\006 \003(\0132\033.flyteidl.core.KeyVa"
-  "luePairB\002\030\001\022+\n\005ports\030\007 \003(\0132\034.flyteidl.co"
-  "re.ContainerPort\0225\n\013data_config\030\t \001(\0132 ."
-  "flyteidl.core.DataLoadingConfig\022;\n\014archi"
-  "tecture\030\n \001(\0162%.flyteidl.core.Container."
-  "Architecture\"I\n\014Architecture\022\013\n\007UNKNOWN\020"
-  "\000\022\t\n\005AMD64\020\001\022\t\n\005ARM64\020\002\022\n\n\006ARM_V6\020\003\022\n\n\006A"
-  "RM_V7\020\004\"\233\002\n\nIOStrategy\022=\n\rdownload_mode\030"
-  "\001 \001(\0162&.flyteidl.core.IOStrategy.Downloa"
-  "dMode\0229\n\013upload_mode\030\002 \001(\0162$.flyteidl.co"
-  "re.IOStrategy.UploadMode\"L\n\014DownloadMode"
-  "\022\022\n\016DOWNLOAD_EAGER\020\000\022\023\n\017DOWNLOAD_STREAM\020"
-  "\001\022\023\n\017DO_NOT_DOWNLOAD\020\002\"E\n\nUploadMode\022\022\n\016"
-  "UPLOAD_ON_EXIT\020\000\022\020\n\014UPLOAD_EAGER\020\001\022\021\n\rDO"
-  "_NOT_UPLOAD\020\002\"\363\001\n\021DataLoadingConfig\022\017\n\007e"
-  "nabled\030\001 \001(\010\022\022\n\ninput_path\030\002 \001(\t\022\023\n\013outp"
-  "ut_path\030\003 \001(\t\022A\n\006format\030\004 \001(\01621.flyteidl"
-  ".core.DataLoadingConfig.LiteralMapFormat"
-  "\022.\n\013io_strategy\030\005 \001(\0132\031.flyteidl.core.IO"
-  "Strategy\"1\n\020LiteralMapFormat\022\010\n\004JSON\020\000\022\010"
-  "\n\004YAML\020\001\022\t\n\005PROTO\020\002\"\236\001\n\006K8sPod\0222\n\010metada"
-  "ta\030\001 \001(\0132 .flyteidl.core.K8sObjectMetada"
-  "ta\022)\n\010pod_spec\030\002 \001(\0132\027.google.protobuf.S"
-  "truct\0225\n\013data_config\030\003 \001(\0132 .flyteidl.co"
-  "re.DataLoadingConfig\"\374\001\n\021K8sObjectMetada"
-  "ta\022<\n\006labels\030\001 \003(\0132,.flyteidl.core.K8sOb"
-  "jectMetadata.LabelsEntry\022F\n\013annotations\030"
-  "\002 \003(\01321.flyteidl.core.K8sObjectMetadata."
-  "AnnotationsEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001"
-  " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn"
-  "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"~\n\003S"
-  "ql\022\021\n\tstatement\030\001 \001(\t\022+\n\007dialect\030\002 \001(\0162\032"
-  ".flyteidl.core.Sql.Dialect\"7\n\007Dialect\022\r\n"
-  "\tUNDEFINED\020\000\022\010\n\004ANSI\020\001\022\010\n\004HIVE\020\002\022\t\n\005OTHE"
-  "R\020\003B6Z4github.com/flyteorg/flyteidl/gen/"
-  "pb-go/flyteidl/coreb\006proto3"
+  "size\030\003 \001(\tH\000B\026\n\024partition_size_value\"a\n\020"
+  "ResourceMetadata\0228\n\017gpu_accelerator\030\001 \001("
+  "\0132\035.flyteidl.core.GPUAcceleratorH\000B\023\n\021ac"
+  "celerator_value\"\212\004\n\014TaskMetadata\022\024\n\014disc"
+  "overable\030\001 \001(\010\022/\n\007runtime\030\002 \001(\0132\036.flytei"
+  "dl.core.RuntimeMetadata\022*\n\007timeout\030\004 \001(\013"
+  "2\031.google.protobuf.Duration\022-\n\007retries\030\005"
+  " \001(\0132\034.flyteidl.core.RetryStrategy\022\031\n\021di"
+  "scovery_version\030\006 \001(\t\022 \n\030deprecated_erro"
+  "r_message\030\007 \001(\t\022\027\n\rinterruptible\030\010 \001(\010H\000"
+  "\022\032\n\022cache_serializable\030\t \001(\010\022\026\n\016generate"
+  "s_deck\030\n \001(\010\0223\n\004tags\030\013 \003(\0132%.flyteidl.co"
+  "re.TaskMetadata.TagsEntry\022\031\n\021pod_templat"
+  "e_name\030\014 \001(\t\022:\n\021resource_metadata\030\r \001(\0132"
+  "\037.flyteidl.core.ResourceMetadata\032+\n\tTags"
+  "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\025\n"
+  "\023interruptible_value\"\220\004\n\014TaskTemplate\022%\n"
+  "\002id\030\001 \001(\0132\031.flyteidl.core.Identifier\022\014\n\004"
+  "type\030\002 \001(\t\022-\n\010metadata\030\003 \001(\0132\033.flyteidl."
+  "core.TaskMetadata\0220\n\tinterface\030\004 \001(\0132\035.f"
+  "lyteidl.core.TypedInterface\022\'\n\006custom\030\005 "
+  "\001(\0132\027.google.protobuf.Struct\022-\n\tcontaine"
+  "r\030\006 \001(\0132\030.flyteidl.core.ContainerH\000\022(\n\007k"
+  "8s_pod\030\021 \001(\0132\025.flyteidl.core.K8sPodH\000\022!\n"
+  "\003sql\030\022 \001(\0132\022.flyteidl.core.SqlH\000\022\031\n\021task"
+  "_type_version\030\007 \001(\005\0228\n\020security_context\030"
+  "\010 \001(\0132\036.flyteidl.core.SecurityContext\0227\n"
+  "\006config\030\020 \003(\0132\'.flyteidl.core.TaskTempla"
+  "te.ConfigEntry\032-\n\013ConfigEntry\022\013\n\003key\030\001 \001"
+  "(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006target\"\'\n\rConta"
+  "inerPort\022\026\n\016container_port\030\001 \001(\r\"\255\003\n\tCon"
+  "tainer\022\r\n\005image\030\001 \001(\t\022\017\n\007command\030\002 \003(\t\022\014"
+  "\n\004args\030\003 \003(\t\022+\n\tresources\030\004 \001(\0132\030.flytei"
+  "dl.core.Resources\022(\n\003env\030\005 \003(\0132\033.flyteid"
+  "l.core.KeyValuePair\022/\n\006config\030\006 \003(\0132\033.fl"
+  "yteidl.core.KeyValuePairB\002\030\001\022+\n\005ports\030\007 "
+  "\003(\0132\034.flyteidl.core.ContainerPort\0225\n\013dat"
+  "a_config\030\t \001(\0132 .flyteidl.core.DataLoadi"
+  "ngConfig\022;\n\014architecture\030\n \001(\0162%.flyteid"
+  "l.core.Container.Architecture\"I\n\014Archite"
+  "cture\022\013\n\007UNKNOWN\020\000\022\t\n\005AMD64\020\001\022\t\n\005ARM64\020\002"
+  "\022\n\n\006ARM_V6\020\003\022\n\n\006ARM_V7\020\004\"\233\002\n\nIOStrategy\022"
+  "=\n\rdownload_mode\030\001 \001(\0162&.flyteidl.core.I"
+  "OStrategy.DownloadMode\0229\n\013upload_mode\030\002 "
+  "\001(\0162$.flyteidl.core.IOStrategy.UploadMod"
+  "e\"L\n\014DownloadMode\022\022\n\016DOWNLOAD_EAGER\020\000\022\023\n"
+  "\017DOWNLOAD_STREAM\020\001\022\023\n\017DO_NOT_DOWNLOAD\020\002\""
+  "E\n\nUploadMode\022\022\n\016UPLOAD_ON_EXIT\020\000\022\020\n\014UPL"
+  "OAD_EAGER\020\001\022\021\n\rDO_NOT_UPLOAD\020\002\"\363\001\n\021DataL"
+  "oadingConfig\022\017\n\007enabled\030\001 \001(\010\022\022\n\ninput_p"
+  "ath\030\002 \001(\t\022\023\n\013output_path\030\003 \001(\t\022A\n\006format"
+  "\030\004 \001(\01621.flyteidl.core.DataLoadingConfig"
+  ".LiteralMapFormat\022.\n\013io_strategy\030\005 \001(\0132\031"
+  ".flyteidl.core.IOStrategy\"1\n\020LiteralMapF"
+  "ormat\022\010\n\004JSON\020\000\022\010\n\004YAML\020\001\022\t\n\005PROTO\020\002\"\236\001\n"
+  "\006K8sPod\0222\n\010metadata\030\001 \001(\0132 .flyteidl.cor"
+  "e.K8sObjectMetadata\022)\n\010pod_spec\030\002 \001(\0132\027."
+  "google.protobuf.Struct\0225\n\013data_config\030\003 "
+  "\001(\0132 .flyteidl.core.DataLoadingConfig\"\374\001"
+  "\n\021K8sObjectMetadata\022<\n\006labels\030\001 \003(\0132,.fl"
+  "yteidl.core.K8sObjectMetadata.LabelsEntr"
+  "y\022F\n\013annotations\030\002 \003(\01321.flyteidl.core.K"
+  "8sObjectMetadata.AnnotationsEntry\032-\n\013Lab"
+  "elsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001"
+  "\0322\n\020AnnotationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val"
+  "ue\030\002 \001(\t:\0028\001\"~\n\003Sql\022\021\n\tstatement\030\001 \001(\t\022+"
+  "\n\007dialect\030\002 \001(\0162\032.flyteidl.core.Sql.Dial"
+  "ect\"7\n\007Dialect\022\r\n\tUNDEFINED\020\000\022\010\n\004ANSI\020\001\022"
+  "\010\n\004HIVE\020\002\022\t\n\005OTHER\020\003B6Z4github.com/flyte"
+  "org/flyteidl/gen/pb-go/flyteidl/coreb\006pr"
+  "oto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fcore_2ftasks_2eproto = {
   false, InitDefaults_flyteidl_2fcore_2ftasks_2eproto, 
   descriptor_table_protodef_flyteidl_2fcore_2ftasks_2eproto,
-  "flyteidl/core/tasks.proto", &assign_descriptors_table_flyteidl_2fcore_2ftasks_2eproto, 3547,
+  "flyteidl/core/tasks.proto", &assign_descriptors_table_flyteidl_2fcore_2ftasks_2eproto, 3564,
 };
 
 void AddDescriptors_flyteidl_2fcore_2ftasks_2eproto() {
@@ -2059,8 +2060,8 @@ GPUAccelerator::GPUAccelerator(const GPUAccelerator& from)
   if (from.device().size() > 0) {
     device_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.device_);
   }
-  clear_has_partition();
-  switch (from.partition_case()) {
+  clear_has_partition_size_value();
+  switch (from.partition_size_value_case()) {
     case kUnpartitioned: {
       set_unpartitioned(from.unpartitioned());
       break;
@@ -2069,7 +2070,7 @@ GPUAccelerator::GPUAccelerator(const GPUAccelerator& from)
       set_partition_size(from.partition_size());
       break;
     }
-    case PARTITION_NOT_SET: {
+    case PARTITION_SIZE_VALUE_NOT_SET: {
       break;
     }
   }
@@ -2080,7 +2081,7 @@ void GPUAccelerator::SharedCtor() {
   ::google::protobuf::internal::InitSCC(
       &scc_info_GPUAccelerator_flyteidl_2fcore_2ftasks_2eproto.base);
   device_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_partition();
+  clear_has_partition_size_value();
 }
 
 GPUAccelerator::~GPUAccelerator() {
@@ -2090,8 +2091,8 @@ GPUAccelerator::~GPUAccelerator() {
 
 void GPUAccelerator::SharedDtor() {
   device_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (has_partition()) {
-    clear_partition();
+  if (has_partition_size_value()) {
+    clear_partition_size_value();
   }
 }
 
@@ -2104,22 +2105,22 @@ const GPUAccelerator& GPUAccelerator::default_instance() {
 }
 
 
-void GPUAccelerator::clear_partition() {
+void GPUAccelerator::clear_partition_size_value() {
 // @@protoc_insertion_point(one_of_clear_start:flyteidl.core.GPUAccelerator)
-  switch (partition_case()) {
+  switch (partition_size_value_case()) {
     case kUnpartitioned: {
       // No need to clear
       break;
     }
     case kPartitionSize: {
-      partition_.partition_size_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+      partition_size_value_.partition_size_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
       break;
     }
-    case PARTITION_NOT_SET: {
+    case PARTITION_SIZE_VALUE_NOT_SET: {
       break;
     }
   }
-  _oneof_case_[0] = PARTITION_NOT_SET;
+  _oneof_case_[0] = PARTITION_SIZE_VALUE_NOT_SET;
 }
 
 
@@ -2130,7 +2131,7 @@ void GPUAccelerator::Clear() {
   (void) cached_has_bits;
 
   device_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_partition();
+  clear_partition_size_value();
   _internal_metadata_.Clear();
 }
 
@@ -2238,10 +2239,10 @@ bool GPUAccelerator::MergePartialFromCodedStream(
       // bool unpartitioned = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
-          clear_partition();
+          clear_partition_size_value();
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &partition_.unpartitioned_)));
+                 input, &partition_size_value_.unpartitioned_)));
           set_has_unpartitioned();
         } else {
           goto handle_unusual;
@@ -2384,7 +2385,7 @@ size_t GPUAccelerator::ByteSizeLong() const {
         this->device());
   }
 
-  switch (partition_case()) {
+  switch (partition_size_value_case()) {
     // bool unpartitioned = 2;
     case kUnpartitioned: {
       total_size += 1 + 1;
@@ -2397,7 +2398,7 @@ size_t GPUAccelerator::ByteSizeLong() const {
           this->partition_size());
       break;
     }
-    case PARTITION_NOT_SET: {
+    case PARTITION_SIZE_VALUE_NOT_SET: {
       break;
     }
   }
@@ -2432,7 +2433,7 @@ void GPUAccelerator::MergeFrom(const GPUAccelerator& from) {
 
     device_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.device_);
   }
-  switch (from.partition_case()) {
+  switch (from.partition_size_value_case()) {
     case kUnpartitioned: {
       set_unpartitioned(from.unpartitioned());
       break;
@@ -2441,7 +2442,7 @@ void GPUAccelerator::MergeFrom(const GPUAccelerator& from) {
       set_partition_size(from.partition_size());
       break;
     }
-    case PARTITION_NOT_SET: {
+    case PARTITION_SIZE_VALUE_NOT_SET: {
       break;
     }
   }
@@ -2474,7 +2475,7 @@ void GPUAccelerator::InternalSwap(GPUAccelerator* other) {
   _internal_metadata_.Swap(&other->_internal_metadata_);
   device_.Swap(&other->device_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
-  swap(partition_, other->partition_);
+  swap(partition_size_value_, other->partition_size_value_);
   swap(_oneof_case_[0], other->_oneof_case_[0]);
 }
 
@@ -2497,11 +2498,11 @@ class ResourceMetadata::HasBitSetters {
 
 const ::flyteidl::core::GPUAccelerator&
 ResourceMetadata::HasBitSetters::gpu_accelerator(const ResourceMetadata* msg) {
-  return *msg->accelerator_.gpu_accelerator_;
+  return *msg->accelerator_value_.gpu_accelerator_;
 }
 void ResourceMetadata::set_allocated_gpu_accelerator(::flyteidl::core::GPUAccelerator* gpu_accelerator) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  clear_accelerator();
+  clear_accelerator_value();
   if (gpu_accelerator) {
     ::google::protobuf::Arena* submessage_arena = nullptr;
     if (message_arena != submessage_arena) {
@@ -2509,7 +2510,7 @@ void ResourceMetadata::set_allocated_gpu_accelerator(::flyteidl::core::GPUAccele
           message_arena, gpu_accelerator, submessage_arena);
     }
     set_has_gpu_accelerator();
-    accelerator_.gpu_accelerator_ = gpu_accelerator;
+    accelerator_value_.gpu_accelerator_ = gpu_accelerator;
   }
   // @@protoc_insertion_point(field_set_allocated:flyteidl.core.ResourceMetadata.gpu_accelerator)
 }
@@ -2526,13 +2527,13 @@ ResourceMetadata::ResourceMetadata(const ResourceMetadata& from)
   : ::google::protobuf::Message(),
       _internal_metadata_(nullptr) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
-  clear_has_accelerator();
-  switch (from.accelerator_case()) {
+  clear_has_accelerator_value();
+  switch (from.accelerator_value_case()) {
     case kGpuAccelerator: {
       mutable_gpu_accelerator()->::flyteidl::core::GPUAccelerator::MergeFrom(from.gpu_accelerator());
       break;
     }
-    case ACCELERATOR_NOT_SET: {
+    case ACCELERATOR_VALUE_NOT_SET: {
       break;
     }
   }
@@ -2542,7 +2543,7 @@ ResourceMetadata::ResourceMetadata(const ResourceMetadata& from)
 void ResourceMetadata::SharedCtor() {
   ::google::protobuf::internal::InitSCC(
       &scc_info_ResourceMetadata_flyteidl_2fcore_2ftasks_2eproto.base);
-  clear_has_accelerator();
+  clear_has_accelerator_value();
 }
 
 ResourceMetadata::~ResourceMetadata() {
@@ -2551,8 +2552,8 @@ ResourceMetadata::~ResourceMetadata() {
 }
 
 void ResourceMetadata::SharedDtor() {
-  if (has_accelerator()) {
-    clear_accelerator();
+  if (has_accelerator_value()) {
+    clear_accelerator_value();
   }
 }
 
@@ -2565,18 +2566,18 @@ const ResourceMetadata& ResourceMetadata::default_instance() {
 }
 
 
-void ResourceMetadata::clear_accelerator() {
+void ResourceMetadata::clear_accelerator_value() {
 // @@protoc_insertion_point(one_of_clear_start:flyteidl.core.ResourceMetadata)
-  switch (accelerator_case()) {
+  switch (accelerator_value_case()) {
     case kGpuAccelerator: {
-      delete accelerator_.gpu_accelerator_;
+      delete accelerator_value_.gpu_accelerator_;
       break;
     }
-    case ACCELERATOR_NOT_SET: {
+    case ACCELERATOR_VALUE_NOT_SET: {
       break;
     }
   }
-  _oneof_case_[0] = ACCELERATOR_NOT_SET;
+  _oneof_case_[0] = ACCELERATOR_VALUE_NOT_SET;
 }
 
 
@@ -2586,7 +2587,7 @@ void ResourceMetadata::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  clear_accelerator();
+  clear_accelerator_value();
   _internal_metadata_.Clear();
 }
 
@@ -2731,15 +2732,15 @@ size_t ResourceMetadata::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  switch (accelerator_case()) {
+  switch (accelerator_value_case()) {
     // .flyteidl.core.GPUAccelerator gpu_accelerator = 1;
     case kGpuAccelerator: {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
-          *accelerator_.gpu_accelerator_);
+          *accelerator_value_.gpu_accelerator_);
       break;
     }
-    case ACCELERATOR_NOT_SET: {
+    case ACCELERATOR_VALUE_NOT_SET: {
       break;
     }
   }
@@ -2770,12 +2771,12 @@ void ResourceMetadata::MergeFrom(const ResourceMetadata& from) {
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  switch (from.accelerator_case()) {
+  switch (from.accelerator_value_case()) {
     case kGpuAccelerator: {
       mutable_gpu_accelerator()->::flyteidl::core::GPUAccelerator::MergeFrom(from.gpu_accelerator());
       break;
     }
-    case ACCELERATOR_NOT_SET: {
+    case ACCELERATOR_VALUE_NOT_SET: {
       break;
     }
   }
@@ -2806,7 +2807,7 @@ void ResourceMetadata::Swap(ResourceMetadata* other) {
 void ResourceMetadata::InternalSwap(ResourceMetadata* other) {
   using std::swap;
   _internal_metadata_.Swap(&other->_internal_metadata_);
-  swap(accelerator_, other->accelerator_);
+  swap(accelerator_value_, other->accelerator_value_);
   swap(_oneof_case_[0], other->_oneof_case_[0]);
 }
 
diff --git a/gen/pb-cpp/flyteidl/core/tasks.pb.h b/gen/pb-cpp/flyteidl/core/tasks.pb.h
index 6f7a3ad98..66c0f77a8 100644
--- a/gen/pb-cpp/flyteidl/core/tasks.pb.h
+++ b/gen/pb-cpp/flyteidl/core/tasks.pb.h
@@ -796,10 +796,10 @@ class GPUAccelerator final :
   }
   static const GPUAccelerator& default_instance();
 
-  enum PartitionCase {
+  enum PartitionSizeValueCase {
     kUnpartitioned = 2,
     kPartitionSize = 3,
-    PARTITION_NOT_SET = 0,
+    PARTITION_SIZE_VALUE_NOT_SET = 0,
   };
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -905,24 +905,24 @@ class GPUAccelerator final :
   ::std::string* release_partition_size();
   void set_allocated_partition_size(::std::string* partition_size);
 
-  void clear_partition();
-  PartitionCase partition_case() const;
+  void clear_partition_size_value();
+  PartitionSizeValueCase partition_size_value_case() const;
   // @@protoc_insertion_point(class_scope:flyteidl.core.GPUAccelerator)
  private:
   class HasBitSetters;
   void set_has_unpartitioned();
   void set_has_partition_size();
 
-  inline bool has_partition() const;
-  inline void clear_has_partition();
+  inline bool has_partition_size_value() const;
+  inline void clear_has_partition_size_value();
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::ArenaStringPtr device_;
-  union PartitionUnion {
-    PartitionUnion() {}
+  union PartitionSizeValueUnion {
+    PartitionSizeValueUnion() {}
     bool unpartitioned_;
     ::google::protobuf::internal::ArenaStringPtr partition_size_;
-  } partition_;
+  } partition_size_value_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
   ::google::protobuf::uint32 _oneof_case_[1];
 
@@ -962,9 +962,9 @@ class ResourceMetadata final :
   }
   static const ResourceMetadata& default_instance();
 
-  enum AcceleratorCase {
+  enum AcceleratorValueCase {
     kGpuAccelerator = 1,
-    ACCELERATOR_NOT_SET = 0,
+    ACCELERATOR_VALUE_NOT_SET = 0,
   };
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -1039,21 +1039,21 @@ class ResourceMetadata final :
   ::flyteidl::core::GPUAccelerator* mutable_gpu_accelerator();
   void set_allocated_gpu_accelerator(::flyteidl::core::GPUAccelerator* gpu_accelerator);
 
-  void clear_accelerator();
-  AcceleratorCase accelerator_case() const;
+  void clear_accelerator_value();
+  AcceleratorValueCase accelerator_value_case() const;
   // @@protoc_insertion_point(class_scope:flyteidl.core.ResourceMetadata)
  private:
   class HasBitSetters;
   void set_has_gpu_accelerator();
 
-  inline bool has_accelerator() const;
-  inline void clear_has_accelerator();
+  inline bool has_accelerator_value() const;
+  inline void clear_has_accelerator_value();
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  union AcceleratorUnion {
-    AcceleratorUnion() {}
+  union AcceleratorValueUnion {
+    AcceleratorValueUnion() {}
     ::flyteidl::core::GPUAccelerator* gpu_accelerator_;
-  } accelerator_;
+  } accelerator_value_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
   ::google::protobuf::uint32 _oneof_case_[1];
 
@@ -3142,133 +3142,133 @@ inline void GPUAccelerator::set_allocated_device(::std::string* device) {
 
 // bool unpartitioned = 2;
 inline bool GPUAccelerator::has_unpartitioned() const {
-  return partition_case() == kUnpartitioned;
+  return partition_size_value_case() == kUnpartitioned;
 }
 inline void GPUAccelerator::set_has_unpartitioned() {
   _oneof_case_[0] = kUnpartitioned;
 }
 inline void GPUAccelerator::clear_unpartitioned() {
   if (has_unpartitioned()) {
-    partition_.unpartitioned_ = false;
-    clear_has_partition();
+    partition_size_value_.unpartitioned_ = false;
+    clear_has_partition_size_value();
   }
 }
 inline bool GPUAccelerator::unpartitioned() const {
   // @@protoc_insertion_point(field_get:flyteidl.core.GPUAccelerator.unpartitioned)
   if (has_unpartitioned()) {
-    return partition_.unpartitioned_;
+    return partition_size_value_.unpartitioned_;
   }
   return false;
 }
 inline void GPUAccelerator::set_unpartitioned(bool value) {
   if (!has_unpartitioned()) {
-    clear_partition();
+    clear_partition_size_value();
     set_has_unpartitioned();
   }
-  partition_.unpartitioned_ = value;
+  partition_size_value_.unpartitioned_ = value;
   // @@protoc_insertion_point(field_set:flyteidl.core.GPUAccelerator.unpartitioned)
 }
 
 // string partition_size = 3;
 inline bool GPUAccelerator::has_partition_size() const {
-  return partition_case() == kPartitionSize;
+  return partition_size_value_case() == kPartitionSize;
 }
 inline void GPUAccelerator::set_has_partition_size() {
   _oneof_case_[0] = kPartitionSize;
 }
 inline void GPUAccelerator::clear_partition_size() {
   if (has_partition_size()) {
-    partition_.partition_size_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-    clear_has_partition();
+    partition_size_value_.partition_size_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    clear_has_partition_size_value();
   }
 }
 inline const ::std::string& GPUAccelerator::partition_size() const {
   // @@protoc_insertion_point(field_get:flyteidl.core.GPUAccelerator.partition_size)
   if (has_partition_size()) {
-    return partition_.partition_size_.GetNoArena();
+    return partition_size_value_.partition_size_.GetNoArena();
   }
   return *&::google::protobuf::internal::GetEmptyStringAlreadyInited();
 }
 inline void GPUAccelerator::set_partition_size(const ::std::string& value) {
   // @@protoc_insertion_point(field_set:flyteidl.core.GPUAccelerator.partition_size)
   if (!has_partition_size()) {
-    clear_partition();
+    clear_partition_size_value();
     set_has_partition_size();
-    partition_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    partition_size_value_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
-  partition_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
+  partition_size_value_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:flyteidl.core.GPUAccelerator.partition_size)
 }
 #if LANG_CXX11
 inline void GPUAccelerator::set_partition_size(::std::string&& value) {
   // @@protoc_insertion_point(field_set:flyteidl.core.GPUAccelerator.partition_size)
   if (!has_partition_size()) {
-    clear_partition();
+    clear_partition_size_value();
     set_has_partition_size();
-    partition_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    partition_size_value_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
-  partition_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  partition_size_value_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:flyteidl.core.GPUAccelerator.partition_size)
 }
 #endif
 inline void GPUAccelerator::set_partition_size(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
   if (!has_partition_size()) {
-    clear_partition();
+    clear_partition_size_value();
     set_has_partition_size();
-    partition_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    partition_size_value_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
-  partition_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+  partition_size_value_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(value));
   // @@protoc_insertion_point(field_set_char:flyteidl.core.GPUAccelerator.partition_size)
 }
 inline void GPUAccelerator::set_partition_size(const char* value, size_t size) {
   if (!has_partition_size()) {
-    clear_partition();
+    clear_partition_size_value();
     set_has_partition_size();
-    partition_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    partition_size_value_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
-  partition_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
+  partition_size_value_.partition_size_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
       reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:flyteidl.core.GPUAccelerator.partition_size)
 }
 inline ::std::string* GPUAccelerator::mutable_partition_size() {
   if (!has_partition_size()) {
-    clear_partition();
+    clear_partition_size_value();
     set_has_partition_size();
-    partition_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    partition_size_value_.partition_size_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
   // @@protoc_insertion_point(field_mutable:flyteidl.core.GPUAccelerator.partition_size)
-  return partition_.partition_size_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  return partition_size_value_.partition_size_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* GPUAccelerator::release_partition_size() {
   // @@protoc_insertion_point(field_release:flyteidl.core.GPUAccelerator.partition_size)
   if (has_partition_size()) {
-    clear_has_partition();
-    return partition_.partition_size_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    clear_has_partition_size_value();
+    return partition_size_value_.partition_size_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   } else {
     return nullptr;
   }
 }
 inline void GPUAccelerator::set_allocated_partition_size(::std::string* partition_size) {
-  if (has_partition()) {
-    clear_partition();
+  if (has_partition_size_value()) {
+    clear_partition_size_value();
   }
   if (partition_size != nullptr) {
     set_has_partition_size();
-    partition_.partition_size_.UnsafeSetDefault(partition_size);
+    partition_size_value_.partition_size_.UnsafeSetDefault(partition_size);
   }
   // @@protoc_insertion_point(field_set_allocated:flyteidl.core.GPUAccelerator.partition_size)
 }
 
-inline bool GPUAccelerator::has_partition() const {
-  return partition_case() != PARTITION_NOT_SET;
+inline bool GPUAccelerator::has_partition_size_value() const {
+  return partition_size_value_case() != PARTITION_SIZE_VALUE_NOT_SET;
 }
-inline void GPUAccelerator::clear_has_partition() {
-  _oneof_case_[0] = PARTITION_NOT_SET;
+inline void GPUAccelerator::clear_has_partition_size_value() {
+  _oneof_case_[0] = PARTITION_SIZE_VALUE_NOT_SET;
 }
-inline GPUAccelerator::PartitionCase GPUAccelerator::partition_case() const {
-  return GPUAccelerator::PartitionCase(_oneof_case_[0]);
+inline GPUAccelerator::PartitionSizeValueCase GPUAccelerator::partition_size_value_case() const {
+  return GPUAccelerator::PartitionSizeValueCase(_oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -3276,23 +3276,23 @@ inline GPUAccelerator::PartitionCase GPUAccelerator::partition_case() const {
 
 // .flyteidl.core.GPUAccelerator gpu_accelerator = 1;
 inline bool ResourceMetadata::has_gpu_accelerator() const {
-  return accelerator_case() == kGpuAccelerator;
+  return accelerator_value_case() == kGpuAccelerator;
 }
 inline void ResourceMetadata::set_has_gpu_accelerator() {
   _oneof_case_[0] = kGpuAccelerator;
 }
 inline void ResourceMetadata::clear_gpu_accelerator() {
   if (has_gpu_accelerator()) {
-    delete accelerator_.gpu_accelerator_;
-    clear_has_accelerator();
+    delete accelerator_value_.gpu_accelerator_;
+    clear_has_accelerator_value();
   }
 }
 inline ::flyteidl::core::GPUAccelerator* ResourceMetadata::release_gpu_accelerator() {
   // @@protoc_insertion_point(field_release:flyteidl.core.ResourceMetadata.gpu_accelerator)
   if (has_gpu_accelerator()) {
-    clear_has_accelerator();
-      ::flyteidl::core::GPUAccelerator* temp = accelerator_.gpu_accelerator_;
-    accelerator_.gpu_accelerator_ = nullptr;
+    clear_has_accelerator_value();
+      ::flyteidl::core::GPUAccelerator* temp = accelerator_value_.gpu_accelerator_;
+    accelerator_value_.gpu_accelerator_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -3301,28 +3301,28 @@ inline ::flyteidl::core::GPUAccelerator* ResourceMetadata::release_gpu_accelerat
 inline const ::flyteidl::core::GPUAccelerator& ResourceMetadata::gpu_accelerator() const {
   // @@protoc_insertion_point(field_get:flyteidl.core.ResourceMetadata.gpu_accelerator)
   return has_gpu_accelerator()
-      ? *accelerator_.gpu_accelerator_
+      ? *accelerator_value_.gpu_accelerator_
       : *reinterpret_cast< ::flyteidl::core::GPUAccelerator*>(&::flyteidl::core::_GPUAccelerator_default_instance_);
 }
 inline ::flyteidl::core::GPUAccelerator* ResourceMetadata::mutable_gpu_accelerator() {
   if (!has_gpu_accelerator()) {
-    clear_accelerator();
+    clear_accelerator_value();
     set_has_gpu_accelerator();
-    accelerator_.gpu_accelerator_ = CreateMaybeMessage< ::flyteidl::core::GPUAccelerator >(
+    accelerator_value_.gpu_accelerator_ = CreateMaybeMessage< ::flyteidl::core::GPUAccelerator >(
         GetArenaNoVirtual());
   }
   // @@protoc_insertion_point(field_mutable:flyteidl.core.ResourceMetadata.gpu_accelerator)
-  return accelerator_.gpu_accelerator_;
+  return accelerator_value_.gpu_accelerator_;
 }
 
-inline bool ResourceMetadata::has_accelerator() const {
-  return accelerator_case() != ACCELERATOR_NOT_SET;
+inline bool ResourceMetadata::has_accelerator_value() const {
+  return accelerator_value_case() != ACCELERATOR_VALUE_NOT_SET;
 }
-inline void ResourceMetadata::clear_has_accelerator() {
-  _oneof_case_[0] = ACCELERATOR_NOT_SET;
+inline void ResourceMetadata::clear_has_accelerator_value() {
+  _oneof_case_[0] = ACCELERATOR_VALUE_NOT_SET;
 }
-inline ResourceMetadata::AcceleratorCase ResourceMetadata::accelerator_case() const {
-  return ResourceMetadata::AcceleratorCase(_oneof_case_[0]);
+inline ResourceMetadata::AcceleratorValueCase ResourceMetadata::accelerator_value_case() const {
+  return ResourceMetadata::AcceleratorValueCase(_oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
diff --git a/gen/pb-go/flyteidl/core/tasks.pb.go b/gen/pb-go/flyteidl/core/tasks.pb.go
index 577313b89..0622cf629 100644
--- a/gen/pb-go/flyteidl/core/tasks.pb.go
+++ b/gen/pb-go/flyteidl/core/tasks.pb.go
@@ -419,13 +419,13 @@ func (m *RuntimeMetadata) GetFlavor() string {
 // Metadata associated with the GPU accelerator to allocate to a task
 type GPUAccelerator struct {
 	Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"`
-	// Types that are valid to be assigned to Partition:
+	// Types that are valid to be assigned to PartitionSizeValue:
 	//	*GPUAccelerator_Unpartitioned
 	//	*GPUAccelerator_PartitionSize
-	Partition            isGPUAccelerator_Partition `protobuf_oneof:"partition"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     []byte                     `json:"-"`
-	XXX_sizecache        int32                      `json:"-"`
+	PartitionSizeValue   isGPUAccelerator_PartitionSizeValue `protobuf_oneof:"partition_size_value"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
 }
 
 func (m *GPUAccelerator) Reset()         { *m = GPUAccelerator{} }
@@ -460,8 +460,8 @@ func (m *GPUAccelerator) GetDevice() string {
 	return ""
 }
 
-type isGPUAccelerator_Partition interface {
-	isGPUAccelerator_Partition()
+type isGPUAccelerator_PartitionSizeValue interface {
+	isGPUAccelerator_PartitionSizeValue()
 }
 
 type GPUAccelerator_Unpartitioned struct {
@@ -472,26 +472,26 @@ type GPUAccelerator_PartitionSize struct {
 	PartitionSize string `protobuf:"bytes,3,opt,name=partition_size,json=partitionSize,proto3,oneof"`
 }
 
-func (*GPUAccelerator_Unpartitioned) isGPUAccelerator_Partition() {}
+func (*GPUAccelerator_Unpartitioned) isGPUAccelerator_PartitionSizeValue() {}
 
-func (*GPUAccelerator_PartitionSize) isGPUAccelerator_Partition() {}
+func (*GPUAccelerator_PartitionSize) isGPUAccelerator_PartitionSizeValue() {}
 
-func (m *GPUAccelerator) GetPartition() isGPUAccelerator_Partition {
+func (m *GPUAccelerator) GetPartitionSizeValue() isGPUAccelerator_PartitionSizeValue {
 	if m != nil {
-		return m.Partition
+		return m.PartitionSizeValue
 	}
 	return nil
 }
 
 func (m *GPUAccelerator) GetUnpartitioned() bool {
-	if x, ok := m.GetPartition().(*GPUAccelerator_Unpartitioned); ok {
+	if x, ok := m.GetPartitionSizeValue().(*GPUAccelerator_Unpartitioned); ok {
 		return x.Unpartitioned
 	}
 	return false
 }
 
 func (m *GPUAccelerator) GetPartitionSize() string {
-	if x, ok := m.GetPartition().(*GPUAccelerator_PartitionSize); ok {
+	if x, ok := m.GetPartitionSizeValue().(*GPUAccelerator_PartitionSize); ok {
 		return x.PartitionSize
 	}
 	return ""
@@ -507,12 +507,12 @@ func (*GPUAccelerator) XXX_OneofWrappers() []interface{} {
 
 // Additional metadata associated with resources to allocate to a task
 type ResourceMetadata struct {
-	// Types that are valid to be assigned to Accelerator:
+	// Types that are valid to be assigned to AcceleratorValue:
 	//	*ResourceMetadata_GpuAccelerator
-	Accelerator          isResourceMetadata_Accelerator `protobuf_oneof:"accelerator"`
-	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
-	XXX_unrecognized     []byte                         `json:"-"`
-	XXX_sizecache        int32                          `json:"-"`
+	AcceleratorValue     isResourceMetadata_AcceleratorValue `protobuf_oneof:"accelerator_value"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
 }
 
 func (m *ResourceMetadata) Reset()         { *m = ResourceMetadata{} }
@@ -540,25 +540,25 @@ func (m *ResourceMetadata) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ResourceMetadata proto.InternalMessageInfo
 
-type isResourceMetadata_Accelerator interface {
-	isResourceMetadata_Accelerator()
+type isResourceMetadata_AcceleratorValue interface {
+	isResourceMetadata_AcceleratorValue()
 }
 
 type ResourceMetadata_GpuAccelerator struct {
 	GpuAccelerator *GPUAccelerator `protobuf:"bytes,1,opt,name=gpu_accelerator,json=gpuAccelerator,proto3,oneof"`
 }
 
-func (*ResourceMetadata_GpuAccelerator) isResourceMetadata_Accelerator() {}
+func (*ResourceMetadata_GpuAccelerator) isResourceMetadata_AcceleratorValue() {}
 
-func (m *ResourceMetadata) GetAccelerator() isResourceMetadata_Accelerator {
+func (m *ResourceMetadata) GetAcceleratorValue() isResourceMetadata_AcceleratorValue {
 	if m != nil {
-		return m.Accelerator
+		return m.AcceleratorValue
 	}
 	return nil
 }
 
 func (m *ResourceMetadata) GetGpuAccelerator() *GPUAccelerator {
-	if x, ok := m.GetAccelerator().(*ResourceMetadata_GpuAccelerator); ok {
+	if x, ok := m.GetAcceleratorValue().(*ResourceMetadata_GpuAccelerator); ok {
 		return x.GpuAccelerator
 	}
 	return nil
@@ -1426,117 +1426,117 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/core/tasks.proto", fileDescriptor_bd8423ba58d6ed80) }
 
 var fileDescriptor_bd8423ba58d6ed80 = []byte{
-	// 1785 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xdd, 0x72, 0x1b, 0x49,
-	0x15, 0xb6, 0x24, 0x5b, 0xb2, 0x8e, 0x24, 0x7b, 0xd4, 0x4b, 0x96, 0x89, 0x49, 0xb2, 0xa9, 0x29,
-	0x36, 0x09, 0x0b, 0x91, 0x88, 0x37, 0xe5, 0x78, 0x17, 0x2a, 0x94, 0x1c, 0x29, 0x91, 0xb0, 0xfe,
-	0xaa, 0x25, 0x67, 0x09, 0x55, 0xd4, 0xd0, 0x9e, 0x69, 0x8f, 0x07, 0x8f, 0xa6, 0x27, 0x3d, 0x3d,
-	0x06, 0xe5, 0x1e, 0x1e, 0x80, 0x97, 0xa0, 0xa8, 0xe2, 0x96, 0x4b, 0xae, 0x78, 0x01, 0x1e, 0x88,
-	0x8b, 0xad, 0xee, 0xf9, 0xd1, 0x8f, 0xed, 0x75, 0xf9, 0x6a, 0xba, 0xcf, 0xf9, 0xce, 0xe9, 0x3e,
-	0xa7, 0xcf, 0xdf, 0xc0, 0xfd, 0x33, 0x6f, 0x2e, 0xa8, 0x6b, 0x7b, 0x4d, 0x8b, 0x71, 0xda, 0x14,
-	0x24, 0xbc, 0x08, 0x1b, 0x01, 0x67, 0x82, 0xa1, 0x5a, 0xca, 0x6a, 0x48, 0xd6, 0xde, 0xa3, 0x55,
-	0xa4, 0x6b, 0x53, 0x5f, 0xb8, 0x67, 0x2e, 0xe5, 0x31, 0x7c, 0xef, 0xe1, 0x1a, 0xdf, 0x17, 0x94,
-	0x9f, 0x11, 0x8b, 0x26, 0xec, 0x07, 0xab, 0x6c, 0xcf, 0x15, 0x94, 0x13, 0x2f, 0xbc, 0x9e, 0x1b,
-	0x52, 0x2b, 0xe2, 0xae, 0x98, 0x27, 0xdc, 0x47, 0x0e, 0x63, 0x8e, 0x47, 0x9b, 0x6a, 0x77, 0x1a,
-	0x9d, 0x35, 0xed, 0x88, 0x13, 0xe1, 0x32, 0x3f, 0x95, 0x5e, 0xe7, 0x87, 0x82, 0x47, 0x96, 0x88,
-	0xb9, 0xc6, 0xff, 0xf2, 0x50, 0xc6, 0x34, 0x64, 0x11, 0xb7, 0x68, 0x88, 0x8e, 0x60, 0x9b, 0xd3,
-	0x8f, 0x11, 0x0d, 0x45, 0xa8, 0xe7, 0x1e, 0x17, 0x9e, 0x55, 0xf6, 0x9f, 0x34, 0x56, 0x0c, 0x6d,
-	0x64, 0xd8, 0x6c, 0xd5, 0xf1, 0x05, 0x9f, 0xe3, 0x4c, 0x0e, 0xbd, 0x86, 0xa2, 0xe7, 0xce, 0x5c,
-	0x11, 0xea, 0xf9, 0x3b, 0x69, 0x48, 0xa4, 0xf6, 0xfe, 0x08, 0xb5, 0x15, 0x06, 0xfa, 0x06, 0x36,
-	0x7d, 0x32, 0xa3, 0x7a, 0xee, 0x71, 0xee, 0xd9, 0xce, 0xfe, 0x97, 0xb7, 0xaa, 0x1b, 0x92, 0x19,
-	0xc5, 0x4a, 0x04, 0xfd, 0x08, 0xb6, 0x2e, 0x89, 0x17, 0x51, 0x3d, 0xff, 0x38, 0xf7, 0xac, 0x8c,
-	0xe3, 0x8d, 0xf1, 0x07, 0xa8, 0x2e, 0x63, 0x51, 0x05, 0x4a, 0x27, 0xc3, 0xe3, 0xe1, 0xe8, 0xbb,
-	0xa1, 0xb6, 0x81, 0x4a, 0x50, 0x78, 0x33, 0x3e, 0xd1, 0x72, 0x72, 0xf1, 0x6e, 0x7c, 0xa2, 0xe5,
-	0x11, 0x40, 0x71, 0xd0, 0x19, 0x8c, 0xf0, 0x07, 0xad, 0x20, 0xa1, 0x93, 0xe9, 0x08, 0xb7, 0xde,
-	0x75, 0xb4, 0x4d, 0x74, 0x0f, 0xea, 0x9d, 0x71, 0xb7, 0x33, 0xe8, 0xe0, 0x56, 0xdf, 0x4c, 0xc9,
-	0x5b, 0xc6, 0xbf, 0x72, 0xb0, 0x8b, 0x23, 0x5f, 0xb8, 0x33, 0x3a, 0xa0, 0x82, 0xd8, 0x44, 0x10,
-	0xf4, 0x1a, 0x36, 0xc5, 0x3c, 0x48, 0x6d, 0xf8, 0x6a, 0xdd, 0x86, 0x55, 0x74, 0xba, 0x9f, 0xce,
-	0x03, 0x8a, 0x95, 0x1c, 0xd2, 0xa1, 0x74, 0x49, 0x79, 0xe8, 0x32, 0x3f, 0x31, 0x25, 0xdd, 0xa2,
-	0xcf, 0xa1, 0x78, 0xe6, 0x91, 0x4b, 0xc6, 0xf5, 0x82, 0x62, 0x24, 0x3b, 0xe3, 0x29, 0x54, 0x96,
-	0xd4, 0xa0, 0x32, 0x6c, 0x8d, 0xa6, 0xdd, 0x0e, 0xd6, 0x36, 0x50, 0x0d, 0xca, 0x6f, 0xfb, 0x1f,
-	0xa6, 0x1d, 0x73, 0xd2, 0x3e, 0xd6, 0x72, 0xc6, 0xdf, 0x72, 0xb0, 0xf3, 0x6e, 0x7c, 0xd2, 0xb2,
-	0x2c, 0xea, 0x51, 0x4e, 0x04, 0xe3, 0x52, 0xa7, 0x4d, 0x2f, 0x5d, 0x2b, 0xbe, 0x6f, 0x19, 0x27,
-	0x3b, 0xf4, 0x04, 0x6a, 0x91, 0x1f, 0x10, 0x2e, 0x5c, 0x19, 0x5f, 0xd4, 0x56, 0x77, 0xd9, 0xee,
-	0x6e, 0xe0, 0x55, 0x32, 0x7a, 0x0a, 0x3b, 0xd9, 0xd6, 0x0c, 0xdd, 0x4f, 0x34, 0xbe, 0x9b, 0x04,
-	0x66, 0xf4, 0x89, 0xfb, 0x89, 0x1e, 0x55, 0xa0, 0x9c, 0x11, 0x8c, 0x0b, 0xd0, 0xd2, 0x67, 0xc9,
-	0xfc, 0xd6, 0x85, 0x5d, 0x27, 0x88, 0x4c, 0xb2, 0xb8, 0x9c, 0xba, 0x52, 0x65, 0xff, 0xe1, 0x9a,
-	0x0b, 0x57, 0x2d, 0xe8, 0x6e, 0xe0, 0x1d, 0x27, 0x88, 0x96, 0x28, 0x47, 0x35, 0xa8, 0x2c, 0x69,
-	0x31, 0xfe, 0xbb, 0x05, 0xd5, 0x29, 0x09, 0x2f, 0xb2, 0x93, 0x0c, 0xa8, 0xda, 0x6e, 0x68, 0xb1,
-	0x4b, 0xca, 0xc9, 0xa9, 0x17, 0x5b, 0xbe, 0x8d, 0x57, 0x68, 0xe8, 0x10, 0x4a, 0x3c, 0xf6, 0xa9,
-	0xb2, 0xbc, 0xb2, 0xff, 0xe8, 0x87, 0x1f, 0x12, 0xa7, 0x70, 0xf4, 0x35, 0x94, 0xe4, 0x97, 0x45,
-	0x42, 0xdf, 0x54, 0x92, 0xf7, 0x1b, 0x71, 0x5a, 0x36, 0xd2, 0xb4, 0x6c, 0xb4, 0x93, 0xb4, 0xc5,
-	0x29, 0x12, 0x1d, 0x40, 0x89, 0x53, 0xc1, 0x5d, 0x1a, 0xea, 0x5b, 0x4a, 0xe8, 0xc1, 0x95, 0xd8,
-	0x17, 0x7c, 0x3e, 0x11, 0x9c, 0x08, 0xea, 0xcc, 0x71, 0x0a, 0x46, 0x3f, 0x87, 0x7a, 0x7a, 0xed,
-	0xb9, 0x99, 0x86, 0x4d, 0x51, 0xbd, 0xa4, 0x96, 0x31, 0xde, 0x27, 0xf1, 0x73, 0x08, 0xba, 0x4d,
-	0x03, 0x4e, 0x2d, 0x22, 0xa8, 0x6d, 0x52, 0xce, 0x19, 0x37, 0x67, 0x34, 0x0c, 0x89, 0x43, 0xf5,
-	0x92, 0x92, 0xf9, 0x7c, 0xc1, 0xef, 0x48, 0xf6, 0x20, 0xe6, 0xca, 0x68, 0x50, 0x75, 0x8c, 0x47,
-	0x81, 0x70, 0xa5, 0xcb, 0xb6, 0xd3, 0x68, 0x58, 0x21, 0xa3, 0xe7, 0x80, 0x2c, 0x62, 0x9d, 0x53,
-	0x33, 0xa4, 0xdc, 0x25, 0x9e, 0xfb, 0x49, 0xf9, 0xb7, 0xac, 0xfc, 0x5b, 0x57, 0x9c, 0xc9, 0x12,
-	0x03, 0x7d, 0x09, 0x3b, 0x0e, 0xf5, 0xe5, 0x33, 0xd1, 0xd0, 0xb4, 0xa9, 0x75, 0xa1, 0x83, 0x82,
-	0xd6, 0x32, 0x6a, 0x9b, 0x5a, 0x17, 0xb2, 0x2a, 0x08, 0xe2, 0x84, 0x7a, 0x45, 0x15, 0x99, 0xf5,
-	0xaa, 0xb0, 0xfc, 0xb4, 0x8d, 0x29, 0x71, 0xc2, 0xb8, 0xc6, 0x28, 0x11, 0xf4, 0x15, 0xd4, 0x03,
-	0x66, 0x9b, 0x82, 0xce, 0x02, 0x8f, 0x08, 0x6a, 0xaa, 0xea, 0x52, 0x55, 0xb6, 0xee, 0x06, 0xcc,
-	0x9e, 0x26, 0x74, 0x55, 0x1b, 0xfa, 0x50, 0xe7, 0x49, 0x50, 0x9a, 0xb3, 0x44, 0xa1, 0x5e, 0x53,
-	0xaf, 0xf1, 0xc5, 0x0d, 0x95, 0x28, 0x7b, 0x7d, 0x8d, 0xaf, 0x51, 0xf6, 0x5e, 0x41, 0x39, 0xbb,
-	0x0c, 0xd2, 0xa0, 0x70, 0x41, 0xe7, 0x49, 0x8a, 0xc9, 0xe5, 0xf5, 0xe5, 0xea, 0xdb, 0xfc, 0x61,
-	0xee, 0xe8, 0x1e, 0x7c, 0xb6, 0xe2, 0x54, 0x33, 0xae, 0x64, 0x7f, 0x4d, 0xa2, 0x38, 0xbd, 0x32,
-	0xfa, 0x19, 0xe4, 0x5d, 0x3b, 0x49, 0x91, 0xfb, 0x6b, 0xf7, 0xeb, 0x65, 0x4d, 0x09, 0xe7, 0x5d,
-	0x1b, 0xa1, 0xa4, 0x24, 0xc5, 0x67, 0xc5, 0x65, 0xe6, 0x15, 0x6c, 0x67, 0x46, 0x16, 0x94, 0x92,
-	0x9f, 0xfc, 0x80, 0x63, 0x71, 0x06, 0x46, 0xbf, 0x82, 0x72, 0xd6, 0xd3, 0x92, 0x08, 0x5f, 0xcf,
-	0x50, 0x59, 0x86, 0xec, 0x5e, 0x0a, 0xc2, 0x0b, 0x3c, 0x6a, 0x42, 0xd1, 0x8a, 0x42, 0xc1, 0x66,
-	0x49, 0x98, 0xff, 0xf8, 0x4a, 0x6e, 0x4c, 0x54, 0xcb, 0xc2, 0x09, 0x0c, 0x1d, 0x42, 0xd9, 0x62,
-	0xbe, 0x20, 0xae, 0x4f, 0xb9, 0x0a, 0xec, 0xca, 0xbe, 0xbe, 0x76, 0xda, 0x9b, 0x94, 0xdf, 0xdd,
-	0xc0, 0x0b, 0x30, 0xfa, 0x25, 0x94, 0x2e, 0x0e, 0x43, 0x33, 0x60, 0xb6, 0x5e, 0x57, 0x72, 0xf7,
-	0xd6, 0xe4, 0x8e, 0x0f, 0xc3, 0x31, 0xb3, 0xbb, 0x1b, 0xb8, 0x78, 0xa1, 0x56, 0xe8, 0x09, 0x14,
-	0xc2, 0x8f, 0x9e, 0x8e, 0x14, 0x1a, 0xad, 0xa1, 0x27, 0x1f, 0xbd, 0xee, 0x06, 0x96, 0x00, 0x19,
-	0x54, 0x72, 0x3e, 0x30, 0xa5, 0x1f, 0xb3, 0xa4, 0x93, 0x09, 0xb4, 0x85, 0x77, 0x25, 0x43, 0x9a,
-	0x9f, 0xe6, 0x5c, 0x0f, 0xb4, 0xb4, 0x89, 0x9b, 0xf2, 0x6e, 0xf4, 0x2f, 0x42, 0x25, 0xcf, 0xd5,
-	0x82, 0x32, 0x49, 0x60, 0x6f, 0x62, 0x14, 0xde, 0x0d, 0x57, 0x09, 0xe8, 0x37, 0x50, 0xb4, 0x98,
-	0x7f, 0xe6, 0x3a, 0xba, 0xa6, 0x12, 0xe1, 0xe9, 0x35, 0xef, 0x95, 0x46, 0x87, 0x74, 0xca, 0x99,
-	0xeb, 0x24, 0xed, 0x36, 0x16, 0xdb, 0xfb, 0x06, 0x2a, 0x4b, 0xe4, 0x3b, 0x05, 0xe5, 0x36, 0x14,
-	0x05, 0xe1, 0x0e, 0x15, 0xc6, 0x01, 0xd4, 0x32, 0x87, 0x8f, 0x19, 0x17, 0x32, 0x89, 0x33, 0xa7,
-	0x9b, 0x01, 0xe3, 0x42, 0x69, 0xac, 0xe1, 0x9a, 0xb5, 0x0c, 0x33, 0xfe, 0x5f, 0x80, 0x72, 0x26,
-	0x28, 0x4f, 0x72, 0x67, 0xb2, 0xee, 0xc4, 0xa7, 0xc7, 0x1b, 0xd9, 0xfa, 0x2c, 0x36, 0x9b, 0x11,
-	0xdf, 0x56, 0x03, 0x45, 0x19, 0xa7, 0x5b, 0x19, 0xc1, 0x84, 0x3b, 0xa1, 0x5e, 0x50, 0x64, 0xb5,
-	0x46, 0x07, 0x50, 0x4e, 0xb3, 0x2e, 0x4c, 0x02, 0x51, 0xbf, 0x69, 0x62, 0xc0, 0x0b, 0x28, 0x7a,
-	0x0e, 0x05, 0xea, 0x5f, 0xea, 0x5b, 0xca, 0x89, 0xeb, 0x41, 0x7f, 0x4c, 0xe7, 0xef, 0xa5, 0xd5,
-	0x63, 0xe2, 0x72, 0x2c, 0x71, 0xe8, 0x55, 0xe6, 0xf6, 0xe2, 0xad, 0x12, 0x47, 0x79, 0x3d, 0x97,
-	0xba, 0x1b, 0xed, 0xc3, 0x96, 0x74, 0x47, 0xa8, 0x97, 0x94, 0xdc, 0x83, 0x9b, 0xc2, 0x56, 0xba,
-	0x07, 0xc7, 0x50, 0xd4, 0x82, 0x8a, 0x4c, 0x32, 0x33, 0x39, 0xb1, 0xac, 0xac, 0x7a, 0xbc, 0x26,
-	0xd9, 0x26, 0x82, 0xf4, 0x19, 0xb1, 0x5d, 0xdf, 0x89, 0xdf, 0x13, 0x83, 0x14, 0x8a, 0xd7, 0xa8,
-	0x07, 0x55, 0xc2, 0xad, 0x73, 0x57, 0x50, 0x4b, 0x44, 0x9c, 0xaa, 0x92, 0x7a, 0x75, 0x96, 0xca,
-	0x4e, 0x6f, 0xb4, 0x96, 0xc0, 0x78, 0x45, 0xd4, 0xe8, 0x41, 0x75, 0x99, 0xbb, 0x3a, 0x3d, 0x95,
-	0x61, 0xab, 0x35, 0x68, 0x1f, 0xbc, 0xd4, 0x72, 0x6a, 0x89, 0x07, 0x07, 0x2f, 0xe3, 0x09, 0xaa,
-	0x85, 0x07, 0xe6, 0xfb, 0x03, 0xad, 0x90, 0xad, 0x5f, 0x69, 0x9b, 0xc6, 0xbf, 0xf3, 0x00, 0xbd,
-	0x51, 0xda, 0xc0, 0xd0, 0x31, 0xd4, 0x6c, 0xf6, 0x67, 0xdf, 0x63, 0xc4, 0x36, 0x67, 0xcc, 0x4e,
-	0xa7, 0xa5, 0xf5, 0x01, 0x72, 0x21, 0xd1, 0x68, 0x27, 0xf0, 0x01, 0xb3, 0x29, 0xae, 0xda, 0x4b,
-	0x3b, 0xd4, 0x81, 0x4a, 0x14, 0x2c, 0x54, 0xe5, 0x95, 0xaa, 0x9f, 0xde, 0xac, 0xea, 0x24, 0xc8,
-	0x14, 0x41, 0x94, 0xad, 0x8d, 0x3e, 0x54, 0x97, 0x0f, 0x41, 0x08, 0x76, 0xda, 0xa3, 0xef, 0x86,
-	0xfd, 0x51, 0xab, 0x6d, 0x76, 0x5a, 0xef, 0xd4, 0x40, 0xf5, 0x19, 0xec, 0x66, 0xb4, 0xc9, 0x14,
-	0x77, 0x5a, 0x03, 0x2d, 0x17, 0x13, 0xcd, 0xe1, 0x68, 0x6a, 0xa6, 0x3c, 0x2d, 0x6f, 0x74, 0x00,
-	0x16, 0xe7, 0x48, 0x5d, 0x27, 0x63, 0x25, 0x35, 0x1a, 0x9a, 0x9d, 0xdf, 0xf5, 0xa6, 0xda, 0x06,
-	0xd2, 0xa0, 0x9a, 0xd0, 0x62, 0xed, 0x39, 0x54, 0x87, 0x5a, 0xa2, 0x28, 0x66, 0x68, 0x79, 0xe3,
-	0x1f, 0x79, 0xa8, 0x5f, 0x79, 0x6f, 0x99, 0x28, 0xd4, 0x97, 0x2d, 0xd4, 0x4e, 0x86, 0x97, 0x74,
-	0x8b, 0x1e, 0x02, 0xb8, 0x7e, 0x10, 0x09, 0x33, 0x20, 0xe2, 0x3c, 0xc9, 0xe3, 0xb2, 0xa2, 0x8c,
-	0x89, 0x38, 0x47, 0x5f, 0x40, 0x85, 0x45, 0x22, 0xe3, 0xc7, 0x73, 0x24, 0xc4, 0x24, 0x05, 0xe8,
-	0x41, 0xf1, 0x8c, 0xf1, 0x19, 0x89, 0x87, 0x97, 0x9d, 0xfd, 0x17, 0xb7, 0xc5, 0x5e, 0xa3, 0x1f,
-	0xff, 0xc1, 0x0c, 0x48, 0xf0, 0x56, 0x09, 0xe2, 0x44, 0x01, 0xfa, 0x16, 0x2a, 0x2e, 0x33, 0xc3,
-	0xc4, 0xeb, 0x49, 0xc1, 0xbf, 0x7f, 0xe3, 0xb3, 0x60, 0x70, 0x59, 0xba, 0x36, 0x5e, 0x80, 0xb6,
-	0xae, 0x17, 0x6d, 0xc3, 0xe6, 0x6f, 0x27, 0x23, 0x19, 0x7a, 0xdb, 0xb0, 0xf9, 0xa1, 0x35, 0xe8,
-	0xc7, 0x91, 0x37, 0xc6, 0xa3, 0xe9, 0x48, 0xcb, 0x1b, 0xff, 0xc9, 0x41, 0x31, 0x2e, 0xe9, 0xe8,
-	0xd7, 0x4b, 0xbd, 0x2d, 0x77, 0x6d, 0x0a, 0x1d, 0x1f, 0x86, 0xa3, 0xd3, 0x3f, 0x51, 0x4b, 0x5c,
-	0xd3, 0xe0, 0xf6, 0x61, 0x5b, 0xce, 0x0c, 0x61, 0x40, 0xad, 0x64, 0xf6, 0xbb, 0xb1, 0x4b, 0x95,
-	0x02, 0x66, 0x4f, 0x02, 0x6a, 0xad, 0xe7, 0x6d, 0xe1, 0xee, 0x79, 0x6b, 0xfc, 0x33, 0x0f, 0xf5,
-	0x2b, 0xd7, 0x42, 0x6d, 0x28, 0x7a, 0xe4, 0x94, 0x7a, 0xe9, 0x4f, 0xda, 0x2f, 0x6e, 0x33, 0xa4,
-	0xd1, 0x57, 0xf0, 0xf4, 0x47, 0x4b, 0x6d, 0xd0, 0x04, 0x2a, 0xc4, 0xf7, 0x99, 0x50, 0x53, 0x67,
-	0xfa, 0xb7, 0xf6, 0xe2, 0x56, 0x55, 0xad, 0x85, 0x4c, 0xac, 0x6f, 0x59, 0x8b, 0x6c, 0x27, 0x4b,
-	0x67, 0xdd, 0xa5, 0x9d, 0xec, 0xbd, 0x06, 0x6d, 0x5d, 0xf7, 0x5d, 0xe4, 0x8d, 0xbf, 0xe7, 0xa0,
-	0x30, 0xf9, 0xe8, 0xa1, 0x07, 0x50, 0x0e, 0x05, 0x11, 0x74, 0x46, 0x7d, 0x91, 0x48, 0x2e, 0x08,
-	0xe8, 0x25, 0x94, 0x6c, 0x97, 0x78, 0xd4, 0x12, 0x49, 0x4d, 0xd8, 0xbb, 0xda, 0xd3, 0x1b, 0xed,
-	0x18, 0x81, 0x53, 0xa8, 0xf1, 0x0a, 0x4a, 0x09, 0x4d, 0xfe, 0x3e, 0x9d, 0x0c, 0xdb, 0x9d, 0xb7,
-	0xbd, 0x61, 0xa7, 0x1d, 0x87, 0x5d, 0x6b, 0x38, 0xe9, 0x69, 0x39, 0xb9, 0xea, 0xf6, 0xde, 0x77,
-	0xb4, 0xfc, 0xe2, 0x67, 0xab, 0x70, 0x74, 0xf0, 0xfb, 0x97, 0x8e, 0x2b, 0xce, 0xa3, 0xd3, 0x86,
-	0xc5, 0x66, 0x4d, 0x75, 0x12, 0xe3, 0x4e, 0x33, 0xfb, 0xa3, 0x77, 0xa8, 0xdf, 0x0c, 0x4e, 0x9f,
-	0x3b, 0xac, 0xb9, 0xf2, 0x93, 0x7f, 0x5a, 0x54, 0x51, 0xf5, 0xf5, 0xf7, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0xd6, 0x87, 0x8f, 0x22, 0x83, 0x10, 0x00, 0x00,
+	// 1787 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xdd, 0x72, 0xdb, 0xb8,
+	0x15, 0xb6, 0x24, 0x5b, 0xb2, 0x8e, 0x2c, 0x9b, 0x42, 0x36, 0x29, 0xe3, 0x26, 0xd9, 0x8c, 0xa6,
+	0x9b, 0xa4, 0xdb, 0x46, 0x6e, 0xbc, 0x19, 0xc7, 0xbb, 0xed, 0xa4, 0x23, 0x47, 0x4a, 0xac, 0x5a,
+	0x7f, 0x03, 0xc9, 0xd9, 0xa6, 0x33, 0x1d, 0x16, 0x26, 0x61, 0x9a, 0x35, 0x45, 0xd0, 0x20, 0xe8,
+	0x56, 0xb9, 0xef, 0x03, 0xb4, 0x2f, 0xd1, 0xe9, 0x4c, 0x6f, 0x7b, 0xd9, 0xab, 0xbe, 0x40, 0x1f,
+	0xa8, 0x17, 0x1d, 0x80, 0x20, 0xf5, 0x63, 0x7b, 0x3d, 0xbe, 0x22, 0x70, 0xce, 0x77, 0x0e, 0x80,
+	0xf3, 0x4f, 0x78, 0x78, 0xea, 0x4f, 0x05, 0xf5, 0x1c, 0x7f, 0xc7, 0x66, 0x9c, 0xee, 0x08, 0x12,
+	0x9d, 0x47, 0x8d, 0x90, 0x33, 0xc1, 0x50, 0x35, 0x65, 0x35, 0x24, 0x6b, 0xfb, 0xc9, 0x22, 0xd2,
+	0x73, 0x68, 0x20, 0xbc, 0x53, 0x8f, 0xf2, 0x04, 0xbe, 0xfd, 0x78, 0x89, 0x1f, 0x08, 0xca, 0x4f,
+	0x89, 0x4d, 0x35, 0xfb, 0xd1, 0x22, 0xdb, 0xf7, 0x04, 0xe5, 0xc4, 0x8f, 0xae, 0xe7, 0x46, 0xd4,
+	0x8e, 0xb9, 0x27, 0xa6, 0x9a, 0xfb, 0xc4, 0x65, 0xcc, 0xf5, 0xe9, 0x8e, 0xda, 0x9d, 0xc4, 0xa7,
+	0x3b, 0x4e, 0xcc, 0x89, 0xf0, 0x58, 0x90, 0x4a, 0x2f, 0xf3, 0x23, 0xc1, 0x63, 0x5b, 0x24, 0xdc,
+	0xfa, 0x7f, 0xf3, 0x50, 0xc6, 0x34, 0x62, 0x31, 0xb7, 0x69, 0x84, 0x0e, 0x60, 0x9d, 0xd3, 0x8b,
+	0x98, 0x46, 0x22, 0x32, 0x73, 0x4f, 0x0b, 0x2f, 0x2a, 0xbb, 0xcf, 0x1a, 0x0b, 0x0f, 0x6d, 0x64,
+	0xd8, 0x6c, 0xd5, 0x0e, 0x04, 0x9f, 0xe2, 0x4c, 0x0e, 0xbd, 0x85, 0xa2, 0xef, 0x4d, 0x3c, 0x11,
+	0x99, 0xf9, 0x3b, 0x69, 0xd0, 0x52, 0xdb, 0x7f, 0x80, 0xea, 0x02, 0x03, 0x7d, 0x0b, 0xab, 0x01,
+	0x99, 0x50, 0x33, 0xf7, 0x34, 0xf7, 0x62, 0x73, 0xf7, 0xab, 0x5b, 0xd5, 0xf5, 0xc9, 0x84, 0x62,
+	0x25, 0x82, 0xbe, 0x80, 0xb5, 0x4b, 0xe2, 0xc7, 0xd4, 0xcc, 0x3f, 0xcd, 0xbd, 0x28, 0xe3, 0x64,
+	0x53, 0xff, 0x3d, 0x6c, 0xcc, 0x63, 0x51, 0x05, 0x4a, 0xc7, 0xfd, 0xa3, 0xfe, 0xe0, 0xfb, 0xbe,
+	0xb1, 0x82, 0x4a, 0x50, 0x78, 0x37, 0x3c, 0x36, 0x72, 0x72, 0xf1, 0x61, 0x78, 0x6c, 0xe4, 0x11,
+	0x40, 0xb1, 0xd7, 0xee, 0x0d, 0xf0, 0x27, 0xa3, 0x20, 0xa1, 0xa3, 0xf1, 0x00, 0x37, 0x3f, 0xb4,
+	0x8d, 0x55, 0x74, 0x1f, 0x6a, 0xed, 0xe1, 0x61, 0xbb, 0xd7, 0xc6, 0xcd, 0xae, 0x95, 0x92, 0xd7,
+	0xea, 0xff, 0xcc, 0xc1, 0x16, 0x8e, 0x03, 0xe1, 0x4d, 0x68, 0x8f, 0x0a, 0xe2, 0x10, 0x41, 0xd0,
+	0x5b, 0x58, 0x15, 0xd3, 0x30, 0x7d, 0xc3, 0xd7, 0xcb, 0x6f, 0x58, 0x44, 0xa7, 0xfb, 0xf1, 0x34,
+	0xa4, 0x58, 0xc9, 0x21, 0x13, 0x4a, 0x97, 0x94, 0x47, 0x1e, 0x0b, 0xf4, 0x53, 0xd2, 0x2d, 0x7a,
+	0x00, 0xc5, 0x53, 0x9f, 0x5c, 0x32, 0x6e, 0x16, 0x14, 0x43, 0xef, 0xea, 0xcf, 0xa1, 0x32, 0xa7,
+	0x06, 0x95, 0x61, 0x6d, 0x30, 0x3e, 0x6c, 0x63, 0x63, 0x05, 0x55, 0xa1, 0xfc, 0xbe, 0xfb, 0x69,
+	0xdc, 0xb6, 0x46, 0xad, 0x23, 0x23, 0x57, 0xff, 0x6b, 0x0e, 0x36, 0x3f, 0x0c, 0x8f, 0x9b, 0xb6,
+	0x4d, 0x7d, 0xca, 0x89, 0x60, 0x5c, 0xea, 0x74, 0xe8, 0xa5, 0x67, 0x27, 0xf7, 0x2d, 0x63, 0xbd,
+	0x43, 0xcf, 0xa0, 0x1a, 0x07, 0x21, 0xe1, 0xc2, 0x93, 0xf1, 0x45, 0x1d, 0x75, 0x97, 0xf5, 0xc3,
+	0x15, 0xbc, 0x48, 0x46, 0xcf, 0x61, 0x33, 0xdb, 0x5a, 0x91, 0xf7, 0x99, 0x26, 0x77, 0x93, 0xc0,
+	0x8c, 0x3e, 0xf2, 0x3e, 0xd3, 0x83, 0x07, 0xf0, 0xc5, 0x22, 0xd0, 0x4a, 0x3c, 0x74, 0x01, 0x46,
+	0xea, 0xa1, 0xcc, 0x84, 0x87, 0xb0, 0xe5, 0x86, 0xb1, 0x45, 0x66, 0xf7, 0x54, 0xb7, 0xab, 0xec,
+	0x3e, 0x5e, 0xb2, 0xe6, 0xe2, 0x63, 0x0e, 0x57, 0xf0, 0xa6, 0x1b, 0xc6, 0x73, 0x94, 0x83, 0x7b,
+	0x50, 0x9b, 0xd3, 0xa2, 0x8f, 0xfc, 0xcf, 0x1a, 0x6c, 0x8c, 0x49, 0x74, 0x9e, 0x9d, 0x57, 0x87,
+	0x0d, 0xc7, 0x8b, 0x6c, 0x76, 0x49, 0x39, 0x39, 0xf1, 0x13, 0x53, 0xac, 0xe3, 0x05, 0x1a, 0xda,
+	0x87, 0x12, 0x4f, 0x8c, 0xac, 0x4c, 0x51, 0xd9, 0x7d, 0xf2, 0xc3, 0x9e, 0xc5, 0x29, 0x1c, 0x7d,
+	0x03, 0x25, 0xf9, 0x65, 0xb1, 0x30, 0x57, 0x95, 0xe4, 0xc3, 0x46, 0x92, 0xa7, 0x8d, 0x34, 0x4f,
+	0x1b, 0x2d, 0x9d, 0xc7, 0x38, 0x45, 0xa2, 0x3d, 0x28, 0x71, 0x2a, 0xb8, 0x47, 0x23, 0x73, 0x4d,
+	0x09, 0x3d, 0xba, 0x92, 0x0c, 0x82, 0x4f, 0x47, 0x82, 0x13, 0x41, 0xdd, 0x29, 0x4e, 0xc1, 0xe8,
+	0x67, 0x50, 0x4b, 0xaf, 0x3d, 0xb5, 0xd2, 0x38, 0x2a, 0x2a, 0xd7, 0x1a, 0x19, 0xe3, 0xa3, 0x0e,
+	0xa8, 0x7d, 0x30, 0x1d, 0x1a, 0x72, 0x6a, 0x13, 0x41, 0x1d, 0x8b, 0x72, 0xce, 0xb8, 0x35, 0xa1,
+	0x51, 0x44, 0x5c, 0x6a, 0x96, 0x94, 0xcc, 0x83, 0x19, 0xbf, 0x2d, 0xd9, 0xbd, 0x84, 0x2b, 0xc3,
+	0x43, 0x15, 0x36, 0x1e, 0x87, 0xc2, 0x93, 0x26, 0x5b, 0x4f, 0xc3, 0x63, 0x81, 0x8c, 0x5e, 0x02,
+	0xb2, 0x89, 0x7d, 0x46, 0xad, 0x88, 0x72, 0x8f, 0xf8, 0xde, 0x67, 0x65, 0xdf, 0xb2, 0xb2, 0x6f,
+	0x4d, 0x71, 0x46, 0x73, 0x0c, 0xf4, 0x15, 0x6c, 0xba, 0x34, 0x90, 0xce, 0xa2, 0x91, 0xe5, 0x50,
+	0xfb, 0xdc, 0x04, 0x05, 0xad, 0x66, 0xd4, 0x16, 0xb5, 0xcf, 0x65, 0x99, 0x10, 0xc4, 0x8d, 0xcc,
+	0x8a, 0xaa, 0x3a, 0xcb, 0x65, 0x62, 0xde, 0xb5, 0x8d, 0x31, 0x71, 0xa3, 0xa4, 0xe8, 0x28, 0x11,
+	0xf4, 0x35, 0xd4, 0x42, 0xe6, 0x58, 0x82, 0x4e, 0x42, 0x9f, 0x08, 0x6a, 0xa9, 0x72, 0xb3, 0xa1,
+	0xde, 0xba, 0x15, 0x32, 0x67, 0xac, 0xe9, 0xaa, 0x58, 0x74, 0xa1, 0xc6, 0x75, 0x68, 0x5a, 0x13,
+	0xad, 0xd0, 0xac, 0x2a, 0x6f, 0x7c, 0x79, 0x43, 0x69, 0xca, 0xbc, 0x6f, 0xf0, 0x25, 0xca, 0xf6,
+	0x1b, 0x28, 0x67, 0x97, 0x41, 0x06, 0x14, 0xce, 0xe9, 0x54, 0xe7, 0x9c, 0x5c, 0x5e, 0x5f, 0xbf,
+	0xbe, 0xcb, 0xef, 0xe7, 0x0e, 0xee, 0xc3, 0xbd, 0x05, 0xa3, 0xea, 0x28, 0xfe, 0x8b, 0x8e, 0xe2,
+	0xf4, 0xca, 0xe8, 0xa7, 0x90, 0xf7, 0x1c, 0x9d, 0x28, 0x0f, 0x97, 0xee, 0xd7, 0xc9, 0xba, 0x14,
+	0xce, 0x7b, 0x0e, 0x42, 0xba, 0x46, 0x25, 0x67, 0x25, 0x75, 0xe7, 0x0d, 0xac, 0x67, 0x8f, 0x2c,
+	0x28, 0x25, 0x3f, 0xfe, 0x01, 0xc3, 0xe2, 0x0c, 0x8c, 0x7e, 0x09, 0xe5, 0xac, 0xc9, 0xe9, 0x08,
+	0x5f, 0xce, 0x53, 0x59, 0x97, 0x9c, 0x4e, 0x0a, 0xc2, 0x33, 0x3c, 0xda, 0x81, 0xa2, 0x1d, 0x47,
+	0x82, 0x4d, 0x74, 0x98, 0xff, 0xe8, 0x4a, 0x6e, 0x8c, 0x54, 0x0f, 0xc3, 0x1a, 0x86, 0xf6, 0xa1,
+	0x6c, 0xb3, 0x40, 0x10, 0x2f, 0xa0, 0x5c, 0x05, 0x76, 0x65, 0xd7, 0x5c, 0x3a, 0xed, 0x5d, 0xca,
+	0x3f, 0x5c, 0xc1, 0x33, 0x30, 0xfa, 0x05, 0x94, 0xce, 0xf7, 0x23, 0x2b, 0x64, 0x8e, 0x59, 0x53,
+	0x72, 0xf7, 0x97, 0xe4, 0x8e, 0xf6, 0xa3, 0x21, 0x73, 0x0e, 0x57, 0x70, 0xf1, 0x5c, 0xad, 0xd0,
+	0x33, 0x28, 0x44, 0x17, 0xbe, 0x89, 0x14, 0x1a, 0x2d, 0xa1, 0x47, 0x17, 0xfe, 0xe1, 0x0a, 0x96,
+	0x00, 0x19, 0x54, 0x72, 0x60, 0xb0, 0xa4, 0x1d, 0xb3, 0xa4, 0x93, 0x09, 0xb4, 0x86, 0xb7, 0x24,
+	0x43, 0x3e, 0x3f, 0xcd, 0xb9, 0x0e, 0x18, 0x69, 0x57, 0xb7, 0xe4, 0xdd, 0xe8, 0x9f, 0x85, 0x4a,
+	0x9e, 0xab, 0x05, 0x65, 0xa4, 0x61, 0xef, 0x12, 0x14, 0xde, 0x8a, 0x16, 0x09, 0xe8, 0xd7, 0x50,
+	0xb4, 0x59, 0x70, 0xea, 0xb9, 0xa6, 0xa1, 0x12, 0xe1, 0xf9, 0x35, 0xfe, 0x4a, 0xa3, 0x43, 0x1a,
+	0xe5, 0xd4, 0x73, 0x75, 0xff, 0x4d, 0xc4, 0xb6, 0xbf, 0x85, 0xca, 0x1c, 0xf9, 0x4e, 0x41, 0xb9,
+	0x0e, 0x45, 0x41, 0xb8, 0x4b, 0x45, 0x7d, 0x0f, 0xaa, 0x99, 0xc1, 0x87, 0x8c, 0x0b, 0x99, 0xc4,
+	0x99, 0xd1, 0xad, 0x90, 0x71, 0xa1, 0x34, 0x56, 0x71, 0xd5, 0x9e, 0x87, 0xd5, 0xff, 0x57, 0x80,
+	0x72, 0x26, 0x28, 0x4f, 0xf2, 0x26, 0xb2, 0xee, 0x24, 0xa7, 0x27, 0x1b, 0xd9, 0x0b, 0x6d, 0x36,
+	0x99, 0x90, 0xc0, 0x51, 0x13, 0x46, 0x19, 0xa7, 0x5b, 0x19, 0xc1, 0x84, 0xbb, 0x91, 0x59, 0x50,
+	0x64, 0xb5, 0x46, 0x7b, 0x50, 0x4e, 0xb3, 0x2e, 0xd2, 0x81, 0x68, 0xde, 0x34, 0x42, 0xe0, 0x19,
+	0x14, 0xbd, 0x84, 0x02, 0x0d, 0x2e, 0xcd, 0x35, 0x65, 0xc4, 0xe5, 0xa0, 0x3f, 0xa2, 0xd3, 0x8f,
+	0xf2, 0xd5, 0x43, 0xe2, 0x71, 0x2c, 0x71, 0xe8, 0x4d, 0x66, 0xf6, 0xe2, 0xad, 0x12, 0x07, 0x79,
+	0x33, 0x97, 0x9a, 0x1b, 0xed, 0xc2, 0x9a, 0x34, 0x47, 0x64, 0x96, 0x94, 0xdc, 0xa3, 0x9b, 0xc2,
+	0x56, 0x9a, 0x07, 0x27, 0x50, 0xd4, 0x84, 0x8a, 0x4c, 0x32, 0x4b, 0x9f, 0x58, 0x56, 0xaf, 0x7a,
+	0xba, 0x24, 0xd9, 0x22, 0x82, 0x74, 0x19, 0x71, 0xbc, 0xc0, 0x4d, 0xfc, 0x89, 0x41, 0x0a, 0x25,
+	0x6b, 0xd4, 0x81, 0x0d, 0xc2, 0xed, 0x33, 0x4f, 0x50, 0x5b, 0xc4, 0x9c, 0xaa, 0x92, 0x7a, 0x75,
+	0xb8, 0xca, 0x4e, 0x6f, 0x34, 0xe7, 0xc0, 0x78, 0x41, 0xb4, 0xde, 0x81, 0x8d, 0x79, 0xee, 0xe2,
+	0x38, 0x55, 0x86, 0xb5, 0x66, 0xaf, 0xb5, 0xf7, 0xda, 0xc8, 0xa9, 0x25, 0xee, 0xed, 0xbd, 0x4e,
+	0x46, 0xaa, 0x26, 0xee, 0x59, 0x1f, 0xf7, 0x8c, 0x42, 0xb6, 0x7e, 0x63, 0xac, 0xd6, 0xff, 0x95,
+	0x07, 0xe8, 0x0c, 0xd2, 0x06, 0x86, 0x8e, 0xa0, 0xea, 0xb0, 0x3f, 0x05, 0x3e, 0x23, 0x8e, 0x35,
+	0x61, 0x4e, 0x3a, 0x3e, 0x2d, 0x4f, 0x94, 0x33, 0x89, 0x46, 0x4b, 0xc3, 0x7b, 0xcc, 0xa1, 0x78,
+	0xc3, 0x99, 0xdb, 0xa1, 0x36, 0x54, 0xe2, 0x70, 0xa6, 0x2a, 0xaf, 0x54, 0xfd, 0xe4, 0x66, 0x55,
+	0xc7, 0x61, 0xa6, 0x08, 0xe2, 0x6c, 0x5d, 0xef, 0xc2, 0xc6, 0xfc, 0x21, 0x08, 0xc1, 0x66, 0x6b,
+	0xf0, 0x7d, 0xbf, 0x3b, 0x68, 0xb6, 0xac, 0x76, 0xf3, 0x83, 0x9a, 0xb0, 0xee, 0xc1, 0x56, 0x46,
+	0x1b, 0x8d, 0x71, 0xbb, 0xd9, 0x33, 0x72, 0x09, 0xd1, 0xea, 0x0f, 0xc6, 0x56, 0xca, 0x33, 0xf2,
+	0xf5, 0x36, 0xc0, 0xec, 0x1c, 0xa9, 0xeb, 0x78, 0xa8, 0xa4, 0x06, 0x7d, 0xab, 0xfd, 0xdb, 0xce,
+	0xd8, 0x58, 0x41, 0x06, 0x6c, 0x68, 0x5a, 0xa2, 0x3d, 0x87, 0x6a, 0x50, 0xd5, 0x8a, 0x12, 0x86,
+	0x91, 0xaf, 0xff, 0x3d, 0x0f, 0xb5, 0x2b, 0xfe, 0x96, 0x89, 0x42, 0x03, 0xd9, 0x42, 0x1d, 0x3d,
+	0xbc, 0xa4, 0x5b, 0xf4, 0x18, 0xc0, 0x0b, 0xc2, 0x58, 0x58, 0x21, 0x11, 0x67, 0x3a, 0x8f, 0xcb,
+	0x8a, 0x32, 0x24, 0xe2, 0x0c, 0x7d, 0x09, 0x15, 0x16, 0x8b, 0x8c, 0x9f, 0x0c, 0x96, 0x90, 0x90,
+	0x14, 0xa0, 0x03, 0xc5, 0x53, 0xc6, 0x27, 0x24, 0x19, 0x5e, 0x36, 0x77, 0x5f, 0xdd, 0x16, 0x7b,
+	0x8d, 0x6e, 0xf2, 0x4b, 0xd3, 0x23, 0xe1, 0x7b, 0x25, 0x88, 0xb5, 0x02, 0xf4, 0x1d, 0x54, 0x3c,
+	0x66, 0x45, 0xda, 0xea, 0xba, 0xe0, 0x3f, 0xbc, 0xd1, 0x2d, 0x18, 0x3c, 0x96, 0xae, 0xeb, 0xaf,
+	0xc0, 0x58, 0xd6, 0x8b, 0xd6, 0x61, 0xf5, 0x37, 0xa3, 0x81, 0x0c, 0xbd, 0x75, 0x58, 0xfd, 0xd4,
+	0xec, 0x75, 0x93, 0xc8, 0x1b, 0xe2, 0xc1, 0x78, 0x60, 0xe4, 0xeb, 0xff, 0xce, 0x41, 0x31, 0x29,
+	0xe9, 0xe8, 0x57, 0x73, 0xbd, 0x2d, 0x77, 0x6d, 0x0a, 0x1d, 0xed, 0x47, 0x83, 0x93, 0x3f, 0x52,
+	0x5b, 0x5c, 0xd3, 0xe0, 0x76, 0x61, 0x5d, 0xce, 0x0c, 0x51, 0x48, 0x6d, 0x3d, 0xfb, 0xdd, 0xd8,
+	0xa5, 0x4a, 0x21, 0x73, 0x46, 0x21, 0xb5, 0x97, 0xf3, 0xb6, 0x70, 0xf7, 0xbc, 0xad, 0xff, 0x23,
+	0x0f, 0xb5, 0x2b, 0xd7, 0x42, 0x2d, 0x28, 0xfa, 0xe4, 0x84, 0xfa, 0xe9, 0x5f, 0xdb, 0xcf, 0x6f,
+	0x7b, 0x48, 0xa3, 0xab, 0xe0, 0xe9, 0x9f, 0x97, 0xda, 0xa0, 0x11, 0x54, 0x48, 0x10, 0x30, 0xa1,
+	0xa6, 0xce, 0xf4, 0xf7, 0xed, 0xd5, 0xad, 0xaa, 0x9a, 0x33, 0x99, 0x44, 0xdf, 0xbc, 0x16, 0xd9,
+	0x4e, 0xe6, 0xce, 0xba, 0x4b, 0x3b, 0xd9, 0x7e, 0x0b, 0xc6, 0xb2, 0xee, 0xbb, 0xc8, 0xd7, 0xff,
+	0x96, 0x83, 0xc2, 0xe8, 0xc2, 0x47, 0x8f, 0xa0, 0x1c, 0x09, 0x22, 0xe8, 0x84, 0x06, 0x42, 0x4b,
+	0xce, 0x08, 0xe8, 0x35, 0x94, 0x1c, 0x8f, 0xf8, 0xd4, 0x16, 0xba, 0x26, 0x6c, 0x5f, 0xed, 0xe9,
+	0x8d, 0x56, 0x82, 0xc0, 0x29, 0xb4, 0xfe, 0x06, 0x4a, 0x9a, 0x26, 0xff, 0xa7, 0x8e, 0xfb, 0xad,
+	0xf6, 0xfb, 0x4e, 0xbf, 0xdd, 0x4a, 0xc2, 0xae, 0xd9, 0x1f, 0x75, 0x8c, 0x9c, 0x5c, 0x1d, 0x76,
+	0x3e, 0xb6, 0x8d, 0xfc, 0xec, 0xef, 0xab, 0x70, 0xb0, 0xf7, 0xbb, 0xd7, 0xae, 0x27, 0xce, 0xe2,
+	0x93, 0x86, 0xcd, 0x26, 0x3b, 0xea, 0x24, 0xc6, 0xdd, 0x9d, 0xec, 0x17, 0xdf, 0xa5, 0xc1, 0x4e,
+	0x78, 0xf2, 0xd2, 0x65, 0x3b, 0x0b, 0x7f, 0xfd, 0x27, 0x45, 0x15, 0x55, 0xdf, 0xfc, 0x3f, 0x00,
+	0x00, 0xff, 0xff, 0x10, 0x90, 0xc9, 0x89, 0x94, 0x10, 0x00, 0x00,
 }
diff --git a/gen/pb-go/flyteidl/core/tasks.pb.validate.go b/gen/pb-go/flyteidl/core/tasks.pb.validate.go
index 8360ba55f..32201a762 100644
--- a/gen/pb-go/flyteidl/core/tasks.pb.validate.go
+++ b/gen/pb-go/flyteidl/core/tasks.pb.validate.go
@@ -211,7 +211,7 @@ func (m *GPUAccelerator) Validate() error {
 
 	// no validation rules for Device
 
-	switch m.Partition.(type) {
+	switch m.PartitionSizeValue.(type) {
 
 	case *GPUAccelerator_Unpartitioned:
 		// no validation rules for Unpartitioned
@@ -286,7 +286,7 @@ func (m *ResourceMetadata) Validate() error {
 		return nil
 	}
 
-	switch m.Accelerator.(type) {
+	switch m.AcceleratorValue.(type) {
 
 	case *ResourceMetadata_GpuAccelerator:
 
diff --git a/gen/pb-java/flyteidl/core/Tasks.java b/gen/pb-java/flyteidl/core/Tasks.java
index a84ae266c..30f7fee2a 100644
--- a/gen/pb-java/flyteidl/core/Tasks.java
+++ b/gen/pb-java/flyteidl/core/Tasks.java
@@ -3334,7 +3334,7 @@ public interface GPUAcceleratorOrBuilder extends
     com.google.protobuf.ByteString
         getPartitionSizeBytes();
 
-    public flyteidl.core.Tasks.GPUAccelerator.PartitionCase getPartitionCase();
+    public flyteidl.core.Tasks.GPUAccelerator.PartitionSizeValueCase getPartitionSizeValueCase();
   }
   /**
    * <pre>
@@ -3387,14 +3387,14 @@ private GPUAccelerator(
               break;
             }
             case 16: {
-              partitionCase_ = 2;
-              partition_ = input.readBool();
+              partitionSizeValueCase_ = 2;
+              partitionSizeValue_ = input.readBool();
               break;
             }
             case 26: {
               java.lang.String s = input.readStringRequireUtf8();
-              partitionCase_ = 3;
-              partition_ = s;
+              partitionSizeValueCase_ = 3;
+              partitionSizeValue_ = s;
               break;
             }
             default: {
@@ -3429,30 +3429,30 @@ private GPUAccelerator(
               flyteidl.core.Tasks.GPUAccelerator.class, flyteidl.core.Tasks.GPUAccelerator.Builder.class);
     }
 
-    private int partitionCase_ = 0;
-    private java.lang.Object partition_;
-    public enum PartitionCase
+    private int partitionSizeValueCase_ = 0;
+    private java.lang.Object partitionSizeValue_;
+    public enum PartitionSizeValueCase
         implements com.google.protobuf.Internal.EnumLite {
       UNPARTITIONED(2),
       PARTITION_SIZE(3),
-      PARTITION_NOT_SET(0);
+      PARTITIONSIZEVALUE_NOT_SET(0);
       private final int value;
-      private PartitionCase(int value) {
+      private PartitionSizeValueCase(int value) {
         this.value = value;
       }
       /**
        * @deprecated Use {@link #forNumber(int)} instead.
        */
       @java.lang.Deprecated
-      public static PartitionCase valueOf(int value) {
+      public static PartitionSizeValueCase valueOf(int value) {
         return forNumber(value);
       }
 
-      public static PartitionCase forNumber(int value) {
+      public static PartitionSizeValueCase forNumber(int value) {
         switch (value) {
           case 2: return UNPARTITIONED;
           case 3: return PARTITION_SIZE;
-          case 0: return PARTITION_NOT_SET;
+          case 0: return PARTITIONSIZEVALUE_NOT_SET;
           default: return null;
         }
       }
@@ -3461,10 +3461,10 @@ public int getNumber() {
       }
     };
 
-    public PartitionCase
-    getPartitionCase() {
-      return PartitionCase.forNumber(
-          partitionCase_);
+    public PartitionSizeValueCase
+    getPartitionSizeValueCase() {
+      return PartitionSizeValueCase.forNumber(
+          partitionSizeValueCase_);
     }
 
     public static final int DEVICE_FIELD_NUMBER = 1;
@@ -3506,8 +3506,8 @@ public java.lang.String getDevice() {
      * <code>bool unpartitioned = 2;</code>
      */
     public boolean getUnpartitioned() {
-      if (partitionCase_ == 2) {
-        return (java.lang.Boolean) partition_;
+      if (partitionSizeValueCase_ == 2) {
+        return (java.lang.Boolean) partitionSizeValue_;
       }
       return false;
     }
@@ -3518,8 +3518,8 @@ public boolean getUnpartitioned() {
      */
     public java.lang.String getPartitionSize() {
       java.lang.Object ref = "";
-      if (partitionCase_ == 3) {
-        ref = partition_;
+      if (partitionSizeValueCase_ == 3) {
+        ref = partitionSizeValue_;
       }
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
@@ -3527,8 +3527,8 @@ public java.lang.String getPartitionSize() {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        if (partitionCase_ == 3) {
-          partition_ = s;
+        if (partitionSizeValueCase_ == 3) {
+          partitionSizeValue_ = s;
         }
         return s;
       }
@@ -3539,15 +3539,15 @@ public java.lang.String getPartitionSize() {
     public com.google.protobuf.ByteString
         getPartitionSizeBytes() {
       java.lang.Object ref = "";
-      if (partitionCase_ == 3) {
-        ref = partition_;
+      if (partitionSizeValueCase_ == 3) {
+        ref = partitionSizeValue_;
       }
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        if (partitionCase_ == 3) {
-          partition_ = b;
+        if (partitionSizeValueCase_ == 3) {
+          partitionSizeValue_ = b;
         }
         return b;
       } else {
@@ -3572,12 +3572,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (!getDeviceBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, device_);
       }
-      if (partitionCase_ == 2) {
+      if (partitionSizeValueCase_ == 2) {
         output.writeBool(
-            2, (boolean)((java.lang.Boolean) partition_));
+            2, (boolean)((java.lang.Boolean) partitionSizeValue_));
       }
-      if (partitionCase_ == 3) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, partition_);
+      if (partitionSizeValueCase_ == 3) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, partitionSizeValue_);
       }
       unknownFields.writeTo(output);
     }
@@ -3591,13 +3591,13 @@ public int getSerializedSize() {
       if (!getDeviceBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, device_);
       }
-      if (partitionCase_ == 2) {
+      if (partitionSizeValueCase_ == 2) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(
-              2, (boolean)((java.lang.Boolean) partition_));
+              2, (boolean)((java.lang.Boolean) partitionSizeValue_));
       }
-      if (partitionCase_ == 3) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, partition_);
+      if (partitionSizeValueCase_ == 3) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, partitionSizeValue_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -3616,8 +3616,8 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getDevice()
           .equals(other.getDevice())) return false;
-      if (!getPartitionCase().equals(other.getPartitionCase())) return false;
-      switch (partitionCase_) {
+      if (!getPartitionSizeValueCase().equals(other.getPartitionSizeValueCase())) return false;
+      switch (partitionSizeValueCase_) {
         case 2:
           if (getUnpartitioned()
               != other.getUnpartitioned()) return false;
@@ -3642,7 +3642,7 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + DEVICE_FIELD_NUMBER;
       hash = (53 * hash) + getDevice().hashCode();
-      switch (partitionCase_) {
+      switch (partitionSizeValueCase_) {
         case 2:
           hash = (37 * hash) + UNPARTITIONED_FIELD_NUMBER;
           hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
@@ -3794,8 +3794,8 @@ public Builder clear() {
         super.clear();
         device_ = "";
 
-        partitionCase_ = 0;
-        partition_ = null;
+        partitionSizeValueCase_ = 0;
+        partitionSizeValue_ = null;
         return this;
       }
 
@@ -3823,13 +3823,13 @@ public flyteidl.core.Tasks.GPUAccelerator build() {
       public flyteidl.core.Tasks.GPUAccelerator buildPartial() {
         flyteidl.core.Tasks.GPUAccelerator result = new flyteidl.core.Tasks.GPUAccelerator(this);
         result.device_ = device_;
-        if (partitionCase_ == 2) {
-          result.partition_ = partition_;
+        if (partitionSizeValueCase_ == 2) {
+          result.partitionSizeValue_ = partitionSizeValue_;
         }
-        if (partitionCase_ == 3) {
-          result.partition_ = partition_;
+        if (partitionSizeValueCase_ == 3) {
+          result.partitionSizeValue_ = partitionSizeValue_;
         }
-        result.partitionCase_ = partitionCase_;
+        result.partitionSizeValueCase_ = partitionSizeValueCase_;
         onBuilt();
         return result;
       }
@@ -3882,18 +3882,18 @@ public Builder mergeFrom(flyteidl.core.Tasks.GPUAccelerator other) {
           device_ = other.device_;
           onChanged();
         }
-        switch (other.getPartitionCase()) {
+        switch (other.getPartitionSizeValueCase()) {
           case UNPARTITIONED: {
             setUnpartitioned(other.getUnpartitioned());
             break;
           }
           case PARTITION_SIZE: {
-            partitionCase_ = 3;
-            partition_ = other.partition_;
+            partitionSizeValueCase_ = 3;
+            partitionSizeValue_ = other.partitionSizeValue_;
             onChanged();
             break;
           }
-          case PARTITION_NOT_SET: {
+          case PARTITIONSIZEVALUE_NOT_SET: {
             break;
           }
         }
@@ -3925,17 +3925,17 @@ public Builder mergeFrom(
         }
         return this;
       }
-      private int partitionCase_ = 0;
-      private java.lang.Object partition_;
-      public PartitionCase
-          getPartitionCase() {
-        return PartitionCase.forNumber(
-            partitionCase_);
+      private int partitionSizeValueCase_ = 0;
+      private java.lang.Object partitionSizeValue_;
+      public PartitionSizeValueCase
+          getPartitionSizeValueCase() {
+        return PartitionSizeValueCase.forNumber(
+            partitionSizeValueCase_);
       }
 
-      public Builder clearPartition() {
-        partitionCase_ = 0;
-        partition_ = null;
+      public Builder clearPartitionSizeValue() {
+        partitionSizeValueCase_ = 0;
+        partitionSizeValue_ = null;
         onChanged();
         return this;
       }
@@ -4014,8 +4014,8 @@ public Builder setDeviceBytes(
        * <code>bool unpartitioned = 2;</code>
        */
       public boolean getUnpartitioned() {
-        if (partitionCase_ == 2) {
-          return (java.lang.Boolean) partition_;
+        if (partitionSizeValueCase_ == 2) {
+          return (java.lang.Boolean) partitionSizeValue_;
         }
         return false;
       }
@@ -4023,8 +4023,8 @@ public boolean getUnpartitioned() {
        * <code>bool unpartitioned = 2;</code>
        */
       public Builder setUnpartitioned(boolean value) {
-        partitionCase_ = 2;
-        partition_ = value;
+        partitionSizeValueCase_ = 2;
+        partitionSizeValue_ = value;
         onChanged();
         return this;
       }
@@ -4032,9 +4032,9 @@ public Builder setUnpartitioned(boolean value) {
        * <code>bool unpartitioned = 2;</code>
        */
       public Builder clearUnpartitioned() {
-        if (partitionCase_ == 2) {
-          partitionCase_ = 0;
-          partition_ = null;
+        if (partitionSizeValueCase_ == 2) {
+          partitionSizeValueCase_ = 0;
+          partitionSizeValue_ = null;
           onChanged();
         }
         return this;
@@ -4045,15 +4045,15 @@ public Builder clearUnpartitioned() {
        */
       public java.lang.String getPartitionSize() {
         java.lang.Object ref = "";
-        if (partitionCase_ == 3) {
-          ref = partition_;
+        if (partitionSizeValueCase_ == 3) {
+          ref = partitionSizeValue_;
         }
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          if (partitionCase_ == 3) {
-            partition_ = s;
+          if (partitionSizeValueCase_ == 3) {
+            partitionSizeValue_ = s;
           }
           return s;
         } else {
@@ -4066,15 +4066,15 @@ public java.lang.String getPartitionSize() {
       public com.google.protobuf.ByteString
           getPartitionSizeBytes() {
         java.lang.Object ref = "";
-        if (partitionCase_ == 3) {
-          ref = partition_;
+        if (partitionSizeValueCase_ == 3) {
+          ref = partitionSizeValue_;
         }
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          if (partitionCase_ == 3) {
-            partition_ = b;
+          if (partitionSizeValueCase_ == 3) {
+            partitionSizeValue_ = b;
           }
           return b;
         } else {
@@ -4089,8 +4089,8 @@ public Builder setPartitionSize(
         if (value == null) {
     throw new NullPointerException();
   }
-  partitionCase_ = 3;
-        partition_ = value;
+  partitionSizeValueCase_ = 3;
+        partitionSizeValue_ = value;
         onChanged();
         return this;
       }
@@ -4098,9 +4098,9 @@ public Builder setPartitionSize(
        * <code>string partition_size = 3;</code>
        */
       public Builder clearPartitionSize() {
-        if (partitionCase_ == 3) {
-          partitionCase_ = 0;
-          partition_ = null;
+        if (partitionSizeValueCase_ == 3) {
+          partitionSizeValueCase_ = 0;
+          partitionSizeValue_ = null;
           onChanged();
         }
         return this;
@@ -4114,8 +4114,8 @@ public Builder setPartitionSizeBytes(
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-        partitionCase_ = 3;
-        partition_ = value;
+        partitionSizeValueCase_ = 3;
+        partitionSizeValue_ = value;
         onChanged();
         return this;
       }
@@ -4189,7 +4189,7 @@ public interface ResourceMetadataOrBuilder extends
      */
     flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder();
 
-    public flyteidl.core.Tasks.ResourceMetadata.AcceleratorCase getAcceleratorCase();
+    public flyteidl.core.Tasks.ResourceMetadata.AcceleratorValueCase getAcceleratorValueCase();
   }
   /**
    * <pre>
@@ -4236,16 +4236,16 @@ private ResourceMetadata(
               break;
             case 10: {
               flyteidl.core.Tasks.GPUAccelerator.Builder subBuilder = null;
-              if (acceleratorCase_ == 1) {
-                subBuilder = ((flyteidl.core.Tasks.GPUAccelerator) accelerator_).toBuilder();
+              if (acceleratorValueCase_ == 1) {
+                subBuilder = ((flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_).toBuilder();
               }
-              accelerator_ =
+              acceleratorValue_ =
                   input.readMessage(flyteidl.core.Tasks.GPUAccelerator.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom((flyteidl.core.Tasks.GPUAccelerator) accelerator_);
-                accelerator_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom((flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_);
+                acceleratorValue_ = subBuilder.buildPartial();
               }
-              acceleratorCase_ = 1;
+              acceleratorValueCase_ = 1;
               break;
             }
             default: {
@@ -4280,28 +4280,28 @@ private ResourceMetadata(
               flyteidl.core.Tasks.ResourceMetadata.class, flyteidl.core.Tasks.ResourceMetadata.Builder.class);
     }
 
-    private int acceleratorCase_ = 0;
-    private java.lang.Object accelerator_;
-    public enum AcceleratorCase
+    private int acceleratorValueCase_ = 0;
+    private java.lang.Object acceleratorValue_;
+    public enum AcceleratorValueCase
         implements com.google.protobuf.Internal.EnumLite {
       GPU_ACCELERATOR(1),
-      ACCELERATOR_NOT_SET(0);
+      ACCELERATORVALUE_NOT_SET(0);
       private final int value;
-      private AcceleratorCase(int value) {
+      private AcceleratorValueCase(int value) {
         this.value = value;
       }
       /**
        * @deprecated Use {@link #forNumber(int)} instead.
        */
       @java.lang.Deprecated
-      public static AcceleratorCase valueOf(int value) {
+      public static AcceleratorValueCase valueOf(int value) {
         return forNumber(value);
       }
 
-      public static AcceleratorCase forNumber(int value) {
+      public static AcceleratorValueCase forNumber(int value) {
         switch (value) {
           case 1: return GPU_ACCELERATOR;
-          case 0: return ACCELERATOR_NOT_SET;
+          case 0: return ACCELERATORVALUE_NOT_SET;
           default: return null;
         }
       }
@@ -4310,10 +4310,10 @@ public int getNumber() {
       }
     };
 
-    public AcceleratorCase
-    getAcceleratorCase() {
-      return AcceleratorCase.forNumber(
-          acceleratorCase_);
+    public AcceleratorValueCase
+    getAcceleratorValueCase() {
+      return AcceleratorValueCase.forNumber(
+          acceleratorValueCase_);
     }
 
     public static final int GPU_ACCELERATOR_FIELD_NUMBER = 1;
@@ -4321,14 +4321,14 @@ public int getNumber() {
      * <code>.flyteidl.core.GPUAccelerator gpu_accelerator = 1;</code>
      */
     public boolean hasGpuAccelerator() {
-      return acceleratorCase_ == 1;
+      return acceleratorValueCase_ == 1;
     }
     /**
      * <code>.flyteidl.core.GPUAccelerator gpu_accelerator = 1;</code>
      */
     public flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator() {
-      if (acceleratorCase_ == 1) {
-         return (flyteidl.core.Tasks.GPUAccelerator) accelerator_;
+      if (acceleratorValueCase_ == 1) {
+         return (flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_;
       }
       return flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance();
     }
@@ -4336,8 +4336,8 @@ public flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator() {
      * <code>.flyteidl.core.GPUAccelerator gpu_accelerator = 1;</code>
      */
     public flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder() {
-      if (acceleratorCase_ == 1) {
-         return (flyteidl.core.Tasks.GPUAccelerator) accelerator_;
+      if (acceleratorValueCase_ == 1) {
+         return (flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_;
       }
       return flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance();
     }
@@ -4356,8 +4356,8 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (acceleratorCase_ == 1) {
-        output.writeMessage(1, (flyteidl.core.Tasks.GPUAccelerator) accelerator_);
+      if (acceleratorValueCase_ == 1) {
+        output.writeMessage(1, (flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_);
       }
       unknownFields.writeTo(output);
     }
@@ -4368,9 +4368,9 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (acceleratorCase_ == 1) {
+      if (acceleratorValueCase_ == 1) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, (flyteidl.core.Tasks.GPUAccelerator) accelerator_);
+          .computeMessageSize(1, (flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -4387,8 +4387,8 @@ public boolean equals(final java.lang.Object obj) {
       }
       flyteidl.core.Tasks.ResourceMetadata other = (flyteidl.core.Tasks.ResourceMetadata) obj;
 
-      if (!getAcceleratorCase().equals(other.getAcceleratorCase())) return false;
-      switch (acceleratorCase_) {
+      if (!getAcceleratorValueCase().equals(other.getAcceleratorValueCase())) return false;
+      switch (acceleratorValueCase_) {
         case 1:
           if (!getGpuAccelerator()
               .equals(other.getGpuAccelerator())) return false;
@@ -4407,7 +4407,7 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      switch (acceleratorCase_) {
+      switch (acceleratorValueCase_) {
         case 1:
           hash = (37 * hash) + GPU_ACCELERATOR_FIELD_NUMBER;
           hash = (53 * hash) + getGpuAccelerator().hashCode();
@@ -4552,8 +4552,8 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        acceleratorCase_ = 0;
-        accelerator_ = null;
+        acceleratorValueCase_ = 0;
+        acceleratorValue_ = null;
         return this;
       }
 
@@ -4580,14 +4580,14 @@ public flyteidl.core.Tasks.ResourceMetadata build() {
       @java.lang.Override
       public flyteidl.core.Tasks.ResourceMetadata buildPartial() {
         flyteidl.core.Tasks.ResourceMetadata result = new flyteidl.core.Tasks.ResourceMetadata(this);
-        if (acceleratorCase_ == 1) {
+        if (acceleratorValueCase_ == 1) {
           if (gpuAcceleratorBuilder_ == null) {
-            result.accelerator_ = accelerator_;
+            result.acceleratorValue_ = acceleratorValue_;
           } else {
-            result.accelerator_ = gpuAcceleratorBuilder_.build();
+            result.acceleratorValue_ = gpuAcceleratorBuilder_.build();
           }
         }
-        result.acceleratorCase_ = acceleratorCase_;
+        result.acceleratorValueCase_ = acceleratorValueCase_;
         onBuilt();
         return result;
       }
@@ -4636,12 +4636,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(flyteidl.core.Tasks.ResourceMetadata other) {
         if (other == flyteidl.core.Tasks.ResourceMetadata.getDefaultInstance()) return this;
-        switch (other.getAcceleratorCase()) {
+        switch (other.getAcceleratorValueCase()) {
           case GPU_ACCELERATOR: {
             mergeGpuAccelerator(other.getGpuAccelerator());
             break;
           }
-          case ACCELERATOR_NOT_SET: {
+          case ACCELERATORVALUE_NOT_SET: {
             break;
           }
         }
@@ -4673,17 +4673,17 @@ public Builder mergeFrom(
         }
         return this;
       }
-      private int acceleratorCase_ = 0;
-      private java.lang.Object accelerator_;
-      public AcceleratorCase
-          getAcceleratorCase() {
-        return AcceleratorCase.forNumber(
-            acceleratorCase_);
+      private int acceleratorValueCase_ = 0;
+      private java.lang.Object acceleratorValue_;
+      public AcceleratorValueCase
+          getAcceleratorValueCase() {
+        return AcceleratorValueCase.forNumber(
+            acceleratorValueCase_);
       }
 
-      public Builder clearAccelerator() {
-        acceleratorCase_ = 0;
-        accelerator_ = null;
+      public Builder clearAcceleratorValue() {
+        acceleratorValueCase_ = 0;
+        acceleratorValue_ = null;
         onChanged();
         return this;
       }
@@ -4695,19 +4695,19 @@ public Builder clearAccelerator() {
        * <code>.flyteidl.core.GPUAccelerator gpu_accelerator = 1;</code>
        */
       public boolean hasGpuAccelerator() {
-        return acceleratorCase_ == 1;
+        return acceleratorValueCase_ == 1;
       }
       /**
        * <code>.flyteidl.core.GPUAccelerator gpu_accelerator = 1;</code>
        */
       public flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator() {
         if (gpuAcceleratorBuilder_ == null) {
-          if (acceleratorCase_ == 1) {
-            return (flyteidl.core.Tasks.GPUAccelerator) accelerator_;
+          if (acceleratorValueCase_ == 1) {
+            return (flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_;
           }
           return flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance();
         } else {
-          if (acceleratorCase_ == 1) {
+          if (acceleratorValueCase_ == 1) {
             return gpuAcceleratorBuilder_.getMessage();
           }
           return flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance();
@@ -4721,12 +4721,12 @@ public Builder setGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) {
           if (value == null) {
             throw new NullPointerException();
           }
-          accelerator_ = value;
+          acceleratorValue_ = value;
           onChanged();
         } else {
           gpuAcceleratorBuilder_.setMessage(value);
         }
-        acceleratorCase_ = 1;
+        acceleratorValueCase_ = 1;
         return this;
       }
       /**
@@ -4735,12 +4735,12 @@ public Builder setGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) {
       public Builder setGpuAccelerator(
           flyteidl.core.Tasks.GPUAccelerator.Builder builderForValue) {
         if (gpuAcceleratorBuilder_ == null) {
-          accelerator_ = builderForValue.build();
+          acceleratorValue_ = builderForValue.build();
           onChanged();
         } else {
           gpuAcceleratorBuilder_.setMessage(builderForValue.build());
         }
-        acceleratorCase_ = 1;
+        acceleratorValueCase_ = 1;
         return this;
       }
       /**
@@ -4748,21 +4748,21 @@ public Builder setGpuAccelerator(
        */
       public Builder mergeGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) {
         if (gpuAcceleratorBuilder_ == null) {
-          if (acceleratorCase_ == 1 &&
-              accelerator_ != flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance()) {
-            accelerator_ = flyteidl.core.Tasks.GPUAccelerator.newBuilder((flyteidl.core.Tasks.GPUAccelerator) accelerator_)
+          if (acceleratorValueCase_ == 1 &&
+              acceleratorValue_ != flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance()) {
+            acceleratorValue_ = flyteidl.core.Tasks.GPUAccelerator.newBuilder((flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_)
                 .mergeFrom(value).buildPartial();
           } else {
-            accelerator_ = value;
+            acceleratorValue_ = value;
           }
           onChanged();
         } else {
-          if (acceleratorCase_ == 1) {
+          if (acceleratorValueCase_ == 1) {
             gpuAcceleratorBuilder_.mergeFrom(value);
           }
           gpuAcceleratorBuilder_.setMessage(value);
         }
-        acceleratorCase_ = 1;
+        acceleratorValueCase_ = 1;
         return this;
       }
       /**
@@ -4770,15 +4770,15 @@ public Builder mergeGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) {
        */
       public Builder clearGpuAccelerator() {
         if (gpuAcceleratorBuilder_ == null) {
-          if (acceleratorCase_ == 1) {
-            acceleratorCase_ = 0;
-            accelerator_ = null;
+          if (acceleratorValueCase_ == 1) {
+            acceleratorValueCase_ = 0;
+            acceleratorValue_ = null;
             onChanged();
           }
         } else {
-          if (acceleratorCase_ == 1) {
-            acceleratorCase_ = 0;
-            accelerator_ = null;
+          if (acceleratorValueCase_ == 1) {
+            acceleratorValueCase_ = 0;
+            acceleratorValue_ = null;
           }
           gpuAcceleratorBuilder_.clear();
         }
@@ -4794,11 +4794,11 @@ public flyteidl.core.Tasks.GPUAccelerator.Builder getGpuAcceleratorBuilder() {
        * <code>.flyteidl.core.GPUAccelerator gpu_accelerator = 1;</code>
        */
       public flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder() {
-        if ((acceleratorCase_ == 1) && (gpuAcceleratorBuilder_ != null)) {
+        if ((acceleratorValueCase_ == 1) && (gpuAcceleratorBuilder_ != null)) {
           return gpuAcceleratorBuilder_.getMessageOrBuilder();
         } else {
-          if (acceleratorCase_ == 1) {
-            return (flyteidl.core.Tasks.GPUAccelerator) accelerator_;
+          if (acceleratorValueCase_ == 1) {
+            return (flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_;
           }
           return flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance();
         }
@@ -4810,17 +4810,17 @@ public flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder()
           flyteidl.core.Tasks.GPUAccelerator, flyteidl.core.Tasks.GPUAccelerator.Builder, flyteidl.core.Tasks.GPUAcceleratorOrBuilder> 
           getGpuAcceleratorFieldBuilder() {
         if (gpuAcceleratorBuilder_ == null) {
-          if (!(acceleratorCase_ == 1)) {
-            accelerator_ = flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance();
+          if (!(acceleratorValueCase_ == 1)) {
+            acceleratorValue_ = flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance();
           }
           gpuAcceleratorBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               flyteidl.core.Tasks.GPUAccelerator, flyteidl.core.Tasks.GPUAccelerator.Builder, flyteidl.core.Tasks.GPUAcceleratorOrBuilder>(
-                  (flyteidl.core.Tasks.GPUAccelerator) accelerator_,
+                  (flyteidl.core.Tasks.GPUAccelerator) acceleratorValue_,
                   getParentForChildren(),
                   isClean());
-          accelerator_ = null;
+          acceleratorValue_ = null;
         }
-        acceleratorCase_ = 1;
+        acceleratorValueCase_ = 1;
         onChanged();;
         return gpuAcceleratorBuilder_;
       }
@@ -20522,78 +20522,79 @@ public flyteidl.core.Tasks.Sql getDefaultInstanceForType() {
       "ype\030\001 \001(\0162*.flyteidl.core.RuntimeMetadat" +
       "a.RuntimeType\022\017\n\007version\030\002 \001(\t\022\016\n\006flavor" +
       "\030\003 \001(\t\"\'\n\013RuntimeType\022\t\n\005OTHER\020\000\022\r\n\tFLYT" +
-      "E_SDK\020\001\"`\n\016GPUAccelerator\022\016\n\006device\030\001 \001(" +
+      "E_SDK\020\001\"k\n\016GPUAccelerator\022\016\n\006device\030\001 \001(" +
       "\t\022\027\n\runpartitioned\030\002 \001(\010H\000\022\030\n\016partition_" +
-      "size\030\003 \001(\tH\000B\013\n\tpartition\"[\n\020ResourceMet" +
-      "adata\0228\n\017gpu_accelerator\030\001 \001(\0132\035.flyteid" +
-      "l.core.GPUAcceleratorH\000B\r\n\013accelerator\"\212" +
-      "\004\n\014TaskMetadata\022\024\n\014discoverable\030\001 \001(\010\022/\n" +
-      "\007runtime\030\002 \001(\0132\036.flyteidl.core.RuntimeMe" +
-      "tadata\022*\n\007timeout\030\004 \001(\0132\031.google.protobu" +
-      "f.Duration\022-\n\007retries\030\005 \001(\0132\034.flyteidl.c" +
-      "ore.RetryStrategy\022\031\n\021discovery_version\030\006" +
-      " \001(\t\022 \n\030deprecated_error_message\030\007 \001(\t\022\027" +
-      "\n\rinterruptible\030\010 \001(\010H\000\022\032\n\022cache_seriali" +
-      "zable\030\t \001(\010\022\026\n\016generates_deck\030\n \001(\010\0223\n\004t" +
-      "ags\030\013 \003(\0132%.flyteidl.core.TaskMetadata.T" +
-      "agsEntry\022\031\n\021pod_template_name\030\014 \001(\t\022:\n\021r" +
-      "esource_metadata\030\r \001(\0132\037.flyteidl.core.R" +
-      "esourceMetadata\032+\n\tTagsEntry\022\013\n\003key\030\001 \001(" +
-      "\t\022\r\n\005value\030\002 \001(\t:\0028\001B\025\n\023interruptible_va" +
-      "lue\"\220\004\n\014TaskTemplate\022%\n\002id\030\001 \001(\0132\031.flyte" +
-      "idl.core.Identifier\022\014\n\004type\030\002 \001(\t\022-\n\010met" +
-      "adata\030\003 \001(\0132\033.flyteidl.core.TaskMetadata" +
-      "\0220\n\tinterface\030\004 \001(\0132\035.flyteidl.core.Type" +
-      "dInterface\022\'\n\006custom\030\005 \001(\0132\027.google.prot" +
-      "obuf.Struct\022-\n\tcontainer\030\006 \001(\0132\030.flyteid" +
-      "l.core.ContainerH\000\022(\n\007k8s_pod\030\021 \001(\0132\025.fl" +
-      "yteidl.core.K8sPodH\000\022!\n\003sql\030\022 \001(\0132\022.flyt" +
-      "eidl.core.SqlH\000\022\031\n\021task_type_version\030\007 \001" +
-      "(\005\0228\n\020security_context\030\010 \001(\0132\036.flyteidl." +
-      "core.SecurityContext\0227\n\006config\030\020 \003(\0132\'.f" +
-      "lyteidl.core.TaskTemplate.ConfigEntry\032-\n" +
-      "\013ConfigEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t" +
-      ":\0028\001B\010\n\006target\"\'\n\rContainerPort\022\026\n\016conta" +
-      "iner_port\030\001 \001(\r\"\255\003\n\tContainer\022\r\n\005image\030\001" +
-      " \001(\t\022\017\n\007command\030\002 \003(\t\022\014\n\004args\030\003 \003(\t\022+\n\tr" +
-      "esources\030\004 \001(\0132\030.flyteidl.core.Resources" +
-      "\022(\n\003env\030\005 \003(\0132\033.flyteidl.core.KeyValuePa" +
-      "ir\022/\n\006config\030\006 \003(\0132\033.flyteidl.core.KeyVa" +
-      "luePairB\002\030\001\022+\n\005ports\030\007 \003(\0132\034.flyteidl.co" +
-      "re.ContainerPort\0225\n\013data_config\030\t \001(\0132 ." +
-      "flyteidl.core.DataLoadingConfig\022;\n\014archi" +
-      "tecture\030\n \001(\0162%.flyteidl.core.Container." +
-      "Architecture\"I\n\014Architecture\022\013\n\007UNKNOWN\020" +
-      "\000\022\t\n\005AMD64\020\001\022\t\n\005ARM64\020\002\022\n\n\006ARM_V6\020\003\022\n\n\006A" +
-      "RM_V7\020\004\"\233\002\n\nIOStrategy\022=\n\rdownload_mode\030" +
-      "\001 \001(\0162&.flyteidl.core.IOStrategy.Downloa" +
-      "dMode\0229\n\013upload_mode\030\002 \001(\0162$.flyteidl.co" +
-      "re.IOStrategy.UploadMode\"L\n\014DownloadMode" +
-      "\022\022\n\016DOWNLOAD_EAGER\020\000\022\023\n\017DOWNLOAD_STREAM\020" +
-      "\001\022\023\n\017DO_NOT_DOWNLOAD\020\002\"E\n\nUploadMode\022\022\n\016" +
-      "UPLOAD_ON_EXIT\020\000\022\020\n\014UPLOAD_EAGER\020\001\022\021\n\rDO" +
-      "_NOT_UPLOAD\020\002\"\363\001\n\021DataLoadingConfig\022\017\n\007e" +
-      "nabled\030\001 \001(\010\022\022\n\ninput_path\030\002 \001(\t\022\023\n\013outp" +
-      "ut_path\030\003 \001(\t\022A\n\006format\030\004 \001(\01621.flyteidl" +
-      ".core.DataLoadingConfig.LiteralMapFormat" +
-      "\022.\n\013io_strategy\030\005 \001(\0132\031.flyteidl.core.IO" +
-      "Strategy\"1\n\020LiteralMapFormat\022\010\n\004JSON\020\000\022\010" +
-      "\n\004YAML\020\001\022\t\n\005PROTO\020\002\"\236\001\n\006K8sPod\0222\n\010metada" +
-      "ta\030\001 \001(\0132 .flyteidl.core.K8sObjectMetada" +
-      "ta\022)\n\010pod_spec\030\002 \001(\0132\027.google.protobuf.S" +
-      "truct\0225\n\013data_config\030\003 \001(\0132 .flyteidl.co" +
-      "re.DataLoadingConfig\"\374\001\n\021K8sObjectMetada" +
-      "ta\022<\n\006labels\030\001 \003(\0132,.flyteidl.core.K8sOb" +
-      "jectMetadata.LabelsEntry\022F\n\013annotations\030" +
-      "\002 \003(\01321.flyteidl.core.K8sObjectMetadata." +
-      "AnnotationsEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001" +
-      " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" +
-      "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"~\n\003S" +
-      "ql\022\021\n\tstatement\030\001 \001(\t\022+\n\007dialect\030\002 \001(\0162\032" +
-      ".flyteidl.core.Sql.Dialect\"7\n\007Dialect\022\r\n" +
-      "\tUNDEFINED\020\000\022\010\n\004ANSI\020\001\022\010\n\004HIVE\020\002\022\t\n\005OTHE" +
-      "R\020\003B6Z4github.com/flyteorg/flyteidl/gen/" +
-      "pb-go/flyteidl/coreb\006proto3"
+      "size\030\003 \001(\tH\000B\026\n\024partition_size_value\"a\n\020" +
+      "ResourceMetadata\0228\n\017gpu_accelerator\030\001 \001(" +
+      "\0132\035.flyteidl.core.GPUAcceleratorH\000B\023\n\021ac" +
+      "celerator_value\"\212\004\n\014TaskMetadata\022\024\n\014disc" +
+      "overable\030\001 \001(\010\022/\n\007runtime\030\002 \001(\0132\036.flytei" +
+      "dl.core.RuntimeMetadata\022*\n\007timeout\030\004 \001(\013" +
+      "2\031.google.protobuf.Duration\022-\n\007retries\030\005" +
+      " \001(\0132\034.flyteidl.core.RetryStrategy\022\031\n\021di" +
+      "scovery_version\030\006 \001(\t\022 \n\030deprecated_erro" +
+      "r_message\030\007 \001(\t\022\027\n\rinterruptible\030\010 \001(\010H\000" +
+      "\022\032\n\022cache_serializable\030\t \001(\010\022\026\n\016generate" +
+      "s_deck\030\n \001(\010\0223\n\004tags\030\013 \003(\0132%.flyteidl.co" +
+      "re.TaskMetadata.TagsEntry\022\031\n\021pod_templat" +
+      "e_name\030\014 \001(\t\022:\n\021resource_metadata\030\r \001(\0132" +
+      "\037.flyteidl.core.ResourceMetadata\032+\n\tTags" +
+      "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\025\n" +
+      "\023interruptible_value\"\220\004\n\014TaskTemplate\022%\n" +
+      "\002id\030\001 \001(\0132\031.flyteidl.core.Identifier\022\014\n\004" +
+      "type\030\002 \001(\t\022-\n\010metadata\030\003 \001(\0132\033.flyteidl." +
+      "core.TaskMetadata\0220\n\tinterface\030\004 \001(\0132\035.f" +
+      "lyteidl.core.TypedInterface\022\'\n\006custom\030\005 " +
+      "\001(\0132\027.google.protobuf.Struct\022-\n\tcontaine" +
+      "r\030\006 \001(\0132\030.flyteidl.core.ContainerH\000\022(\n\007k" +
+      "8s_pod\030\021 \001(\0132\025.flyteidl.core.K8sPodH\000\022!\n" +
+      "\003sql\030\022 \001(\0132\022.flyteidl.core.SqlH\000\022\031\n\021task" +
+      "_type_version\030\007 \001(\005\0228\n\020security_context\030" +
+      "\010 \001(\0132\036.flyteidl.core.SecurityContext\0227\n" +
+      "\006config\030\020 \003(\0132\'.flyteidl.core.TaskTempla" +
+      "te.ConfigEntry\032-\n\013ConfigEntry\022\013\n\003key\030\001 \001" +
+      "(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006target\"\'\n\rConta" +
+      "inerPort\022\026\n\016container_port\030\001 \001(\r\"\255\003\n\tCon" +
+      "tainer\022\r\n\005image\030\001 \001(\t\022\017\n\007command\030\002 \003(\t\022\014" +
+      "\n\004args\030\003 \003(\t\022+\n\tresources\030\004 \001(\0132\030.flytei" +
+      "dl.core.Resources\022(\n\003env\030\005 \003(\0132\033.flyteid" +
+      "l.core.KeyValuePair\022/\n\006config\030\006 \003(\0132\033.fl" +
+      "yteidl.core.KeyValuePairB\002\030\001\022+\n\005ports\030\007 " +
+      "\003(\0132\034.flyteidl.core.ContainerPort\0225\n\013dat" +
+      "a_config\030\t \001(\0132 .flyteidl.core.DataLoadi" +
+      "ngConfig\022;\n\014architecture\030\n \001(\0162%.flyteid" +
+      "l.core.Container.Architecture\"I\n\014Archite" +
+      "cture\022\013\n\007UNKNOWN\020\000\022\t\n\005AMD64\020\001\022\t\n\005ARM64\020\002" +
+      "\022\n\n\006ARM_V6\020\003\022\n\n\006ARM_V7\020\004\"\233\002\n\nIOStrategy\022" +
+      "=\n\rdownload_mode\030\001 \001(\0162&.flyteidl.core.I" +
+      "OStrategy.DownloadMode\0229\n\013upload_mode\030\002 " +
+      "\001(\0162$.flyteidl.core.IOStrategy.UploadMod" +
+      "e\"L\n\014DownloadMode\022\022\n\016DOWNLOAD_EAGER\020\000\022\023\n" +
+      "\017DOWNLOAD_STREAM\020\001\022\023\n\017DO_NOT_DOWNLOAD\020\002\"" +
+      "E\n\nUploadMode\022\022\n\016UPLOAD_ON_EXIT\020\000\022\020\n\014UPL" +
+      "OAD_EAGER\020\001\022\021\n\rDO_NOT_UPLOAD\020\002\"\363\001\n\021DataL" +
+      "oadingConfig\022\017\n\007enabled\030\001 \001(\010\022\022\n\ninput_p" +
+      "ath\030\002 \001(\t\022\023\n\013output_path\030\003 \001(\t\022A\n\006format" +
+      "\030\004 \001(\01621.flyteidl.core.DataLoadingConfig" +
+      ".LiteralMapFormat\022.\n\013io_strategy\030\005 \001(\0132\031" +
+      ".flyteidl.core.IOStrategy\"1\n\020LiteralMapF" +
+      "ormat\022\010\n\004JSON\020\000\022\010\n\004YAML\020\001\022\t\n\005PROTO\020\002\"\236\001\n" +
+      "\006K8sPod\0222\n\010metadata\030\001 \001(\0132 .flyteidl.cor" +
+      "e.K8sObjectMetadata\022)\n\010pod_spec\030\002 \001(\0132\027." +
+      "google.protobuf.Struct\0225\n\013data_config\030\003 " +
+      "\001(\0132 .flyteidl.core.DataLoadingConfig\"\374\001" +
+      "\n\021K8sObjectMetadata\022<\n\006labels\030\001 \003(\0132,.fl" +
+      "yteidl.core.K8sObjectMetadata.LabelsEntr" +
+      "y\022F\n\013annotations\030\002 \003(\01321.flyteidl.core.K" +
+      "8sObjectMetadata.AnnotationsEntry\032-\n\013Lab" +
+      "elsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" +
+      "\0322\n\020AnnotationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" +
+      "ue\030\002 \001(\t:\0028\001\"~\n\003Sql\022\021\n\tstatement\030\001 \001(\t\022+" +
+      "\n\007dialect\030\002 \001(\0162\032.flyteidl.core.Sql.Dial" +
+      "ect\"7\n\007Dialect\022\r\n\tUNDEFINED\020\000\022\010\n\004ANSI\020\001\022" +
+      "\010\n\004HIVE\020\002\022\t\n\005OTHER\020\003B6Z4github.com/flyte" +
+      "org/flyteidl/gen/pb-go/flyteidl/coreb\006pr" +
+      "oto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -20636,13 +20637,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_flyteidl_core_GPUAccelerator_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_core_GPUAccelerator_descriptor,
-        new java.lang.String[] { "Device", "Unpartitioned", "PartitionSize", "Partition", });
+        new java.lang.String[] { "Device", "Unpartitioned", "PartitionSize", "PartitionSizeValue", });
     internal_static_flyteidl_core_ResourceMetadata_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_flyteidl_core_ResourceMetadata_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_core_ResourceMetadata_descriptor,
-        new java.lang.String[] { "GpuAccelerator", "Accelerator", });
+        new java.lang.String[] { "GpuAccelerator", "AcceleratorValue", });
     internal_static_flyteidl_core_TaskMetadata_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_flyteidl_core_TaskMetadata_fieldAccessorTable = new
diff --git a/gen/pb-js/flyteidl.d.ts b/gen/pb-js/flyteidl.d.ts
index 219e7750c..8786c585e 100644
--- a/gen/pb-js/flyteidl.d.ts
+++ b/gen/pb-js/flyteidl.d.ts
@@ -5194,8 +5194,8 @@ export namespace flyteidl {
             /** GPUAccelerator partitionSize. */
             public partitionSize: string;
 
-            /** GPUAccelerator partition. */
-            public partition?: ("unpartitioned"|"partitionSize");
+            /** GPUAccelerator partitionSizeValue. */
+            public partitionSizeValue?: ("unpartitioned"|"partitionSize");
 
             /**
              * Creates a new GPUAccelerator instance using the specified properties.
@@ -5249,8 +5249,8 @@ export namespace flyteidl {
             /** ResourceMetadata gpuAccelerator. */
             public gpuAccelerator?: (flyteidl.core.IGPUAccelerator|null);
 
-            /** ResourceMetadata accelerator. */
-            public accelerator?: "gpuAccelerator";
+            /** ResourceMetadata acceleratorValue. */
+            public acceleratorValue?: "gpuAccelerator";
 
             /**
              * Creates a new ResourceMetadata instance using the specified properties.
diff --git a/gen/pb-js/flyteidl.js b/gen/pb-js/flyteidl.js
index f38f57368..a30c0b3e5 100644
--- a/gen/pb-js/flyteidl.js
+++ b/gen/pb-js/flyteidl.js
@@ -12337,12 +12337,12 @@
                 var $oneOfFields;
     
                 /**
-                 * GPUAccelerator partition.
-                 * @member {"unpartitioned"|"partitionSize"|undefined} partition
+                 * GPUAccelerator partitionSizeValue.
+                 * @member {"unpartitioned"|"partitionSize"|undefined} partitionSizeValue
                  * @memberof flyteidl.core.GPUAccelerator
                  * @instance
                  */
-                Object.defineProperty(GPUAccelerator.prototype, "partition", {
+                Object.defineProperty(GPUAccelerator.prototype, "partitionSizeValue", {
                     get: $util.oneOfGetter($oneOfFields = ["unpartitioned", "partitionSize"]),
                     set: $util.oneOfSetter($oneOfFields)
                 });
@@ -12431,14 +12431,14 @@
                         if (!$util.isString(message.device))
                             return "device: string expected";
                     if (message.unpartitioned != null && message.hasOwnProperty("unpartitioned")) {
-                        properties.partition = 1;
+                        properties.partitionSizeValue = 1;
                         if (typeof message.unpartitioned !== "boolean")
                             return "unpartitioned: boolean expected";
                     }
                     if (message.partitionSize != null && message.hasOwnProperty("partitionSize")) {
-                        if (properties.partition === 1)
-                            return "partition: multiple values";
-                        properties.partition = 1;
+                        if (properties.partitionSizeValue === 1)
+                            return "partitionSizeValue: multiple values";
+                        properties.partitionSizeValue = 1;
                         if (!$util.isString(message.partitionSize))
                             return "partitionSize: string expected";
                     }
@@ -12484,12 +12484,12 @@
                 var $oneOfFields;
     
                 /**
-                 * ResourceMetadata accelerator.
-                 * @member {"gpuAccelerator"|undefined} accelerator
+                 * ResourceMetadata acceleratorValue.
+                 * @member {"gpuAccelerator"|undefined} acceleratorValue
                  * @memberof flyteidl.core.ResourceMetadata
                  * @instance
                  */
-                Object.defineProperty(ResourceMetadata.prototype, "accelerator", {
+                Object.defineProperty(ResourceMetadata.prototype, "acceleratorValue", {
                     get: $util.oneOfGetter($oneOfFields = ["gpuAccelerator"]),
                     set: $util.oneOfSetter($oneOfFields)
                 });
@@ -12565,7 +12565,7 @@
                         return "object expected";
                     var properties = {};
                     if (message.gpuAccelerator != null && message.hasOwnProperty("gpuAccelerator")) {
-                        properties.accelerator = 1;
+                        properties.acceleratorValue = 1;
                         {
                             var error = $root.flyteidl.core.GPUAccelerator.verify(message.gpuAccelerator);
                             if (error)
diff --git a/gen/pb_python/flyteidl/core/tasks_pb2.py b/gen/pb_python/flyteidl/core/tasks_pb2.py
index 66593ec0b..f1c09cd7d 100644
--- a/gen/pb_python/flyteidl/core/tasks_pb2.py
+++ b/gen/pb_python/flyteidl/core/tasks_pb2.py
@@ -19,7 +19,7 @@
 from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x66lyteidl/core/tasks.proto\x12\rflyteidl.core\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xd0\x02\n\tResources\x12\x42\n\x08requests\x18\x01 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x08requests\x12>\n\x06limits\x18\x02 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x06limits\x1a`\n\rResourceEntry\x12\x39\n\x04name\x18\x01 \x01(\x0e\x32%.flyteidl.core.Resources.ResourceNameR\x04name\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"]\n\x0cResourceName\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x43PU\x10\x01\x12\x07\n\x03GPU\x10\x02\x12\n\n\x06MEMORY\x10\x03\x12\x0b\n\x07STORAGE\x10\x04\x12\x15\n\x11\x45PHEMERAL_STORAGE\x10\x05\"\xac\x01\n\x0fRuntimeMetadata\x12>\n\x04type\x18\x01 \x01(\x0e\x32*.flyteidl.core.RuntimeMetadata.RuntimeTypeR\x04type\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\x12\x16\n\x06\x66lavor\x18\x03 \x01(\tR\x06\x66lavor\"\'\n\x0bRuntimeType\x12\t\n\x05OTHER\x10\x00\x12\r\n\tFLYTE_SDK\x10\x01\"\x86\x01\n\x0eGPUAccelerator\x12\x16\n\x06\x64\x65vice\x18\x01 \x01(\tR\x06\x64\x65vice\x12&\n\runpartitioned\x18\x02 \x01(\x08H\x00R\runpartitioned\x12\'\n\x0epartition_size\x18\x03 \x01(\tH\x00R\rpartitionSizeB\x0b\n\tpartition\"k\n\x10ResourceMetadata\x12H\n\x0fgpu_accelerator\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.GPUAcceleratorH\x00R\x0egpuAcceleratorB\r\n\x0b\x61\x63\x63\x65lerator\"\xc3\x05\n\x0cTaskMetadata\x12\"\n\x0c\x64iscoverable\x18\x01 \x01(\x08R\x0c\x64iscoverable\x12\x38\n\x07runtime\x18\x02 \x01(\x0b\x32\x1e.flyteidl.core.RuntimeMetadataR\x07runtime\x12\x33\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationR\x07timeout\x12\x36\n\x07retries\x18\x05 \x01(\x0b\x32\x1c.flyteidl.core.RetryStrategyR\x07retries\x12+\n\x11\x64iscovery_version\x18\x06 \x01(\tR\x10\x64iscoveryVersion\x12\x38\n\x18\x64\x65precated_error_message\x18\x07 \x01(\tR\x16\x64\x65precatedErrorMessage\x12&\n\rinterruptible\x18\x08 \x01(\x08H\x00R\rinterruptible\x12-\n\x12\x63\x61\x63he_serializable\x18\t \x01(\x08R\x11\x63\x61\x63heSerializable\x12%\n\x0egenerates_deck\x18\n \x01(\x08R\rgeneratesDeck\x12\x39\n\x04tags\x18\x0b \x03(\x0b\x32%.flyteidl.core.TaskMetadata.TagsEntryR\x04tags\x12*\n\x11pod_template_name\x18\x0c \x01(\tR\x0fpodTemplateName\x12L\n\x11resource_metadata\x18\r \x01(\x0b\x32\x1f.flyteidl.core.ResourceMetadataR\x10resourceMetadata\x1a\x37\n\tTagsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x15\n\x13interruptible_value\"\x85\x05\n\x0cTaskTemplate\x12)\n\x02id\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x02id\x12\x12\n\x04type\x18\x02 \x01(\tR\x04type\x12\x37\n\x08metadata\x18\x03 \x01(\x0b\x32\x1b.flyteidl.core.TaskMetadataR\x08metadata\x12;\n\tinterface\x18\x04 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\tinterface\x12/\n\x06\x63ustom\x18\x05 \x01(\x0b\x32\x17.google.protobuf.StructR\x06\x63ustom\x12\x38\n\tcontainer\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ContainerH\x00R\tcontainer\x12\x30\n\x07k8s_pod\x18\x11 \x01(\x0b\x32\x15.flyteidl.core.K8sPodH\x00R\x06k8sPod\x12&\n\x03sql\x18\x12 \x01(\x0b\x32\x12.flyteidl.core.SqlH\x00R\x03sql\x12*\n\x11task_type_version\x18\x07 \x01(\x05R\x0ftaskTypeVersion\x12I\n\x10security_context\x18\x08 \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12?\n\x06\x63onfig\x18\x10 \x03(\x0b\x32\'.flyteidl.core.TaskTemplate.ConfigEntryR\x06\x63onfig\x1a\x39\n\x0b\x43onfigEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x08\n\x06target\"6\n\rContainerPort\x12%\n\x0e\x63ontainer_port\x18\x01 \x01(\rR\rcontainerPort\"\xfc\x03\n\tContainer\x12\x14\n\x05image\x18\x01 \x01(\tR\x05image\x12\x18\n\x07\x63ommand\x18\x02 \x03(\tR\x07\x63ommand\x12\x12\n\x04\x61rgs\x18\x03 \x03(\tR\x04\x61rgs\x12\x36\n\tresources\x18\x04 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x12-\n\x03\x65nv\x18\x05 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairR\x03\x65nv\x12\x37\n\x06\x63onfig\x18\x06 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairB\x02\x18\x01R\x06\x63onfig\x12\x32\n\x05ports\x18\x07 \x03(\x0b\x32\x1c.flyteidl.core.ContainerPortR\x05ports\x12\x41\n\x0b\x64\x61ta_config\x18\t \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\x12I\n\x0c\x61rchitecture\x18\n \x01(\x0e\x32%.flyteidl.core.Container.ArchitectureR\x0c\x61rchitecture\"I\n\x0c\x41rchitecture\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x41MD64\x10\x01\x12\t\n\x05\x41RM64\x10\x02\x12\n\n\x06\x41RM_V6\x10\x03\x12\n\n\x06\x41RM_V7\x10\x04\"\xb5\x02\n\nIOStrategy\x12K\n\rdownload_mode\x18\x01 \x01(\x0e\x32&.flyteidl.core.IOStrategy.DownloadModeR\x0c\x64ownloadMode\x12\x45\n\x0bupload_mode\x18\x02 \x01(\x0e\x32$.flyteidl.core.IOStrategy.UploadModeR\nuploadMode\"L\n\x0c\x44ownloadMode\x12\x12\n\x0e\x44OWNLOAD_EAGER\x10\x00\x12\x13\n\x0f\x44OWNLOAD_STREAM\x10\x01\x12\x13\n\x0f\x44O_NOT_DOWNLOAD\x10\x02\"E\n\nUploadMode\x12\x12\n\x0eUPLOAD_ON_EXIT\x10\x00\x12\x10\n\x0cUPLOAD_EAGER\x10\x01\x12\x11\n\rDO_NOT_UPLOAD\x10\x02\"\xa7\x02\n\x11\x44\x61taLoadingConfig\x12\x18\n\x07\x65nabled\x18\x01 \x01(\x08R\x07\x65nabled\x12\x1d\n\ninput_path\x18\x02 \x01(\tR\tinputPath\x12\x1f\n\x0boutput_path\x18\x03 \x01(\tR\noutputPath\x12I\n\x06\x66ormat\x18\x04 \x01(\x0e\x32\x31.flyteidl.core.DataLoadingConfig.LiteralMapFormatR\x06\x66ormat\x12:\n\x0bio_strategy\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.IOStrategyR\nioStrategy\"1\n\x10LiteralMapFormat\x12\x08\n\x04JSON\x10\x00\x12\x08\n\x04YAML\x10\x01\x12\t\n\x05PROTO\x10\x02\"\xbd\x01\n\x06K8sPod\x12<\n\x08metadata\x18\x01 \x01(\x0b\x32 .flyteidl.core.K8sObjectMetadataR\x08metadata\x12\x32\n\x08pod_spec\x18\x02 \x01(\x0b\x32\x17.google.protobuf.StructR\x07podSpec\x12\x41\n\x0b\x64\x61ta_config\x18\x03 \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\"\xa9\x02\n\x11K8sObjectMetadata\x12\x44\n\x06labels\x18\x01 \x03(\x0b\x32,.flyteidl.core.K8sObjectMetadata.LabelsEntryR\x06labels\x12S\n\x0b\x61nnotations\x18\x02 \x03(\x0b\x32\x31.flyteidl.core.K8sObjectMetadata.AnnotationsEntryR\x0b\x61nnotations\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x92\x01\n\x03Sql\x12\x1c\n\tstatement\x18\x01 \x01(\tR\tstatement\x12\x34\n\x07\x64ialect\x18\x02 \x01(\x0e\x32\x1a.flyteidl.core.Sql.DialectR\x07\x64ialect\"7\n\x07\x44ialect\x12\r\n\tUNDEFINED\x10\x00\x12\x08\n\x04\x41NSI\x10\x01\x12\x08\n\x04HIVE\x10\x02\x12\t\n\x05OTHER\x10\x03\x42\xaa\x01\n\x11\x63om.flyteidl.coreB\nTasksProtoP\x01Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x66lyteidl/core/tasks.proto\x12\rflyteidl.core\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xd0\x02\n\tResources\x12\x42\n\x08requests\x18\x01 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x08requests\x12>\n\x06limits\x18\x02 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x06limits\x1a`\n\rResourceEntry\x12\x39\n\x04name\x18\x01 \x01(\x0e\x32%.flyteidl.core.Resources.ResourceNameR\x04name\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"]\n\x0cResourceName\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x43PU\x10\x01\x12\x07\n\x03GPU\x10\x02\x12\n\n\x06MEMORY\x10\x03\x12\x0b\n\x07STORAGE\x10\x04\x12\x15\n\x11\x45PHEMERAL_STORAGE\x10\x05\"\xac\x01\n\x0fRuntimeMetadata\x12>\n\x04type\x18\x01 \x01(\x0e\x32*.flyteidl.core.RuntimeMetadata.RuntimeTypeR\x04type\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\x12\x16\n\x06\x66lavor\x18\x03 \x01(\tR\x06\x66lavor\"\'\n\x0bRuntimeType\x12\t\n\x05OTHER\x10\x00\x12\r\n\tFLYTE_SDK\x10\x01\"\x91\x01\n\x0eGPUAccelerator\x12\x16\n\x06\x64\x65vice\x18\x01 \x01(\tR\x06\x64\x65vice\x12&\n\runpartitioned\x18\x02 \x01(\x08H\x00R\runpartitioned\x12\'\n\x0epartition_size\x18\x03 \x01(\tH\x00R\rpartitionSizeB\x16\n\x14partition_size_value\"q\n\x10ResourceMetadata\x12H\n\x0fgpu_accelerator\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.GPUAcceleratorH\x00R\x0egpuAcceleratorB\x13\n\x11\x61\x63\x63\x65lerator_value\"\xc3\x05\n\x0cTaskMetadata\x12\"\n\x0c\x64iscoverable\x18\x01 \x01(\x08R\x0c\x64iscoverable\x12\x38\n\x07runtime\x18\x02 \x01(\x0b\x32\x1e.flyteidl.core.RuntimeMetadataR\x07runtime\x12\x33\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationR\x07timeout\x12\x36\n\x07retries\x18\x05 \x01(\x0b\x32\x1c.flyteidl.core.RetryStrategyR\x07retries\x12+\n\x11\x64iscovery_version\x18\x06 \x01(\tR\x10\x64iscoveryVersion\x12\x38\n\x18\x64\x65precated_error_message\x18\x07 \x01(\tR\x16\x64\x65precatedErrorMessage\x12&\n\rinterruptible\x18\x08 \x01(\x08H\x00R\rinterruptible\x12-\n\x12\x63\x61\x63he_serializable\x18\t \x01(\x08R\x11\x63\x61\x63heSerializable\x12%\n\x0egenerates_deck\x18\n \x01(\x08R\rgeneratesDeck\x12\x39\n\x04tags\x18\x0b \x03(\x0b\x32%.flyteidl.core.TaskMetadata.TagsEntryR\x04tags\x12*\n\x11pod_template_name\x18\x0c \x01(\tR\x0fpodTemplateName\x12L\n\x11resource_metadata\x18\r \x01(\x0b\x32\x1f.flyteidl.core.ResourceMetadataR\x10resourceMetadata\x1a\x37\n\tTagsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x15\n\x13interruptible_value\"\x85\x05\n\x0cTaskTemplate\x12)\n\x02id\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x02id\x12\x12\n\x04type\x18\x02 \x01(\tR\x04type\x12\x37\n\x08metadata\x18\x03 \x01(\x0b\x32\x1b.flyteidl.core.TaskMetadataR\x08metadata\x12;\n\tinterface\x18\x04 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\tinterface\x12/\n\x06\x63ustom\x18\x05 \x01(\x0b\x32\x17.google.protobuf.StructR\x06\x63ustom\x12\x38\n\tcontainer\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ContainerH\x00R\tcontainer\x12\x30\n\x07k8s_pod\x18\x11 \x01(\x0b\x32\x15.flyteidl.core.K8sPodH\x00R\x06k8sPod\x12&\n\x03sql\x18\x12 \x01(\x0b\x32\x12.flyteidl.core.SqlH\x00R\x03sql\x12*\n\x11task_type_version\x18\x07 \x01(\x05R\x0ftaskTypeVersion\x12I\n\x10security_context\x18\x08 \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12?\n\x06\x63onfig\x18\x10 \x03(\x0b\x32\'.flyteidl.core.TaskTemplate.ConfigEntryR\x06\x63onfig\x1a\x39\n\x0b\x43onfigEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x08\n\x06target\"6\n\rContainerPort\x12%\n\x0e\x63ontainer_port\x18\x01 \x01(\rR\rcontainerPort\"\xfc\x03\n\tContainer\x12\x14\n\x05image\x18\x01 \x01(\tR\x05image\x12\x18\n\x07\x63ommand\x18\x02 \x03(\tR\x07\x63ommand\x12\x12\n\x04\x61rgs\x18\x03 \x03(\tR\x04\x61rgs\x12\x36\n\tresources\x18\x04 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x12-\n\x03\x65nv\x18\x05 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairR\x03\x65nv\x12\x37\n\x06\x63onfig\x18\x06 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairB\x02\x18\x01R\x06\x63onfig\x12\x32\n\x05ports\x18\x07 \x03(\x0b\x32\x1c.flyteidl.core.ContainerPortR\x05ports\x12\x41\n\x0b\x64\x61ta_config\x18\t \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\x12I\n\x0c\x61rchitecture\x18\n \x01(\x0e\x32%.flyteidl.core.Container.ArchitectureR\x0c\x61rchitecture\"I\n\x0c\x41rchitecture\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x41MD64\x10\x01\x12\t\n\x05\x41RM64\x10\x02\x12\n\n\x06\x41RM_V6\x10\x03\x12\n\n\x06\x41RM_V7\x10\x04\"\xb5\x02\n\nIOStrategy\x12K\n\rdownload_mode\x18\x01 \x01(\x0e\x32&.flyteidl.core.IOStrategy.DownloadModeR\x0c\x64ownloadMode\x12\x45\n\x0bupload_mode\x18\x02 \x01(\x0e\x32$.flyteidl.core.IOStrategy.UploadModeR\nuploadMode\"L\n\x0c\x44ownloadMode\x12\x12\n\x0e\x44OWNLOAD_EAGER\x10\x00\x12\x13\n\x0f\x44OWNLOAD_STREAM\x10\x01\x12\x13\n\x0f\x44O_NOT_DOWNLOAD\x10\x02\"E\n\nUploadMode\x12\x12\n\x0eUPLOAD_ON_EXIT\x10\x00\x12\x10\n\x0cUPLOAD_EAGER\x10\x01\x12\x11\n\rDO_NOT_UPLOAD\x10\x02\"\xa7\x02\n\x11\x44\x61taLoadingConfig\x12\x18\n\x07\x65nabled\x18\x01 \x01(\x08R\x07\x65nabled\x12\x1d\n\ninput_path\x18\x02 \x01(\tR\tinputPath\x12\x1f\n\x0boutput_path\x18\x03 \x01(\tR\noutputPath\x12I\n\x06\x66ormat\x18\x04 \x01(\x0e\x32\x31.flyteidl.core.DataLoadingConfig.LiteralMapFormatR\x06\x66ormat\x12:\n\x0bio_strategy\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.IOStrategyR\nioStrategy\"1\n\x10LiteralMapFormat\x12\x08\n\x04JSON\x10\x00\x12\x08\n\x04YAML\x10\x01\x12\t\n\x05PROTO\x10\x02\"\xbd\x01\n\x06K8sPod\x12<\n\x08metadata\x18\x01 \x01(\x0b\x32 .flyteidl.core.K8sObjectMetadataR\x08metadata\x12\x32\n\x08pod_spec\x18\x02 \x01(\x0b\x32\x17.google.protobuf.StructR\x07podSpec\x12\x41\n\x0b\x64\x61ta_config\x18\x03 \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\"\xa9\x02\n\x11K8sObjectMetadata\x12\x44\n\x06labels\x18\x01 \x03(\x0b\x32,.flyteidl.core.K8sObjectMetadata.LabelsEntryR\x06labels\x12S\n\x0b\x61nnotations\x18\x02 \x03(\x0b\x32\x31.flyteidl.core.K8sObjectMetadata.AnnotationsEntryR\x0b\x61nnotations\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x92\x01\n\x03Sql\x12\x1c\n\tstatement\x18\x01 \x01(\tR\tstatement\x12\x34\n\x07\x64ialect\x18\x02 \x01(\x0e\x32\x1a.flyteidl.core.Sql.DialectR\x07\x64ialect\"7\n\x07\x44ialect\x12\r\n\tUNDEFINED\x10\x00\x12\x08\n\x04\x41NSI\x10\x01\x12\x08\n\x04HIVE\x10\x02\x12\t\n\x05OTHER\x10\x03\x42\xaa\x01\n\x11\x63om.flyteidl.coreB\nTasksProtoP\x01Z4github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -49,43 +49,43 @@
   _globals['_RUNTIMEMETADATA_RUNTIMETYPE']._serialized_start=702
   _globals['_RUNTIMEMETADATA_RUNTIMETYPE']._serialized_end=741
   _globals['_GPUACCELERATOR']._serialized_start=744
-  _globals['_GPUACCELERATOR']._serialized_end=878
-  _globals['_RESOURCEMETADATA']._serialized_start=880
-  _globals['_RESOURCEMETADATA']._serialized_end=987
-  _globals['_TASKMETADATA']._serialized_start=990
-  _globals['_TASKMETADATA']._serialized_end=1697
-  _globals['_TASKMETADATA_TAGSENTRY']._serialized_start=1619
-  _globals['_TASKMETADATA_TAGSENTRY']._serialized_end=1674
-  _globals['_TASKTEMPLATE']._serialized_start=1700
-  _globals['_TASKTEMPLATE']._serialized_end=2345
-  _globals['_TASKTEMPLATE_CONFIGENTRY']._serialized_start=2278
-  _globals['_TASKTEMPLATE_CONFIGENTRY']._serialized_end=2335
-  _globals['_CONTAINERPORT']._serialized_start=2347
-  _globals['_CONTAINERPORT']._serialized_end=2401
-  _globals['_CONTAINER']._serialized_start=2404
-  _globals['_CONTAINER']._serialized_end=2912
-  _globals['_CONTAINER_ARCHITECTURE']._serialized_start=2839
-  _globals['_CONTAINER_ARCHITECTURE']._serialized_end=2912
-  _globals['_IOSTRATEGY']._serialized_start=2915
-  _globals['_IOSTRATEGY']._serialized_end=3224
-  _globals['_IOSTRATEGY_DOWNLOADMODE']._serialized_start=3077
-  _globals['_IOSTRATEGY_DOWNLOADMODE']._serialized_end=3153
-  _globals['_IOSTRATEGY_UPLOADMODE']._serialized_start=3155
-  _globals['_IOSTRATEGY_UPLOADMODE']._serialized_end=3224
-  _globals['_DATALOADINGCONFIG']._serialized_start=3227
-  _globals['_DATALOADINGCONFIG']._serialized_end=3522
-  _globals['_DATALOADINGCONFIG_LITERALMAPFORMAT']._serialized_start=3473
-  _globals['_DATALOADINGCONFIG_LITERALMAPFORMAT']._serialized_end=3522
-  _globals['_K8SPOD']._serialized_start=3525
-  _globals['_K8SPOD']._serialized_end=3714
-  _globals['_K8SOBJECTMETADATA']._serialized_start=3717
-  _globals['_K8SOBJECTMETADATA']._serialized_end=4014
-  _globals['_K8SOBJECTMETADATA_LABELSENTRY']._serialized_start=3893
-  _globals['_K8SOBJECTMETADATA_LABELSENTRY']._serialized_end=3950
-  _globals['_K8SOBJECTMETADATA_ANNOTATIONSENTRY']._serialized_start=3952
-  _globals['_K8SOBJECTMETADATA_ANNOTATIONSENTRY']._serialized_end=4014
-  _globals['_SQL']._serialized_start=4017
-  _globals['_SQL']._serialized_end=4163
-  _globals['_SQL_DIALECT']._serialized_start=4108
-  _globals['_SQL_DIALECT']._serialized_end=4163
+  _globals['_GPUACCELERATOR']._serialized_end=889
+  _globals['_RESOURCEMETADATA']._serialized_start=891
+  _globals['_RESOURCEMETADATA']._serialized_end=1004
+  _globals['_TASKMETADATA']._serialized_start=1007
+  _globals['_TASKMETADATA']._serialized_end=1714
+  _globals['_TASKMETADATA_TAGSENTRY']._serialized_start=1636
+  _globals['_TASKMETADATA_TAGSENTRY']._serialized_end=1691
+  _globals['_TASKTEMPLATE']._serialized_start=1717
+  _globals['_TASKTEMPLATE']._serialized_end=2362
+  _globals['_TASKTEMPLATE_CONFIGENTRY']._serialized_start=2295
+  _globals['_TASKTEMPLATE_CONFIGENTRY']._serialized_end=2352
+  _globals['_CONTAINERPORT']._serialized_start=2364
+  _globals['_CONTAINERPORT']._serialized_end=2418
+  _globals['_CONTAINER']._serialized_start=2421
+  _globals['_CONTAINER']._serialized_end=2929
+  _globals['_CONTAINER_ARCHITECTURE']._serialized_start=2856
+  _globals['_CONTAINER_ARCHITECTURE']._serialized_end=2929
+  _globals['_IOSTRATEGY']._serialized_start=2932
+  _globals['_IOSTRATEGY']._serialized_end=3241
+  _globals['_IOSTRATEGY_DOWNLOADMODE']._serialized_start=3094
+  _globals['_IOSTRATEGY_DOWNLOADMODE']._serialized_end=3170
+  _globals['_IOSTRATEGY_UPLOADMODE']._serialized_start=3172
+  _globals['_IOSTRATEGY_UPLOADMODE']._serialized_end=3241
+  _globals['_DATALOADINGCONFIG']._serialized_start=3244
+  _globals['_DATALOADINGCONFIG']._serialized_end=3539
+  _globals['_DATALOADINGCONFIG_LITERALMAPFORMAT']._serialized_start=3490
+  _globals['_DATALOADINGCONFIG_LITERALMAPFORMAT']._serialized_end=3539
+  _globals['_K8SPOD']._serialized_start=3542
+  _globals['_K8SPOD']._serialized_end=3731
+  _globals['_K8SOBJECTMETADATA']._serialized_start=3734
+  _globals['_K8SOBJECTMETADATA']._serialized_end=4031
+  _globals['_K8SOBJECTMETADATA_LABELSENTRY']._serialized_start=3910
+  _globals['_K8SOBJECTMETADATA_LABELSENTRY']._serialized_end=3967
+  _globals['_K8SOBJECTMETADATA_ANNOTATIONSENTRY']._serialized_start=3969
+  _globals['_K8SOBJECTMETADATA_ANNOTATIONSENTRY']._serialized_end=4031
+  _globals['_SQL']._serialized_start=4034
+  _globals['_SQL']._serialized_end=4180
+  _globals['_SQL_DIALECT']._serialized_start=4125
+  _globals['_SQL_DIALECT']._serialized_end=4180
 # @@protoc_insertion_point(module_scope)
diff --git a/gen/pb_rust/flyteidl.core.rs b/gen/pb_rust/flyteidl.core.rs
index f0cb24a02..34a1c6c8a 100644
--- a/gen/pb_rust/flyteidl.core.rs
+++ b/gen/pb_rust/flyteidl.core.rs
@@ -1028,14 +1028,14 @@ pub mod runtime_metadata {
 pub struct GpuAccelerator {
     #[prost(string, tag="1")]
     pub device: ::prost::alloc::string::String,
-    #[prost(oneof="gpu_accelerator::Partition", tags="2, 3")]
-    pub partition: ::core::option::Option<gpu_accelerator::Partition>,
+    #[prost(oneof="gpu_accelerator::PartitionSizeValue", tags="2, 3")]
+    pub partition_size_value: ::core::option::Option<gpu_accelerator::PartitionSizeValue>,
 }
 /// Nested message and enum types in `GPUAccelerator`.
 pub mod gpu_accelerator {
     #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Partition {
+    pub enum PartitionSizeValue {
         #[prost(bool, tag="2")]
         Unpartitioned(bool),
         #[prost(string, tag="3")]
@@ -1046,14 +1046,14 @@ pub mod gpu_accelerator {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResourceMetadata {
-    #[prost(oneof="resource_metadata::Accelerator", tags="1")]
-    pub accelerator: ::core::option::Option<resource_metadata::Accelerator>,
+    #[prost(oneof="resource_metadata::AcceleratorValue", tags="1")]
+    pub accelerator_value: ::core::option::Option<resource_metadata::AcceleratorValue>,
 }
 /// Nested message and enum types in `ResourceMetadata`.
 pub mod resource_metadata {
     #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Accelerator {
+    pub enum AcceleratorValue {
         #[prost(message, tag="1")]
         GpuAccelerator(super::GpuAccelerator),
     }
diff --git a/protos/flyteidl/core/tasks.proto b/protos/flyteidl/core/tasks.proto
index 23845cdec..72573d585 100644
--- a/protos/flyteidl/core/tasks.proto
+++ b/protos/flyteidl/core/tasks.proto
@@ -64,7 +64,7 @@ message RuntimeMetadata {
 // Metadata associated with the GPU accelerator to allocate to a task
 message GPUAccelerator {
     string device = 1;
-    oneof partition {
+    oneof partition_size_value {
         bool unpartitioned = 2;
         string partition_size = 3;
     }
@@ -72,7 +72,7 @@ message GPUAccelerator {
 
 // Additional metadata associated with resources to allocate to a task
 message ResourceMetadata {
-    oneof accelerator {
+    oneof accelerator_value {
         GPUAccelerator gpu_accelerator = 1;
     }
 }