diff --git a/flyteidl/clients/go/coreutils/extract_literal_test.go b/flyteidl/clients/go/coreutils/extract_literal_test.go
index 588539c1e42..760e7bee0a2 100644
--- a/flyteidl/clients/go/coreutils/extract_literal_test.go
+++ b/flyteidl/clients/go/coreutils/extract_literal_test.go
@@ -202,25 +202,24 @@ func TestFetchLiteral(t *testing.T) {
 
 	t.Run("Offloaded metadata", func(t *testing.T) {
 		literalVal := "s3://blah/blah/blah"
-		var literalType = &core.LiteralType{
-			Type: &core.LiteralType_OffloadedType{
-				OffloadedType: &core.OffloadedType{
-					ActualLiteralType: &core.LiteralType{
-						Type: &core.LiteralType_CollectionType{
-							CollectionType: &core.LiteralType{
-								Type: &core.LiteralType_Simple{
-									Simple: core.SimpleType_INTEGER,
-								},
-							},
-						},
+		var storedLiteralType = &core.LiteralType{
+			Type: &core.LiteralType_CollectionType{
+				CollectionType: &core.LiteralType{
+					Type: &core.LiteralType_Simple{
+						Simple: core.SimpleType_INTEGER,
 					},
 				},
 			},
 		}
-		lit, err := MakeLiteralForType(literalType, literalVal)
-
-		assert.NoError(t, err)
-		extractedLiteralVal, err := ExtractFromLiteral(lit)
+		offloadedLiteral := &core.Literal{
+			Value: &core.Literal_OffloadedMetadata{
+				OffloadedMetadata: &core.LiteralOffloadedMetadata{
+					Uri:          literalVal,
+					InferredType: storedLiteralType,
+				},
+			},
+		}
+		extractedLiteralVal, err := ExtractFromLiteral(offloadedLiteral)
 		assert.NoError(t, err)
 		assert.Equal(t, literalVal, extractedLiteralVal)
 	})
diff --git a/flyteidl/clients/go/coreutils/literals.go b/flyteidl/clients/go/coreutils/literals.go
index ed1014c7ff1..278fa30dfcb 100644
--- a/flyteidl/clients/go/coreutils/literals.go
+++ b/flyteidl/clients/go/coreutils/literals.go
@@ -636,14 +636,6 @@ func MakeLiteralForType(t *core.LiteralType, v interface{}) (*core.Literal, erro
 		if !found {
 			return nil, fmt.Errorf("incorrect union value [%s], supported values %+v", v, newT.UnionType.Variants)
 		}
-	case *core.LiteralType_OffloadedType:
-		// This is a special type that is used to represent a literal that is offloaded to a remote store.
-		// The value here is the URI of the offloaded data.
-		l.Value = &core.Literal_OffloadedMetadata{
-			OffloadedMetadata: &core.LiteralOffloadedMetadata{
-				Uri: fmt.Sprintf("%v", v),
-			},
-		}
 	default:
 		return nil, fmt.Errorf("unsupported type %s", t.String())
 	}
diff --git a/flyteidl/gen/pb-es/flyteidl/core/types_pb.ts b/flyteidl/gen/pb-es/flyteidl/core/types_pb.ts
index 394ea67f678..f311fa0692b 100644
--- a/flyteidl/gen/pb-es/flyteidl/core/types_pb.ts
+++ b/flyteidl/gen/pb-es/flyteidl/core/types_pb.ts
@@ -486,47 +486,6 @@ export class UnionType extends Message<UnionType> {
   }
 }
 
-/**
- * Enabled checking for offloaded literal type and getting the info about the store literal type.
- *
- * @generated from message flyteidl.core.OffloadedType
- */
-export class OffloadedType extends Message<OffloadedType> {
-  /**
-   * Type of actual literal stored at the offloaded location
-   *
-   * @generated from field: flyteidl.core.LiteralType actual_literal_type = 1;
-   */
-  actualLiteralType?: LiteralType;
-
-  constructor(data?: PartialMessage<OffloadedType>) {
-    super();
-    proto3.util.initPartial(data, this);
-  }
-
-  static readonly runtime: typeof proto3 = proto3;
-  static readonly typeName = "flyteidl.core.OffloadedType";
-  static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "actual_literal_type", kind: "message", T: LiteralType },
-  ]);
-
-  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): OffloadedType {
-    return new OffloadedType().fromBinary(bytes, options);
-  }
-
-  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): OffloadedType {
-    return new OffloadedType().fromJson(jsonValue, options);
-  }
-
-  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): OffloadedType {
-    return new OffloadedType().fromJsonString(jsonString, options);
-  }
-
-  static equals(a: OffloadedType | PlainMessage<OffloadedType> | undefined, b: OffloadedType | PlainMessage<OffloadedType> | undefined): boolean {
-    return proto3.util.equals(OffloadedType, a, b);
-  }
-}
-
 /**
  * Hints to improve type matching
  * e.g. allows distinguishing output from custom type transformers
@@ -696,14 +655,6 @@ export class LiteralType extends Message<LiteralType> {
      */
     value: UnionType;
     case: "unionType";
-  } | {
-    /**
-     * Defines the offload literal type which stores the info about the actual stored literal type.
-     *
-     * @generated from field: flyteidl.core.OffloadedType offloaded_type = 12;
-     */
-    value: OffloadedType;
-    case: "offloadedType";
   } | { case: undefined; value?: undefined } = { case: undefined };
 
   /**
@@ -745,7 +696,6 @@ export class LiteralType extends Message<LiteralType> {
     { no: 7, name: "enum_type", kind: "message", T: EnumType, oneof: "type" },
     { no: 8, name: "structured_dataset_type", kind: "message", T: StructuredDatasetType, oneof: "type" },
     { no: 10, name: "union_type", kind: "message", T: UnionType, oneof: "type" },
-    { no: 12, name: "offloaded_type", kind: "message", T: OffloadedType, oneof: "type" },
     { no: 6, name: "metadata", kind: "message", T: Struct },
     { no: 9, name: "annotation", kind: "message", T: TypeAnnotation },
     { no: 11, name: "structure", kind: "message", T: TypeStructure },
diff --git a/flyteidl/gen/pb-go/flyteidl/core/types.pb.go b/flyteidl/gen/pb-go/flyteidl/core/types.pb.go
index 32d01b09ab0..b844e951c93 100644
--- a/flyteidl/gen/pb-go/flyteidl/core/types.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/core/types.pb.go
@@ -494,55 +494,6 @@ func (x *UnionType) GetVariants() []*LiteralType {
 	return nil
 }
 
-// Enabled checking for offloaded literal type and getting the info about the store literal type.
-type OffloadedType struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type of actual literal stored at the offloaded location
-	ActualLiteralType *LiteralType `protobuf:"bytes,1,opt,name=actual_literal_type,json=actualLiteralType,proto3" json:"actual_literal_type,omitempty"`
-}
-
-func (x *OffloadedType) Reset() {
-	*x = OffloadedType{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OffloadedType) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OffloadedType) ProtoMessage() {}
-
-func (x *OffloadedType) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OffloadedType.ProtoReflect.Descriptor instead.
-func (*OffloadedType) Descriptor() ([]byte, []int) {
-	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *OffloadedType) GetActualLiteralType() *LiteralType {
-	if x != nil {
-		return x.ActualLiteralType
-	}
-	return nil
-}
-
 // Hints to improve type matching
 // e.g. allows distinguishing output from custom type transformers
 // even if the underlying IDL serialization matches.
@@ -564,7 +515,7 @@ type TypeStructure struct {
 func (x *TypeStructure) Reset() {
 	*x = TypeStructure{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[6]
+		mi := &file_flyteidl_core_types_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -577,7 +528,7 @@ func (x *TypeStructure) String() string {
 func (*TypeStructure) ProtoMessage() {}
 
 func (x *TypeStructure) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[6]
+	mi := &file_flyteidl_core_types_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -590,7 +541,7 @@ func (x *TypeStructure) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TypeStructure.ProtoReflect.Descriptor instead.
 func (*TypeStructure) Descriptor() ([]byte, []int) {
-	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{6}
+	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *TypeStructure) GetTag() string {
@@ -620,7 +571,7 @@ type TypeAnnotation struct {
 func (x *TypeAnnotation) Reset() {
 	*x = TypeAnnotation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[7]
+		mi := &file_flyteidl_core_types_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -633,7 +584,7 @@ func (x *TypeAnnotation) String() string {
 func (*TypeAnnotation) ProtoMessage() {}
 
 func (x *TypeAnnotation) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[7]
+	mi := &file_flyteidl_core_types_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -646,7 +597,7 @@ func (x *TypeAnnotation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TypeAnnotation.ProtoReflect.Descriptor instead.
 func (*TypeAnnotation) Descriptor() ([]byte, []int) {
-	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{7}
+	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *TypeAnnotation) GetAnnotations() *structpb.Struct {
@@ -672,7 +623,6 @@ type LiteralType struct {
 	//	*LiteralType_EnumType
 	//	*LiteralType_StructuredDatasetType
 	//	*LiteralType_UnionType
-	//	*LiteralType_OffloadedType
 	Type isLiteralType_Type `protobuf_oneof:"type"`
 	// This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by
 	// consumers to identify special behavior or display extended information for the type.
@@ -687,7 +637,7 @@ type LiteralType struct {
 func (x *LiteralType) Reset() {
 	*x = LiteralType{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[8]
+		mi := &file_flyteidl_core_types_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -700,7 +650,7 @@ func (x *LiteralType) String() string {
 func (*LiteralType) ProtoMessage() {}
 
 func (x *LiteralType) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[8]
+	mi := &file_flyteidl_core_types_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -713,7 +663,7 @@ func (x *LiteralType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LiteralType.ProtoReflect.Descriptor instead.
 func (*LiteralType) Descriptor() ([]byte, []int) {
-	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{8}
+	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{7}
 }
 
 func (m *LiteralType) GetType() isLiteralType_Type {
@@ -779,13 +729,6 @@ func (x *LiteralType) GetUnionType() *UnionType {
 	return nil
 }
 
-func (x *LiteralType) GetOffloadedType() *OffloadedType {
-	if x, ok := x.GetType().(*LiteralType_OffloadedType); ok {
-		return x.OffloadedType
-	}
-	return nil
-}
-
 func (x *LiteralType) GetMetadata() *structpb.Struct {
 	if x != nil {
 		return x.Metadata
@@ -851,11 +794,6 @@ type LiteralType_UnionType struct {
 	UnionType *UnionType `protobuf:"bytes,10,opt,name=union_type,json=unionType,proto3,oneof"`
 }
 
-type LiteralType_OffloadedType struct {
-	// Defines the offload literal type which stores the info about the actual stored literal type.
-	OffloadedType *OffloadedType `protobuf:"bytes,12,opt,name=offloaded_type,json=offloadedType,proto3,oneof"`
-}
-
 func (*LiteralType_Simple) isLiteralType_Type() {}
 
 func (*LiteralType_Schema) isLiteralType_Type() {}
@@ -872,8 +810,6 @@ func (*LiteralType_StructuredDatasetType) isLiteralType_Type() {}
 
 func (*LiteralType_UnionType) isLiteralType_Type() {}
 
-func (*LiteralType_OffloadedType) isLiteralType_Type() {}
-
 // A reference to an output produced by a node. The type can be retrieved -and validated- from
 // the underlying interface of the node.
 type OutputReference struct {
@@ -891,7 +827,7 @@ type OutputReference struct {
 func (x *OutputReference) Reset() {
 	*x = OutputReference{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[9]
+		mi := &file_flyteidl_core_types_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -904,7 +840,7 @@ func (x *OutputReference) String() string {
 func (*OutputReference) ProtoMessage() {}
 
 func (x *OutputReference) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[9]
+	mi := &file_flyteidl_core_types_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -917,7 +853,7 @@ func (x *OutputReference) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OutputReference.ProtoReflect.Descriptor instead.
 func (*OutputReference) Descriptor() ([]byte, []int) {
-	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{9}
+	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *OutputReference) GetNodeId() string {
@@ -956,7 +892,7 @@ type PromiseAttribute struct {
 func (x *PromiseAttribute) Reset() {
 	*x = PromiseAttribute{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[10]
+		mi := &file_flyteidl_core_types_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -969,7 +905,7 @@ func (x *PromiseAttribute) String() string {
 func (*PromiseAttribute) ProtoMessage() {}
 
 func (x *PromiseAttribute) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[10]
+	mi := &file_flyteidl_core_types_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -982,7 +918,7 @@ func (x *PromiseAttribute) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PromiseAttribute.ProtoReflect.Descriptor instead.
 func (*PromiseAttribute) Descriptor() ([]byte, []int) {
-	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{10}
+	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{9}
 }
 
 func (m *PromiseAttribute) GetValue() isPromiseAttribute_Value {
@@ -1037,7 +973,7 @@ type Error struct {
 func (x *Error) Reset() {
 	*x = Error{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[11]
+		mi := &file_flyteidl_core_types_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1050,7 +986,7 @@ func (x *Error) String() string {
 func (*Error) ProtoMessage() {}
 
 func (x *Error) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[11]
+	mi := &file_flyteidl_core_types_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1063,7 +999,7 @@ func (x *Error) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Error.ProtoReflect.Descriptor instead.
 func (*Error) Descriptor() ([]byte, []int) {
-	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{11}
+	return file_flyteidl_core_types_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *Error) GetFailedNodeId() string {
@@ -1094,7 +1030,7 @@ type SchemaType_SchemaColumn struct {
 func (x *SchemaType_SchemaColumn) Reset() {
 	*x = SchemaType_SchemaColumn{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[12]
+		mi := &file_flyteidl_core_types_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1107,7 +1043,7 @@ func (x *SchemaType_SchemaColumn) String() string {
 func (*SchemaType_SchemaColumn) ProtoMessage() {}
 
 func (x *SchemaType_SchemaColumn) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[12]
+	mi := &file_flyteidl_core_types_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1151,7 +1087,7 @@ type StructuredDatasetType_DatasetColumn struct {
 func (x *StructuredDatasetType_DatasetColumn) Reset() {
 	*x = StructuredDatasetType_DatasetColumn{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_flyteidl_core_types_proto_msgTypes[13]
+		mi := &file_flyteidl_core_types_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1164,7 +1100,7 @@ func (x *StructuredDatasetType_DatasetColumn) String() string {
 func (*StructuredDatasetType_DatasetColumn) ProtoMessage() {}
 
 func (x *StructuredDatasetType_DatasetColumn) ProtoReflect() protoreflect.Message {
-	mi := &file_flyteidl_core_types_proto_msgTypes[13]
+	mi := &file_flyteidl_core_types_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1257,118 +1193,108 @@ var file_flyteidl_core_types_proto_rawDesc = []byte{
 	0x65, 0x12, 0x36, 0x0a, 0x08, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63,
 	0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x52,
-	0x08, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x73, 0x22, 0x5b, 0x0a, 0x0d, 0x4f, 0x66, 0x66,
-	0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x4a, 0x0a, 0x13, 0x61, 0x63,
-	0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x5f, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69,
-	0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54,
-	0x79, 0x70, 0x65, 0x52, 0x11, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x4c, 0x69, 0x74, 0x65, 0x72,
-	0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x22, 0xd7, 0x01, 0x0a, 0x0d, 0x54, 0x79, 0x70, 0x65, 0x53,
-	0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x56, 0x0a, 0x0e, 0x64, 0x61,
-	0x74, 0x61, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65,
-	0x2e, 0x44, 0x61, 0x74, 0x61, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x0d, 0x64, 0x61, 0x74, 0x61, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x54, 0x79,
-	0x70, 0x65, 0x1a, 0x5c, 0x0a, 0x12, 0x44, 0x61, 0x74, 0x61, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x54,
-	0x79, 0x70, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x30, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x66, 0x6c, 0x79, 0x74,
+	0x08, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x73, 0x22, 0xd7, 0x01, 0x0a, 0x0d, 0x54, 0x79,
+	0x70, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74,
+	0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x56, 0x0a,
+	0x0e, 0x64, 0x61, 0x74, 0x61, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
+	0x75, 0x72, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x54, 0x79, 0x70,
+	0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x64, 0x61, 0x74, 0x61, 0x63, 0x6c, 0x61, 0x73,
+	0x73, 0x54, 0x79, 0x70, 0x65, 0x1a, 0x5c, 0x0a, 0x12, 0x44, 0x61, 0x74, 0x61, 0x63, 0x6c, 0x61,
+	0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x30, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x66,
+	0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x74,
+	0x65, 0x72, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x4b, 0x0a, 0x0e, 0x54, 0x79, 0x70, 0x65, 0x41, 0x6e, 0x6e, 0x6f, 0x74,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72,
+	0x75, 0x63, 0x74, 0x52, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x22, 0xbc, 0x05, 0x0a, 0x0b, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x33, 0x0a, 0x06, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x19, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x06, 0x73,
+	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c,
+	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x54, 0x79, 0x70, 0x65,
+	0x48, 0x00, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x45, 0x0a, 0x0f, 0x63, 0x6f,
+	0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x48,
+	0x00, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x42, 0x0a, 0x0e, 0x6d, 0x61, 0x70, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x66, 0x6c, 0x79, 0x74,
 	0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61,
-	0x6c, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0x4b, 0x0a, 0x0e, 0x54, 0x79, 0x70, 0x65, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x52, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x83, 0x06,
-	0x0a, 0x0b, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a,
-	0x06, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e,
-	0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x69,
-	0x6d, 0x70, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x06, 0x73, 0x69, 0x6d, 0x70,
-	0x6c, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52,
-	0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x45, 0x0a, 0x0f, 0x63, 0x6f, 0x6c, 0x6c, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0e,
-	0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x42,
-	0x0a, 0x0e, 0x6d, 0x61, 0x70, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64,
-	0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54, 0x79,
-	0x70, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x6d, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x17, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65,
-	0x2e, 0x42, 0x6c, 0x6f, 0x62, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x04, 0x62, 0x6c, 0x6f,
-	0x62, 0x12, 0x36, 0x0a, 0x09, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52,
-	0x08, 0x65, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x5e, 0x0a, 0x17, 0x73, 0x74, 0x72,
-	0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x5f,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x66, 0x6c, 0x79,
-	0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63,
-	0x74, 0x75, 0x72, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65,
-	0x48, 0x00, 0x52, 0x15, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x44, 0x61,
-	0x74, 0x61, 0x73, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x39, 0x0a, 0x0a, 0x75, 0x6e, 0x69,
-	0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e,
-	0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x55, 0x6e,
-	0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x75, 0x6e, 0x69, 0x6f, 0x6e,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x0e, 0x6f, 0x66, 0x66, 0x6c, 0x6f, 0x61, 0x64, 0x65,
-	0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x66,
-	0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x4f, 0x66, 0x66,
-	0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x6f, 0x66,
-	0x66, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a, 0x08, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0x12, 0x3d, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x3a, 0x0a, 0x09, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65,
-	0x52, 0x09, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x22, 0x7a, 0x0a, 0x0f, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x52, 0x65, 0x66,
-	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12,
-	0x10, 0x0a, 0x03, 0x76, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x76, 0x61,
-	0x72, 0x12, 0x3c, 0x0a, 0x09, 0x61, 0x74, 0x74, 0x72, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x65, 0x41, 0x74, 0x74, 0x72,
-	0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x08, 0x61, 0x74, 0x74, 0x72, 0x50, 0x61, 0x74, 0x68, 0x22,
-	0x5f, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62,
-	0x75, 0x74, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x08, 0x69,
-	0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x22, 0x47, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x24, 0x0a, 0x0e, 0x66, 0x61, 0x69,
-	0x6c, 0x65, 0x64, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12,
-	0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a, 0x86, 0x01, 0x0a, 0x0a, 0x53, 0x69,
-	0x6d, 0x70, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45,
-	0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x10, 0x01, 0x12,
-	0x09, 0x0a, 0x05, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54,
-	0x52, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x4f, 0x4f, 0x4c, 0x45, 0x41,
-	0x4e, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x41, 0x54, 0x45, 0x54, 0x49, 0x4d, 0x45, 0x10,
-	0x05, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x06, 0x12,
-	0x0a, 0x0a, 0x06, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x45,
-	0x52, 0x52, 0x4f, 0x52, 0x10, 0x08, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x55, 0x43, 0x54,
-	0x10, 0x09, 0x42, 0xb0, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65,
-	0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x6f, 0x72, 0x67, 0x2f, 0x66, 0x6c, 0x79, 0x74,
-	0x65, 0x2f, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70,
-	0x62, 0x2d, 0x67, 0x6f, 0x2f, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2f, 0x63, 0x6f,
-	0x72, 0x65, 0xa2, 0x02, 0x03, 0x46, 0x43, 0x58, 0xaa, 0x02, 0x0d, 0x46, 0x6c, 0x79, 0x74, 0x65,
-	0x69, 0x64, 0x6c, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0xca, 0x02, 0x0d, 0x46, 0x6c, 0x79, 0x74, 0x65,
-	0x69, 0x64, 0x6c, 0x5c, 0x43, 0x6f, 0x72, 0x65, 0xe2, 0x02, 0x19, 0x46, 0x6c, 0x79, 0x74, 0x65,
-	0x69, 0x64, 0x6c, 0x5c, 0x43, 0x6f, 0x72, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x46, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x3a,
-	0x3a, 0x43, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6c, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x6d, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x42, 0x6c, 0x6f, 0x62, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x04,
+	0x62, 0x6c, 0x6f, 0x62, 0x12, 0x36, 0x0a, 0x09, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x74, 0x79, 0x70,
+	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69,
+	0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65,
+	0x48, 0x00, 0x52, 0x08, 0x65, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x5e, 0x0a, 0x17,
+	0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x73,
+	0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e,
+	0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x74,
+	0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x15, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65,
+	0x64, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x39, 0x0a, 0x0a,
+	0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x18, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x75, 0x6e,
+	0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75,
+	0x63, 0x74, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x3d, 0x0a, 0x0a,
+	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1d, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73,
+	0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
+	0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54,
+	0x79, 0x70, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x52, 0x09, 0x73, 0x74,
+	0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22,
+	0x7a, 0x0a, 0x0f, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+	0x63, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76,
+	0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x76, 0x61, 0x72, 0x12, 0x3c, 0x0a,
+	0x09, 0x61, 0x74, 0x74, 0x72, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x1f, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x50, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
+	0x65, 0x52, 0x08, 0x61, 0x74, 0x74, 0x72, 0x50, 0x61, 0x74, 0x68, 0x22, 0x5f, 0x0a, 0x10, 0x50,
+	0x72, 0x6f, 0x6d, 0x69, 0x73, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x12,
+	0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x47, 0x0a, 0x05,
+	0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x24, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f,
+	0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x66,
+	0x61, 0x69, 0x6c, 0x65, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x2a, 0x86, 0x01, 0x0a, 0x0a, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0b,
+	0x0a, 0x07, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x46,
+	0x4c, 0x4f, 0x41, 0x54, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47,
+	0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x4f, 0x4f, 0x4c, 0x45, 0x41, 0x4e, 0x10, 0x04, 0x12,
+	0x0c, 0x0a, 0x08, 0x44, 0x41, 0x54, 0x45, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x05, 0x12, 0x0c, 0x0a,
+	0x08, 0x44, 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x06, 0x12, 0x0a, 0x0a, 0x06, 0x42,
+	0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52,
+	0x10, 0x08, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x55, 0x43, 0x54, 0x10, 0x09, 0x42, 0xb0,
+	0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x42, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x66,
+	0x6c, 0x79, 0x74, 0x65, 0x6f, 0x72, 0x67, 0x2f, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x2f, 0x66, 0x6c,
+	0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x62, 0x2d, 0x67, 0x6f,
+	0x2f, 0x66, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0xa2, 0x02,
+	0x03, 0x46, 0x43, 0x58, 0xaa, 0x02, 0x0d, 0x46, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x2e,
+	0x43, 0x6f, 0x72, 0x65, 0xca, 0x02, 0x0d, 0x46, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x5c,
+	0x43, 0x6f, 0x72, 0x65, 0xe2, 0x02, 0x19, 0x46, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x5c,
+	0x43, 0x6f, 0x72, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0xea, 0x02, 0x0e, 0x46, 0x6c, 0x79, 0x74, 0x65, 0x69, 0x64, 0x6c, 0x3a, 0x3a, 0x43, 0x6f, 0x72,
+	0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1384,7 +1310,7 @@ func file_flyteidl_core_types_proto_rawDescGZIP() []byte {
 }
 
 var file_flyteidl_core_types_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_flyteidl_core_types_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_flyteidl_core_types_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_flyteidl_core_types_proto_goTypes = []interface{}{
 	(SimpleType)(0), // 0: flyteidl.core.SimpleType
 	(SchemaType_SchemaColumn_SchemaColumnType)(0), // 1: flyteidl.core.SchemaType.SchemaColumn.SchemaColumnType
@@ -1394,47 +1320,44 @@ var file_flyteidl_core_types_proto_goTypes = []interface{}{
 	(*BlobType)(nil),                              // 5: flyteidl.core.BlobType
 	(*EnumType)(nil),                              // 6: flyteidl.core.EnumType
 	(*UnionType)(nil),                             // 7: flyteidl.core.UnionType
-	(*OffloadedType)(nil),                         // 8: flyteidl.core.OffloadedType
-	(*TypeStructure)(nil),                         // 9: flyteidl.core.TypeStructure
-	(*TypeAnnotation)(nil),                        // 10: flyteidl.core.TypeAnnotation
-	(*LiteralType)(nil),                           // 11: flyteidl.core.LiteralType
-	(*OutputReference)(nil),                       // 12: flyteidl.core.OutputReference
-	(*PromiseAttribute)(nil),                      // 13: flyteidl.core.PromiseAttribute
-	(*Error)(nil),                                 // 14: flyteidl.core.Error
-	(*SchemaType_SchemaColumn)(nil),               // 15: flyteidl.core.SchemaType.SchemaColumn
-	(*StructuredDatasetType_DatasetColumn)(nil),   // 16: flyteidl.core.StructuredDatasetType.DatasetColumn
-	nil,                     // 17: flyteidl.core.TypeStructure.DataclassTypeEntry
-	(*structpb.Struct)(nil), // 18: google.protobuf.Struct
+	(*TypeStructure)(nil),                         // 8: flyteidl.core.TypeStructure
+	(*TypeAnnotation)(nil),                        // 9: flyteidl.core.TypeAnnotation
+	(*LiteralType)(nil),                           // 10: flyteidl.core.LiteralType
+	(*OutputReference)(nil),                       // 11: flyteidl.core.OutputReference
+	(*PromiseAttribute)(nil),                      // 12: flyteidl.core.PromiseAttribute
+	(*Error)(nil),                                 // 13: flyteidl.core.Error
+	(*SchemaType_SchemaColumn)(nil),               // 14: flyteidl.core.SchemaType.SchemaColumn
+	(*StructuredDatasetType_DatasetColumn)(nil),   // 15: flyteidl.core.StructuredDatasetType.DatasetColumn
+	nil,                     // 16: flyteidl.core.TypeStructure.DataclassTypeEntry
+	(*structpb.Struct)(nil), // 17: google.protobuf.Struct
 }
 var file_flyteidl_core_types_proto_depIdxs = []int32{
-	15, // 0: flyteidl.core.SchemaType.columns:type_name -> flyteidl.core.SchemaType.SchemaColumn
-	16, // 1: flyteidl.core.StructuredDatasetType.columns:type_name -> flyteidl.core.StructuredDatasetType.DatasetColumn
+	14, // 0: flyteidl.core.SchemaType.columns:type_name -> flyteidl.core.SchemaType.SchemaColumn
+	15, // 1: flyteidl.core.StructuredDatasetType.columns:type_name -> flyteidl.core.StructuredDatasetType.DatasetColumn
 	2,  // 2: flyteidl.core.BlobType.dimensionality:type_name -> flyteidl.core.BlobType.BlobDimensionality
-	11, // 3: flyteidl.core.UnionType.variants:type_name -> flyteidl.core.LiteralType
-	11, // 4: flyteidl.core.OffloadedType.actual_literal_type:type_name -> flyteidl.core.LiteralType
-	17, // 5: flyteidl.core.TypeStructure.dataclass_type:type_name -> flyteidl.core.TypeStructure.DataclassTypeEntry
-	18, // 6: flyteidl.core.TypeAnnotation.annotations:type_name -> google.protobuf.Struct
-	0,  // 7: flyteidl.core.LiteralType.simple:type_name -> flyteidl.core.SimpleType
-	3,  // 8: flyteidl.core.LiteralType.schema:type_name -> flyteidl.core.SchemaType
-	11, // 9: flyteidl.core.LiteralType.collection_type:type_name -> flyteidl.core.LiteralType
-	11, // 10: flyteidl.core.LiteralType.map_value_type:type_name -> flyteidl.core.LiteralType
-	5,  // 11: flyteidl.core.LiteralType.blob:type_name -> flyteidl.core.BlobType
-	6,  // 12: flyteidl.core.LiteralType.enum_type:type_name -> flyteidl.core.EnumType
-	4,  // 13: flyteidl.core.LiteralType.structured_dataset_type:type_name -> flyteidl.core.StructuredDatasetType
-	7,  // 14: flyteidl.core.LiteralType.union_type:type_name -> flyteidl.core.UnionType
-	8,  // 15: flyteidl.core.LiteralType.offloaded_type:type_name -> flyteidl.core.OffloadedType
-	18, // 16: flyteidl.core.LiteralType.metadata:type_name -> google.protobuf.Struct
-	10, // 17: flyteidl.core.LiteralType.annotation:type_name -> flyteidl.core.TypeAnnotation
-	9,  // 18: flyteidl.core.LiteralType.structure:type_name -> flyteidl.core.TypeStructure
-	13, // 19: flyteidl.core.OutputReference.attr_path:type_name -> flyteidl.core.PromiseAttribute
-	1,  // 20: flyteidl.core.SchemaType.SchemaColumn.type:type_name -> flyteidl.core.SchemaType.SchemaColumn.SchemaColumnType
-	11, // 21: flyteidl.core.StructuredDatasetType.DatasetColumn.literal_type:type_name -> flyteidl.core.LiteralType
-	11, // 22: flyteidl.core.TypeStructure.DataclassTypeEntry.value:type_name -> flyteidl.core.LiteralType
-	23, // [23:23] is the sub-list for method output_type
-	23, // [23:23] is the sub-list for method input_type
-	23, // [23:23] is the sub-list for extension type_name
-	23, // [23:23] is the sub-list for extension extendee
-	0,  // [0:23] is the sub-list for field type_name
+	10, // 3: flyteidl.core.UnionType.variants:type_name -> flyteidl.core.LiteralType
+	16, // 4: flyteidl.core.TypeStructure.dataclass_type:type_name -> flyteidl.core.TypeStructure.DataclassTypeEntry
+	17, // 5: flyteidl.core.TypeAnnotation.annotations:type_name -> google.protobuf.Struct
+	0,  // 6: flyteidl.core.LiteralType.simple:type_name -> flyteidl.core.SimpleType
+	3,  // 7: flyteidl.core.LiteralType.schema:type_name -> flyteidl.core.SchemaType
+	10, // 8: flyteidl.core.LiteralType.collection_type:type_name -> flyteidl.core.LiteralType
+	10, // 9: flyteidl.core.LiteralType.map_value_type:type_name -> flyteidl.core.LiteralType
+	5,  // 10: flyteidl.core.LiteralType.blob:type_name -> flyteidl.core.BlobType
+	6,  // 11: flyteidl.core.LiteralType.enum_type:type_name -> flyteidl.core.EnumType
+	4,  // 12: flyteidl.core.LiteralType.structured_dataset_type:type_name -> flyteidl.core.StructuredDatasetType
+	7,  // 13: flyteidl.core.LiteralType.union_type:type_name -> flyteidl.core.UnionType
+	17, // 14: flyteidl.core.LiteralType.metadata:type_name -> google.protobuf.Struct
+	9,  // 15: flyteidl.core.LiteralType.annotation:type_name -> flyteidl.core.TypeAnnotation
+	8,  // 16: flyteidl.core.LiteralType.structure:type_name -> flyteidl.core.TypeStructure
+	12, // 17: flyteidl.core.OutputReference.attr_path:type_name -> flyteidl.core.PromiseAttribute
+	1,  // 18: flyteidl.core.SchemaType.SchemaColumn.type:type_name -> flyteidl.core.SchemaType.SchemaColumn.SchemaColumnType
+	10, // 19: flyteidl.core.StructuredDatasetType.DatasetColumn.literal_type:type_name -> flyteidl.core.LiteralType
+	10, // 20: flyteidl.core.TypeStructure.DataclassTypeEntry.value:type_name -> flyteidl.core.LiteralType
+	21, // [21:21] is the sub-list for method output_type
+	21, // [21:21] is the sub-list for method input_type
+	21, // [21:21] is the sub-list for extension type_name
+	21, // [21:21] is the sub-list for extension extendee
+	0,  // [0:21] is the sub-list for field type_name
 }
 
 func init() { file_flyteidl_core_types_proto_init() }
@@ -1504,18 +1427,6 @@ func file_flyteidl_core_types_proto_init() {
 			}
 		}
 		file_flyteidl_core_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OffloadedType); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_flyteidl_core_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TypeStructure); i {
 			case 0:
 				return &v.state
@@ -1527,7 +1438,7 @@ func file_flyteidl_core_types_proto_init() {
 				return nil
 			}
 		}
-		file_flyteidl_core_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_flyteidl_core_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TypeAnnotation); i {
 			case 0:
 				return &v.state
@@ -1539,7 +1450,7 @@ func file_flyteidl_core_types_proto_init() {
 				return nil
 			}
 		}
-		file_flyteidl_core_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_flyteidl_core_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LiteralType); i {
 			case 0:
 				return &v.state
@@ -1551,7 +1462,7 @@ func file_flyteidl_core_types_proto_init() {
 				return nil
 			}
 		}
-		file_flyteidl_core_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_flyteidl_core_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*OutputReference); i {
 			case 0:
 				return &v.state
@@ -1563,7 +1474,7 @@ func file_flyteidl_core_types_proto_init() {
 				return nil
 			}
 		}
-		file_flyteidl_core_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_flyteidl_core_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PromiseAttribute); i {
 			case 0:
 				return &v.state
@@ -1575,7 +1486,7 @@ func file_flyteidl_core_types_proto_init() {
 				return nil
 			}
 		}
-		file_flyteidl_core_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_flyteidl_core_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Error); i {
 			case 0:
 				return &v.state
@@ -1587,7 +1498,7 @@ func file_flyteidl_core_types_proto_init() {
 				return nil
 			}
 		}
-		file_flyteidl_core_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_flyteidl_core_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SchemaType_SchemaColumn); i {
 			case 0:
 				return &v.state
@@ -1599,7 +1510,7 @@ func file_flyteidl_core_types_proto_init() {
 				return nil
 			}
 		}
-		file_flyteidl_core_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_flyteidl_core_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*StructuredDatasetType_DatasetColumn); i {
 			case 0:
 				return &v.state
@@ -1612,7 +1523,7 @@ func file_flyteidl_core_types_proto_init() {
 			}
 		}
 	}
-	file_flyteidl_core_types_proto_msgTypes[8].OneofWrappers = []interface{}{
+	file_flyteidl_core_types_proto_msgTypes[7].OneofWrappers = []interface{}{
 		(*LiteralType_Simple)(nil),
 		(*LiteralType_Schema)(nil),
 		(*LiteralType_CollectionType)(nil),
@@ -1621,9 +1532,8 @@ func file_flyteidl_core_types_proto_init() {
 		(*LiteralType_EnumType)(nil),
 		(*LiteralType_StructuredDatasetType)(nil),
 		(*LiteralType_UnionType)(nil),
-		(*LiteralType_OffloadedType)(nil),
 	}
-	file_flyteidl_core_types_proto_msgTypes[10].OneofWrappers = []interface{}{
+	file_flyteidl_core_types_proto_msgTypes[9].OneofWrappers = []interface{}{
 		(*PromiseAttribute_StringValue)(nil),
 		(*PromiseAttribute_IntValue)(nil),
 	}
@@ -1633,7 +1543,7 @@ func file_flyteidl_core_types_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_flyteidl_core_types_proto_rawDesc,
 			NumEnums:      3,
-			NumMessages:   15,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/cacheservice/cacheservice.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/cacheservice/cacheservice.swagger.json
index 287aed92a1e..204e9e71223 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/cacheservice/cacheservice.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/cacheservice/cacheservice.swagger.json
@@ -316,10 +316,6 @@
           "$ref": "#/definitions/coreUnionType",
           "description": "Defines an union type with pre-defined LiteralTypes."
         },
-        "offloaded_type": {
-          "$ref": "#/definitions/coreOffloadedType",
-          "description": "Defines the offload literal type which stores the info about the actual stored literal type."
-        },
         "metadata": {
           "type": "object",
           "description": "This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by\nconsumers to identify special behavior or display extended information for the type."
@@ -335,16 +331,6 @@
       },
       "description": "Defines a strong type to allow type checking between interfaces."
     },
-    "coreOffloadedType": {
-      "type": "object",
-      "properties": {
-        "actual_literal_type": {
-          "$ref": "#/definitions/coreLiteralType",
-          "title": "Type of actual literal stored at the offloaded location"
-        }
-      },
-      "description": "Enabled checking for offloaded literal type and getting the info about the store literal type."
-    },
     "corePrimitive": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/datacatalog/datacatalog.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/datacatalog/datacatalog.swagger.json
index 9758a2e7af4..990cc1ec4ae 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/datacatalog/datacatalog.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/datacatalog/datacatalog.swagger.json
@@ -260,10 +260,6 @@
           "$ref": "#/definitions/coreUnionType",
           "description": "Defines an union type with pre-defined LiteralTypes."
         },
-        "offloaded_type": {
-          "$ref": "#/definitions/coreOffloadedType",
-          "description": "Defines the offload literal type which stores the info about the actual stored literal type."
-        },
         "metadata": {
           "type": "object",
           "description": "This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by\nconsumers to identify special behavior or display extended information for the type."
@@ -279,16 +275,6 @@
       },
       "description": "Defines a strong type to allow type checking between interfaces."
     },
-    "coreOffloadedType": {
-      "type": "object",
-      "properties": {
-        "actual_literal_type": {
-          "$ref": "#/definitions/coreLiteralType",
-          "title": "Type of actual literal stored at the offloaded location"
-        }
-      },
-      "description": "Enabled checking for offloaded literal type and getting the info about the store literal type."
-    },
     "corePrimitive": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
index ae7e0c45573..241baeb53cc 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
@@ -7517,10 +7517,6 @@
           "$ref": "#/definitions/coreUnionType",
           "description": "Defines an union type with pre-defined LiteralTypes."
         },
-        "offloaded_type": {
-          "$ref": "#/definitions/coreOffloadedType",
-          "description": "Defines the offload literal type which stores the info about the actual stored literal type."
-        },
         "metadata": {
           "type": "object",
           "description": "This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by\nconsumers to identify special behavior or display extended information for the type."
@@ -7700,16 +7696,6 @@
       "default": "CLIENT_CREDENTIALS",
       "description": "Type of the token requested.\n\n - CLIENT_CREDENTIALS: CLIENT_CREDENTIALS indicates a 2-legged OAuth token requested using client credentials."
     },
-    "coreOffloadedType": {
-      "type": "object",
-      "properties": {
-        "actual_literal_type": {
-          "$ref": "#/definitions/coreLiteralType",
-          "title": "Type of actual literal stored at the offloaded location"
-        }
-      },
-      "description": "Enabled checking for offloaded literal type and getting the info about the store literal type."
-    },
     "coreOperand": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json
index 1f98a6707f8..070b6a8c601 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json
@@ -1354,10 +1354,6 @@
           "$ref": "#/definitions/coreUnionType",
           "description": "Defines an union type with pre-defined LiteralTypes."
         },
-        "offloaded_type": {
-          "$ref": "#/definitions/coreOffloadedType",
-          "description": "Defines the offload literal type which stores the info about the actual stored literal type."
-        },
         "metadata": {
           "type": "object",
           "description": "This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by\nconsumers to identify special behavior or display extended information for the type."
@@ -1433,16 +1429,6 @@
       "default": "CLIENT_CREDENTIALS",
       "description": "Type of the token requested.\n\n - CLIENT_CREDENTIALS: CLIENT_CREDENTIALS indicates a 2-legged OAuth token requested using client credentials."
     },
-    "coreOffloadedType": {
-      "type": "object",
-      "properties": {
-        "actual_literal_type": {
-          "$ref": "#/definitions/coreLiteralType",
-          "title": "Type of actual literal stored at the offloaded location"
-        }
-      },
-      "description": "Enabled checking for offloaded literal type and getting the info about the store literal type."
-    },
     "corePartitions": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/dataproxy.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/dataproxy.swagger.json
index 05514cd9f04..20f32b743d0 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/dataproxy.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/dataproxy.swagger.json
@@ -376,10 +376,6 @@
           "$ref": "#/definitions/coreUnionType",
           "description": "Defines an union type with pre-defined LiteralTypes."
         },
-        "offloaded_type": {
-          "$ref": "#/definitions/coreOffloadedType",
-          "description": "Defines the offload literal type which stores the info about the actual stored literal type."
-        },
         "metadata": {
           "type": "object",
           "description": "This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by\nconsumers to identify special behavior or display extended information for the type."
@@ -407,16 +403,6 @@
       },
       "description": "Encapsulation of fields that identify a Flyte node execution entity."
     },
-    "coreOffloadedType": {
-      "type": "object",
-      "properties": {
-        "actual_literal_type": {
-          "$ref": "#/definitions/coreLiteralType",
-          "title": "Type of actual literal stored at the offloaded location"
-        }
-      },
-      "description": "Enabled checking for offloaded literal type and getting the info about the store literal type."
-    },
     "corePrimitive": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json
index 79709909056..e690cc556c6 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json
@@ -670,10 +670,6 @@
           "$ref": "#/definitions/coreUnionType",
           "description": "Defines an union type with pre-defined LiteralTypes."
         },
-        "offloaded_type": {
-          "$ref": "#/definitions/coreOffloadedType",
-          "description": "Defines the offload literal type which stores the info about the actual stored literal type."
-        },
         "metadata": {
           "type": "object",
           "description": "This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by\nconsumers to identify special behavior or display extended information for the type."
@@ -737,16 +733,6 @@
       "default": "CLIENT_CREDENTIALS",
       "description": "Type of the token requested.\n\n - CLIENT_CREDENTIALS: CLIENT_CREDENTIALS indicates a 2-legged OAuth token requested using client credentials."
     },
-    "coreOffloadedType": {
-      "type": "object",
-      "properties": {
-        "actual_literal_type": {
-          "$ref": "#/definitions/coreLiteralType",
-          "title": "Type of actual literal stored at the offloaded location"
-        }
-      },
-      "description": "Enabled checking for offloaded literal type and getting the info about the store literal type."
-    },
     "corePartitions": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/signal.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/signal.swagger.json
index e6f848042c4..841cb04f267 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/signal.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/signal.swagger.json
@@ -452,10 +452,6 @@
           "$ref": "#/definitions/coreUnionType",
           "description": "Defines an union type with pre-defined LiteralTypes."
         },
-        "offloaded_type": {
-          "$ref": "#/definitions/coreOffloadedType",
-          "description": "Defines the offload literal type which stores the info about the actual stored literal type."
-        },
         "metadata": {
           "type": "object",
           "description": "This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by\nconsumers to identify special behavior or display extended information for the type."
@@ -471,16 +467,6 @@
       },
       "description": "Defines a strong type to allow type checking between interfaces."
     },
-    "coreOffloadedType": {
-      "type": "object",
-      "properties": {
-        "actual_literal_type": {
-          "$ref": "#/definitions/coreLiteralType",
-          "title": "Type of actual literal stored at the offloaded location"
-        }
-      },
-      "description": "Enabled checking for offloaded literal type and getting the info about the store literal type."
-    },
     "corePrimitive": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts
index 624513ee56e..0ff2422577d 100644
--- a/flyteidl/gen/pb-js/flyteidl.d.ts
+++ b/flyteidl/gen/pb-js/flyteidl.d.ts
@@ -2337,58 +2337,6 @@ export namespace flyteidl {
             public static verify(message: { [k: string]: any }): (string|null);
         }
 
-        /** Properties of an OffloadedType. */
-        interface IOffloadedType {
-
-            /** OffloadedType actualLiteralType */
-            actualLiteralType?: (flyteidl.core.ILiteralType|null);
-        }
-
-        /** Represents an OffloadedType. */
-        class OffloadedType implements IOffloadedType {
-
-            /**
-             * Constructs a new OffloadedType.
-             * @param [properties] Properties to set
-             */
-            constructor(properties?: flyteidl.core.IOffloadedType);
-
-            /** OffloadedType actualLiteralType. */
-            public actualLiteralType?: (flyteidl.core.ILiteralType|null);
-
-            /**
-             * Creates a new OffloadedType instance using the specified properties.
-             * @param [properties] Properties to set
-             * @returns OffloadedType instance
-             */
-            public static create(properties?: flyteidl.core.IOffloadedType): flyteidl.core.OffloadedType;
-
-            /**
-             * Encodes the specified OffloadedType message. Does not implicitly {@link flyteidl.core.OffloadedType.verify|verify} messages.
-             * @param message OffloadedType message or plain object to encode
-             * @param [writer] Writer to encode to
-             * @returns Writer
-             */
-            public static encode(message: flyteidl.core.IOffloadedType, writer?: $protobuf.Writer): $protobuf.Writer;
-
-            /**
-             * Decodes an OffloadedType message from the specified reader or buffer.
-             * @param reader Reader or buffer to decode from
-             * @param [length] Message length if known beforehand
-             * @returns OffloadedType
-             * @throws {Error} If the payload is not a reader or valid buffer
-             * @throws {$protobuf.util.ProtocolError} If required fields are missing
-             */
-            public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.core.OffloadedType;
-
-            /**
-             * Verifies an OffloadedType message.
-             * @param message Plain object to verify
-             * @returns `null` if valid, otherwise the reason why it is not
-             */
-            public static verify(message: { [k: string]: any }): (string|null);
-        }
-
         /** Properties of a TypeStructure. */
         interface ITypeStructure {
 
@@ -2526,9 +2474,6 @@ export namespace flyteidl {
             /** LiteralType unionType */
             unionType?: (flyteidl.core.IUnionType|null);
 
-            /** LiteralType offloadedType */
-            offloadedType?: (flyteidl.core.IOffloadedType|null);
-
             /** LiteralType metadata */
             metadata?: (google.protobuf.IStruct|null);
 
@@ -2572,9 +2517,6 @@ export namespace flyteidl {
             /** LiteralType unionType. */
             public unionType?: (flyteidl.core.IUnionType|null);
 
-            /** LiteralType offloadedType. */
-            public offloadedType?: (flyteidl.core.IOffloadedType|null);
-
             /** LiteralType metadata. */
             public metadata?: (google.protobuf.IStruct|null);
 
@@ -2585,7 +2527,7 @@ export namespace flyteidl {
             public structure?: (flyteidl.core.ITypeStructure|null);
 
             /** LiteralType type. */
-            public type?: ("simple"|"schema"|"collectionType"|"mapValueType"|"blob"|"enumType"|"structuredDatasetType"|"unionType"|"offloadedType");
+            public type?: ("simple"|"schema"|"collectionType"|"mapValueType"|"blob"|"enumType"|"structuredDatasetType"|"unionType");
 
             /**
              * Creates a new LiteralType instance using the specified properties.
diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js
index 6ef68385213..042343eecf1 100644
--- a/flyteidl/gen/pb-js/flyteidl.js
+++ b/flyteidl/gen/pb-js/flyteidl.js
@@ -5523,118 +5523,6 @@
                 return UnionType;
             })();
     
-            core.OffloadedType = (function() {
-    
-                /**
-                 * Properties of an OffloadedType.
-                 * @memberof flyteidl.core
-                 * @interface IOffloadedType
-                 * @property {flyteidl.core.ILiteralType|null} [actualLiteralType] OffloadedType actualLiteralType
-                 */
-    
-                /**
-                 * Constructs a new OffloadedType.
-                 * @memberof flyteidl.core
-                 * @classdesc Represents an OffloadedType.
-                 * @implements IOffloadedType
-                 * @constructor
-                 * @param {flyteidl.core.IOffloadedType=} [properties] Properties to set
-                 */
-                function OffloadedType(properties) {
-                    if (properties)
-                        for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                            if (properties[keys[i]] != null)
-                                this[keys[i]] = properties[keys[i]];
-                }
-    
-                /**
-                 * OffloadedType actualLiteralType.
-                 * @member {flyteidl.core.ILiteralType|null|undefined} actualLiteralType
-                 * @memberof flyteidl.core.OffloadedType
-                 * @instance
-                 */
-                OffloadedType.prototype.actualLiteralType = null;
-    
-                /**
-                 * Creates a new OffloadedType instance using the specified properties.
-                 * @function create
-                 * @memberof flyteidl.core.OffloadedType
-                 * @static
-                 * @param {flyteidl.core.IOffloadedType=} [properties] Properties to set
-                 * @returns {flyteidl.core.OffloadedType} OffloadedType instance
-                 */
-                OffloadedType.create = function create(properties) {
-                    return new OffloadedType(properties);
-                };
-    
-                /**
-                 * Encodes the specified OffloadedType message. Does not implicitly {@link flyteidl.core.OffloadedType.verify|verify} messages.
-                 * @function encode
-                 * @memberof flyteidl.core.OffloadedType
-                 * @static
-                 * @param {flyteidl.core.IOffloadedType} message OffloadedType message or plain object to encode
-                 * @param {$protobuf.Writer} [writer] Writer to encode to
-                 * @returns {$protobuf.Writer} Writer
-                 */
-                OffloadedType.encode = function encode(message, writer) {
-                    if (!writer)
-                        writer = $Writer.create();
-                    if (message.actualLiteralType != null && message.hasOwnProperty("actualLiteralType"))
-                        $root.flyteidl.core.LiteralType.encode(message.actualLiteralType, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
-                    return writer;
-                };
-    
-                /**
-                 * Decodes an OffloadedType message from the specified reader or buffer.
-                 * @function decode
-                 * @memberof flyteidl.core.OffloadedType
-                 * @static
-                 * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-                 * @param {number} [length] Message length if known beforehand
-                 * @returns {flyteidl.core.OffloadedType} OffloadedType
-                 * @throws {Error} If the payload is not a reader or valid buffer
-                 * @throws {$protobuf.util.ProtocolError} If required fields are missing
-                 */
-                OffloadedType.decode = function decode(reader, length) {
-                    if (!(reader instanceof $Reader))
-                        reader = $Reader.create(reader);
-                    var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.core.OffloadedType();
-                    while (reader.pos < end) {
-                        var tag = reader.uint32();
-                        switch (tag >>> 3) {
-                        case 1:
-                            message.actualLiteralType = $root.flyteidl.core.LiteralType.decode(reader, reader.uint32());
-                            break;
-                        default:
-                            reader.skipType(tag & 7);
-                            break;
-                        }
-                    }
-                    return message;
-                };
-    
-                /**
-                 * Verifies an OffloadedType message.
-                 * @function verify
-                 * @memberof flyteidl.core.OffloadedType
-                 * @static
-                 * @param {Object.<string,*>} message Plain object to verify
-                 * @returns {string|null} `null` if valid, otherwise the reason why it is not
-                 */
-                OffloadedType.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    if (message.actualLiteralType != null && message.hasOwnProperty("actualLiteralType")) {
-                        var error = $root.flyteidl.core.LiteralType.verify(message.actualLiteralType);
-                        if (error)
-                            return "actualLiteralType." + error;
-                    }
-                    return null;
-                };
-    
-                return OffloadedType;
-            })();
-    
             core.TypeStructure = (function() {
     
                 /**
@@ -5904,7 +5792,6 @@
                  * @property {flyteidl.core.IEnumType|null} [enumType] LiteralType enumType
                  * @property {flyteidl.core.IStructuredDatasetType|null} [structuredDatasetType] LiteralType structuredDatasetType
                  * @property {flyteidl.core.IUnionType|null} [unionType] LiteralType unionType
-                 * @property {flyteidl.core.IOffloadedType|null} [offloadedType] LiteralType offloadedType
                  * @property {google.protobuf.IStruct|null} [metadata] LiteralType metadata
                  * @property {flyteidl.core.ITypeAnnotation|null} [annotation] LiteralType annotation
                  * @property {flyteidl.core.ITypeStructure|null} [structure] LiteralType structure
@@ -5989,14 +5876,6 @@
                  */
                 LiteralType.prototype.unionType = null;
     
-                /**
-                 * LiteralType offloadedType.
-                 * @member {flyteidl.core.IOffloadedType|null|undefined} offloadedType
-                 * @memberof flyteidl.core.LiteralType
-                 * @instance
-                 */
-                LiteralType.prototype.offloadedType = null;
-    
                 /**
                  * LiteralType metadata.
                  * @member {google.protobuf.IStruct|null|undefined} metadata
@@ -6026,12 +5905,12 @@
     
                 /**
                  * LiteralType type.
-                 * @member {"simple"|"schema"|"collectionType"|"mapValueType"|"blob"|"enumType"|"structuredDatasetType"|"unionType"|"offloadedType"|undefined} type
+                 * @member {"simple"|"schema"|"collectionType"|"mapValueType"|"blob"|"enumType"|"structuredDatasetType"|"unionType"|undefined} type
                  * @memberof flyteidl.core.LiteralType
                  * @instance
                  */
                 Object.defineProperty(LiteralType.prototype, "type", {
-                    get: $util.oneOfGetter($oneOfFields = ["simple", "schema", "collectionType", "mapValueType", "blob", "enumType", "structuredDatasetType", "unionType", "offloadedType"]),
+                    get: $util.oneOfGetter($oneOfFields = ["simple", "schema", "collectionType", "mapValueType", "blob", "enumType", "structuredDatasetType", "unionType"]),
                     set: $util.oneOfSetter($oneOfFields)
                 });
     
@@ -6081,8 +5960,6 @@
                         $root.flyteidl.core.UnionType.encode(message.unionType, writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim();
                     if (message.structure != null && message.hasOwnProperty("structure"))
                         $root.flyteidl.core.TypeStructure.encode(message.structure, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim();
-                    if (message.offloadedType != null && message.hasOwnProperty("offloadedType"))
-                        $root.flyteidl.core.OffloadedType.encode(message.offloadedType, writer.uint32(/* id 12, wireType 2 =*/98).fork()).ldelim();
                     return writer;
                 };
     
@@ -6128,9 +6005,6 @@
                         case 10:
                             message.unionType = $root.flyteidl.core.UnionType.decode(reader, reader.uint32());
                             break;
-                        case 12:
-                            message.offloadedType = $root.flyteidl.core.OffloadedType.decode(reader, reader.uint32());
-                            break;
                         case 6:
                             message.metadata = $root.google.protobuf.Struct.decode(reader, reader.uint32());
                             break;
@@ -6248,16 +6122,6 @@
                                 return "unionType." + error;
                         }
                     }
-                    if (message.offloadedType != null && message.hasOwnProperty("offloadedType")) {
-                        if (properties.type === 1)
-                            return "type: multiple values";
-                        properties.type = 1;
-                        {
-                            var error = $root.flyteidl.core.OffloadedType.verify(message.offloadedType);
-                            if (error)
-                                return "offloadedType." + error;
-                        }
-                    }
                     if (message.metadata != null && message.hasOwnProperty("metadata")) {
                         var error = $root.google.protobuf.Struct.verify(message.metadata);
                         if (error)
diff --git a/flyteidl/gen/pb_python/flyteidl/core/types_pb2.py b/flyteidl/gen/pb_python/flyteidl/core/types_pb2.py
index afc76ca0095..3043a0cf6b8 100644
--- a/flyteidl/gen/pb_python/flyteidl/core/types_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/core/types_pb2.py
@@ -14,7 +14,7 @@
 from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x66lyteidl/core/types.proto\x12\rflyteidl.core\x1a\x1cgoogle/protobuf/struct.proto\"\xa1\x02\n\nSchemaType\x12@\n\x07\x63olumns\x18\x03 \x03(\x0b\x32&.flyteidl.core.SchemaType.SchemaColumnR\x07\x63olumns\x1a\xd0\x01\n\x0cSchemaColumn\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12K\n\x04type\x18\x02 \x01(\x0e\x32\x37.flyteidl.core.SchemaType.SchemaColumn.SchemaColumnTypeR\x04type\"_\n\x10SchemaColumnType\x12\x0b\n\x07INTEGER\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x0b\n\x07\x42OOLEAN\x10\x03\x12\x0c\n\x08\x44\x41TETIME\x10\x04\x12\x0c\n\x08\x44URATION\x10\x05\"\xc7\x02\n\x15StructuredDatasetType\x12L\n\x07\x63olumns\x18\x01 \x03(\x0b\x32\x32.flyteidl.core.StructuredDatasetType.DatasetColumnR\x07\x63olumns\x12\x16\n\x06\x66ormat\x18\x02 \x01(\tR\x06\x66ormat\x12\x30\n\x14\x65xternal_schema_type\x18\x03 \x01(\tR\x12\x65xternalSchemaType\x12\x32\n\x15\x65xternal_schema_bytes\x18\x04 \x01(\x0cR\x13\x65xternalSchemaBytes\x1a\x62\n\rDatasetColumn\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12=\n\x0cliteral_type\x18\x02 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeR\x0bliteralType\"\xa7\x01\n\x08\x42lobType\x12\x16\n\x06\x66ormat\x18\x01 \x01(\tR\x06\x66ormat\x12R\n\x0e\x64imensionality\x18\x02 \x01(\x0e\x32*.flyteidl.core.BlobType.BlobDimensionalityR\x0e\x64imensionality\"/\n\x12\x42lobDimensionality\x12\n\n\x06SINGLE\x10\x00\x12\r\n\tMULTIPART\x10\x01\"\"\n\x08\x45numType\x12\x16\n\x06values\x18\x01 \x03(\tR\x06values\"C\n\tUnionType\x12\x36\n\x08variants\x18\x01 \x03(\x0b\x32\x1a.flyteidl.core.LiteralTypeR\x08variants\"[\n\rOffloadedType\x12J\n\x13\x61\x63tual_literal_type\x18\x01 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeR\x11\x61\x63tualLiteralType\"\xd7\x01\n\rTypeStructure\x12\x10\n\x03tag\x18\x01 \x01(\tR\x03tag\x12V\n\x0e\x64\x61taclass_type\x18\x02 \x03(\x0b\x32/.flyteidl.core.TypeStructure.DataclassTypeEntryR\rdataclassType\x1a\\\n\x12\x44\x61taclassTypeEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x30\n\x05value\x18\x02 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeR\x05value:\x02\x38\x01\"K\n\x0eTypeAnnotation\x12\x39\n\x0b\x61nnotations\x18\x01 \x01(\x0b\x32\x17.google.protobuf.StructR\x0b\x61nnotations\"\x83\x06\n\x0bLiteralType\x12\x33\n\x06simple\x18\x01 \x01(\x0e\x32\x19.flyteidl.core.SimpleTypeH\x00R\x06simple\x12\x33\n\x06schema\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.SchemaTypeH\x00R\x06schema\x12\x45\n\x0f\x63ollection_type\x18\x03 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeH\x00R\x0e\x63ollectionType\x12\x42\n\x0emap_value_type\x18\x04 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeH\x00R\x0cmapValueType\x12-\n\x04\x62lob\x18\x05 \x01(\x0b\x32\x17.flyteidl.core.BlobTypeH\x00R\x04\x62lob\x12\x36\n\tenum_type\x18\x07 \x01(\x0b\x32\x17.flyteidl.core.EnumTypeH\x00R\x08\x65numType\x12^\n\x17structured_dataset_type\x18\x08 \x01(\x0b\x32$.flyteidl.core.StructuredDatasetTypeH\x00R\x15structuredDatasetType\x12\x39\n\nunion_type\x18\n \x01(\x0b\x32\x18.flyteidl.core.UnionTypeH\x00R\tunionType\x12\x45\n\x0eoffloaded_type\x18\x0c \x01(\x0b\x32\x1c.flyteidl.core.OffloadedTypeH\x00R\roffloadedType\x12\x33\n\x08metadata\x18\x06 \x01(\x0b\x32\x17.google.protobuf.StructR\x08metadata\x12=\n\nannotation\x18\t \x01(\x0b\x32\x1d.flyteidl.core.TypeAnnotationR\nannotation\x12:\n\tstructure\x18\x0b \x01(\x0b\x32\x1c.flyteidl.core.TypeStructureR\tstructureB\x06\n\x04type\"z\n\x0fOutputReference\x12\x17\n\x07node_id\x18\x01 \x01(\tR\x06nodeId\x12\x10\n\x03var\x18\x02 \x01(\tR\x03var\x12<\n\tattr_path\x18\x03 \x03(\x0b\x32\x1f.flyteidl.core.PromiseAttributeR\x08\x61ttrPath\"_\n\x10PromiseAttribute\x12#\n\x0cstring_value\x18\x01 \x01(\tH\x00R\x0bstringValue\x12\x1d\n\tint_value\x18\x02 \x01(\x05H\x00R\x08intValueB\x07\n\x05value\"G\n\x05\x45rror\x12$\n\x0e\x66\x61iled_node_id\x18\x01 \x01(\tR\x0c\x66\x61iledNodeId\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message*\x86\x01\n\nSimpleType\x12\x08\n\x04NONE\x10\x00\x12\x0b\n\x07INTEGER\x10\x01\x12\t\n\x05\x46LOAT\x10\x02\x12\n\n\x06STRING\x10\x03\x12\x0b\n\x07\x42OOLEAN\x10\x04\x12\x0c\n\x08\x44\x41TETIME\x10\x05\x12\x0c\n\x08\x44URATION\x10\x06\x12\n\n\x06\x42INARY\x10\x07\x12\t\n\x05\x45RROR\x10\x08\x12\n\n\x06STRUCT\x10\tB\xb0\x01\n\x11\x63om.flyteidl.coreB\nTypesProtoP\x01Z:github.com/flyteorg/flyte/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/types.proto\x12\rflyteidl.core\x1a\x1cgoogle/protobuf/struct.proto\"\xa1\x02\n\nSchemaType\x12@\n\x07\x63olumns\x18\x03 \x03(\x0b\x32&.flyteidl.core.SchemaType.SchemaColumnR\x07\x63olumns\x1a\xd0\x01\n\x0cSchemaColumn\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12K\n\x04type\x18\x02 \x01(\x0e\x32\x37.flyteidl.core.SchemaType.SchemaColumn.SchemaColumnTypeR\x04type\"_\n\x10SchemaColumnType\x12\x0b\n\x07INTEGER\x10\x00\x12\t\n\x05\x46LOAT\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x0b\n\x07\x42OOLEAN\x10\x03\x12\x0c\n\x08\x44\x41TETIME\x10\x04\x12\x0c\n\x08\x44URATION\x10\x05\"\xc7\x02\n\x15StructuredDatasetType\x12L\n\x07\x63olumns\x18\x01 \x03(\x0b\x32\x32.flyteidl.core.StructuredDatasetType.DatasetColumnR\x07\x63olumns\x12\x16\n\x06\x66ormat\x18\x02 \x01(\tR\x06\x66ormat\x12\x30\n\x14\x65xternal_schema_type\x18\x03 \x01(\tR\x12\x65xternalSchemaType\x12\x32\n\x15\x65xternal_schema_bytes\x18\x04 \x01(\x0cR\x13\x65xternalSchemaBytes\x1a\x62\n\rDatasetColumn\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12=\n\x0cliteral_type\x18\x02 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeR\x0bliteralType\"\xa7\x01\n\x08\x42lobType\x12\x16\n\x06\x66ormat\x18\x01 \x01(\tR\x06\x66ormat\x12R\n\x0e\x64imensionality\x18\x02 \x01(\x0e\x32*.flyteidl.core.BlobType.BlobDimensionalityR\x0e\x64imensionality\"/\n\x12\x42lobDimensionality\x12\n\n\x06SINGLE\x10\x00\x12\r\n\tMULTIPART\x10\x01\"\"\n\x08\x45numType\x12\x16\n\x06values\x18\x01 \x03(\tR\x06values\"C\n\tUnionType\x12\x36\n\x08variants\x18\x01 \x03(\x0b\x32\x1a.flyteidl.core.LiteralTypeR\x08variants\"\xd7\x01\n\rTypeStructure\x12\x10\n\x03tag\x18\x01 \x01(\tR\x03tag\x12V\n\x0e\x64\x61taclass_type\x18\x02 \x03(\x0b\x32/.flyteidl.core.TypeStructure.DataclassTypeEntryR\rdataclassType\x1a\\\n\x12\x44\x61taclassTypeEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x30\n\x05value\x18\x02 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeR\x05value:\x02\x38\x01\"K\n\x0eTypeAnnotation\x12\x39\n\x0b\x61nnotations\x18\x01 \x01(\x0b\x32\x17.google.protobuf.StructR\x0b\x61nnotations\"\xbc\x05\n\x0bLiteralType\x12\x33\n\x06simple\x18\x01 \x01(\x0e\x32\x19.flyteidl.core.SimpleTypeH\x00R\x06simple\x12\x33\n\x06schema\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.SchemaTypeH\x00R\x06schema\x12\x45\n\x0f\x63ollection_type\x18\x03 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeH\x00R\x0e\x63ollectionType\x12\x42\n\x0emap_value_type\x18\x04 \x01(\x0b\x32\x1a.flyteidl.core.LiteralTypeH\x00R\x0cmapValueType\x12-\n\x04\x62lob\x18\x05 \x01(\x0b\x32\x17.flyteidl.core.BlobTypeH\x00R\x04\x62lob\x12\x36\n\tenum_type\x18\x07 \x01(\x0b\x32\x17.flyteidl.core.EnumTypeH\x00R\x08\x65numType\x12^\n\x17structured_dataset_type\x18\x08 \x01(\x0b\x32$.flyteidl.core.StructuredDatasetTypeH\x00R\x15structuredDatasetType\x12\x39\n\nunion_type\x18\n \x01(\x0b\x32\x18.flyteidl.core.UnionTypeH\x00R\tunionType\x12\x33\n\x08metadata\x18\x06 \x01(\x0b\x32\x17.google.protobuf.StructR\x08metadata\x12=\n\nannotation\x18\t \x01(\x0b\x32\x1d.flyteidl.core.TypeAnnotationR\nannotation\x12:\n\tstructure\x18\x0b \x01(\x0b\x32\x1c.flyteidl.core.TypeStructureR\tstructureB\x06\n\x04type\"z\n\x0fOutputReference\x12\x17\n\x07node_id\x18\x01 \x01(\tR\x06nodeId\x12\x10\n\x03var\x18\x02 \x01(\tR\x03var\x12<\n\tattr_path\x18\x03 \x03(\x0b\x32\x1f.flyteidl.core.PromiseAttributeR\x08\x61ttrPath\"_\n\x10PromiseAttribute\x12#\n\x0cstring_value\x18\x01 \x01(\tH\x00R\x0bstringValue\x12\x1d\n\tint_value\x18\x02 \x01(\x05H\x00R\x08intValueB\x07\n\x05value\"G\n\x05\x45rror\x12$\n\x0e\x66\x61iled_node_id\x18\x01 \x01(\tR\x0c\x66\x61iledNodeId\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message*\x86\x01\n\nSimpleType\x12\x08\n\x04NONE\x10\x00\x12\x0b\n\x07INTEGER\x10\x01\x12\t\n\x05\x46LOAT\x10\x02\x12\n\n\x06STRING\x10\x03\x12\x0b\n\x07\x42OOLEAN\x10\x04\x12\x0c\n\x08\x44\x41TETIME\x10\x05\x12\x0c\n\x08\x44URATION\x10\x06\x12\n\n\x06\x42INARY\x10\x07\x12\t\n\x05\x45RROR\x10\x08\x12\n\n\x06STRUCT\x10\tB\xb0\x01\n\x11\x63om.flyteidl.coreB\nTypesProtoP\x01Z:github.com/flyteorg/flyte/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)
@@ -25,8 +25,8 @@
   DESCRIPTOR._serialized_options = b'\n\021com.flyteidl.coreB\nTypesProtoP\001Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\242\002\003FCX\252\002\rFlyteidl.Core\312\002\rFlyteidl\\Core\342\002\031Flyteidl\\Core\\GPBMetadata\352\002\016Flyteidl::Core'
   _TYPESTRUCTURE_DATACLASSTYPEENTRY._options = None
   _TYPESTRUCTURE_DATACLASSTYPEENTRY._serialized_options = b'8\001'
-  _globals['_SIMPLETYPE']._serialized_start=2428
-  _globals['_SIMPLETYPE']._serialized_end=2562
+  _globals['_SIMPLETYPE']._serialized_start=2264
+  _globals['_SIMPLETYPE']._serialized_end=2398
   _globals['_SCHEMATYPE']._serialized_start=75
   _globals['_SCHEMATYPE']._serialized_end=364
   _globals['_SCHEMATYPE_SCHEMACOLUMN']._serialized_start=156
@@ -45,20 +45,18 @@
   _globals['_ENUMTYPE']._serialized_end=900
   _globals['_UNIONTYPE']._serialized_start=902
   _globals['_UNIONTYPE']._serialized_end=969
-  _globals['_OFFLOADEDTYPE']._serialized_start=971
-  _globals['_OFFLOADEDTYPE']._serialized_end=1062
-  _globals['_TYPESTRUCTURE']._serialized_start=1065
-  _globals['_TYPESTRUCTURE']._serialized_end=1280
-  _globals['_TYPESTRUCTURE_DATACLASSTYPEENTRY']._serialized_start=1188
-  _globals['_TYPESTRUCTURE_DATACLASSTYPEENTRY']._serialized_end=1280
-  _globals['_TYPEANNOTATION']._serialized_start=1282
-  _globals['_TYPEANNOTATION']._serialized_end=1357
-  _globals['_LITERALTYPE']._serialized_start=1360
-  _globals['_LITERALTYPE']._serialized_end=2131
-  _globals['_OUTPUTREFERENCE']._serialized_start=2133
-  _globals['_OUTPUTREFERENCE']._serialized_end=2255
-  _globals['_PROMISEATTRIBUTE']._serialized_start=2257
-  _globals['_PROMISEATTRIBUTE']._serialized_end=2352
-  _globals['_ERROR']._serialized_start=2354
-  _globals['_ERROR']._serialized_end=2425
+  _globals['_TYPESTRUCTURE']._serialized_start=972
+  _globals['_TYPESTRUCTURE']._serialized_end=1187
+  _globals['_TYPESTRUCTURE_DATACLASSTYPEENTRY']._serialized_start=1095
+  _globals['_TYPESTRUCTURE_DATACLASSTYPEENTRY']._serialized_end=1187
+  _globals['_TYPEANNOTATION']._serialized_start=1189
+  _globals['_TYPEANNOTATION']._serialized_end=1264
+  _globals['_LITERALTYPE']._serialized_start=1267
+  _globals['_LITERALTYPE']._serialized_end=1967
+  _globals['_OUTPUTREFERENCE']._serialized_start=1969
+  _globals['_OUTPUTREFERENCE']._serialized_end=2091
+  _globals['_PROMISEATTRIBUTE']._serialized_start=2093
+  _globals['_PROMISEATTRIBUTE']._serialized_end=2188
+  _globals['_ERROR']._serialized_start=2190
+  _globals['_ERROR']._serialized_end=2261
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/core/types_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/core/types_pb2.pyi
index b77174c2890..9028afabd55 100644
--- a/flyteidl/gen/pb_python/flyteidl/core/types_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/core/types_pb2.pyi
@@ -102,12 +102,6 @@ class UnionType(_message.Message):
     variants: _containers.RepeatedCompositeFieldContainer[LiteralType]
     def __init__(self, variants: _Optional[_Iterable[_Union[LiteralType, _Mapping]]] = ...) -> None: ...
 
-class OffloadedType(_message.Message):
-    __slots__ = ["actual_literal_type"]
-    ACTUAL_LITERAL_TYPE_FIELD_NUMBER: _ClassVar[int]
-    actual_literal_type: LiteralType
-    def __init__(self, actual_literal_type: _Optional[_Union[LiteralType, _Mapping]] = ...) -> None: ...
-
 class TypeStructure(_message.Message):
     __slots__ = ["tag", "dataclass_type"]
     class DataclassTypeEntry(_message.Message):
@@ -130,7 +124,7 @@ class TypeAnnotation(_message.Message):
     def __init__(self, annotations: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ...) -> None: ...
 
 class LiteralType(_message.Message):
-    __slots__ = ["simple", "schema", "collection_type", "map_value_type", "blob", "enum_type", "structured_dataset_type", "union_type", "offloaded_type", "metadata", "annotation", "structure"]
+    __slots__ = ["simple", "schema", "collection_type", "map_value_type", "blob", "enum_type", "structured_dataset_type", "union_type", "metadata", "annotation", "structure"]
     SIMPLE_FIELD_NUMBER: _ClassVar[int]
     SCHEMA_FIELD_NUMBER: _ClassVar[int]
     COLLECTION_TYPE_FIELD_NUMBER: _ClassVar[int]
@@ -139,7 +133,6 @@ class LiteralType(_message.Message):
     ENUM_TYPE_FIELD_NUMBER: _ClassVar[int]
     STRUCTURED_DATASET_TYPE_FIELD_NUMBER: _ClassVar[int]
     UNION_TYPE_FIELD_NUMBER: _ClassVar[int]
-    OFFLOADED_TYPE_FIELD_NUMBER: _ClassVar[int]
     METADATA_FIELD_NUMBER: _ClassVar[int]
     ANNOTATION_FIELD_NUMBER: _ClassVar[int]
     STRUCTURE_FIELD_NUMBER: _ClassVar[int]
@@ -151,11 +144,10 @@ class LiteralType(_message.Message):
     enum_type: EnumType
     structured_dataset_type: StructuredDatasetType
     union_type: UnionType
-    offloaded_type: OffloadedType
     metadata: _struct_pb2.Struct
     annotation: TypeAnnotation
     structure: TypeStructure
-    def __init__(self, simple: _Optional[_Union[SimpleType, str]] = ..., schema: _Optional[_Union[SchemaType, _Mapping]] = ..., collection_type: _Optional[_Union[LiteralType, _Mapping]] = ..., map_value_type: _Optional[_Union[LiteralType, _Mapping]] = ..., blob: _Optional[_Union[BlobType, _Mapping]] = ..., enum_type: _Optional[_Union[EnumType, _Mapping]] = ..., structured_dataset_type: _Optional[_Union[StructuredDatasetType, _Mapping]] = ..., union_type: _Optional[_Union[UnionType, _Mapping]] = ..., offloaded_type: _Optional[_Union[OffloadedType, _Mapping]] = ..., metadata: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ..., annotation: _Optional[_Union[TypeAnnotation, _Mapping]] = ..., structure: _Optional[_Union[TypeStructure, _Mapping]] = ...) -> None: ...
+    def __init__(self, simple: _Optional[_Union[SimpleType, str]] = ..., schema: _Optional[_Union[SchemaType, _Mapping]] = ..., collection_type: _Optional[_Union[LiteralType, _Mapping]] = ..., map_value_type: _Optional[_Union[LiteralType, _Mapping]] = ..., blob: _Optional[_Union[BlobType, _Mapping]] = ..., enum_type: _Optional[_Union[EnumType, _Mapping]] = ..., structured_dataset_type: _Optional[_Union[StructuredDatasetType, _Mapping]] = ..., union_type: _Optional[_Union[UnionType, _Mapping]] = ..., metadata: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ..., annotation: _Optional[_Union[TypeAnnotation, _Mapping]] = ..., structure: _Optional[_Union[TypeStructure, _Mapping]] = ...) -> None: ...
 
 class OutputReference(_message.Message):
     __slots__ = ["node_id", "var", "attr_path"]
diff --git a/flyteidl/gen/pb_rust/flyteidl.core.rs b/flyteidl/gen/pb_rust/flyteidl.core.rs
index d8060049ebe..bfbf82203d9 100644
--- a/flyteidl/gen/pb_rust/flyteidl.core.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.core.rs
@@ -165,14 +165,6 @@ pub struct UnionType {
     #[prost(message, repeated, tag="1")]
     pub variants: ::prost::alloc::vec::Vec<LiteralType>,
 }
-/// Enabled checking for offloaded literal type and getting the info about the store literal type.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct OffloadedType {
-    /// Type of actual literal stored at the offloaded location
-    #[prost(message, optional, boxed, tag="1")]
-    pub actual_literal_type: ::core::option::Option<::prost::alloc::boxed::Box<LiteralType>>,
-}
 /// Hints to improve type matching
 /// e.g. allows distinguishing output from custom type transformers
 /// even if the underlying IDL serialization matches.
@@ -213,7 +205,7 @@ pub struct LiteralType {
     /// Hints to improve type matching.
     #[prost(message, optional, tag="11")]
     pub structure: ::core::option::Option<TypeStructure>,
-    #[prost(oneof="literal_type::Type", tags="1, 2, 3, 4, 5, 7, 8, 10, 12")]
+    #[prost(oneof="literal_type::Type", tags="1, 2, 3, 4, 5, 7, 8, 10")]
     pub r#type: ::core::option::Option<literal_type::Type>,
 }
 /// Nested message and enum types in `LiteralType`.
@@ -245,9 +237,6 @@ pub mod literal_type {
         /// Defines an union type with pre-defined LiteralTypes.
         #[prost(message, tag="10")]
         UnionType(super::UnionType),
-        /// Defines the offload literal type which stores the info about the actual stored literal type.
-        #[prost(message, tag="12")]
-        OffloadedType(::prost::alloc::boxed::Box<super::OffloadedType>),
     }
 }
 /// A reference to an output produced by a node. The type can be retrieved -and validated- from
diff --git a/flyteidl/protos/flyteidl/core/types.proto b/flyteidl/protos/flyteidl/core/types.proto
index 44a93825b8b..3580eea9f00 100644
--- a/flyteidl/protos/flyteidl/core/types.proto
+++ b/flyteidl/protos/flyteidl/core/types.proto
@@ -108,12 +108,6 @@ message UnionType {
     repeated LiteralType variants = 1;
 }
 
-// Enabled checking for offloaded literal type and getting the info about the store literal type.
-message OffloadedType {
-    // Type of actual literal stored at the offloaded location
-    LiteralType actual_literal_type = 1;
-}
-
 // Hints to improve type matching
 // e.g. allows distinguishing output from custom type transformers
 // even if the underlying IDL serialization matches.
@@ -160,9 +154,6 @@ message LiteralType {
 
         // Defines an union type with pre-defined LiteralTypes.
         UnionType union_type = 10;
-
-        // Defines the offload literal type which stores the info about the actual stored literal type.
-        OffloadedType offloaded_type = 12;
     }
 
     // This field contains type metadata that is descriptive of the type, but is NOT considered in type-checking.  This might be used by
diff --git a/flytepropeller/pkg/compiler/validators/utils.go b/flytepropeller/pkg/compiler/validators/utils.go
index e58d3056355..6a458fa873f 100644
--- a/flytepropeller/pkg/compiler/validators/utils.go
+++ b/flytepropeller/pkg/compiler/validators/utils.go
@@ -268,13 +268,7 @@ func LiteralTypeForLiteral(l *core.Literal) *core.LiteralType {
 			},
 		}
 	case *core.Literal_OffloadedMetadata:
-		return &core.LiteralType{
-			Type: &core.LiteralType_OffloadedType{
-				OffloadedType: &core.OffloadedType{
-					ActualLiteralType: l.GetOffloadedMetadata().GetInferredType(),
-				},
-			},
-		}
+		return l.GetOffloadedMetadata().GetInferredType()
 	}
 	return nil
 }
diff --git a/flytepropeller/pkg/controller/nodes/attr_path_resolver_test.go b/flytepropeller/pkg/controller/nodes/attr_path_resolver_test.go
index fb966c666ef..8724f5287d2 100644
--- a/flytepropeller/pkg/controller/nodes/attr_path_resolver_test.go
+++ b/flytepropeller/pkg/controller/nodes/attr_path_resolver_test.go
@@ -1,6 +1,7 @@
 package nodes
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -319,7 +320,7 @@ func TestResolveAttrPathIn(t *testing.T) {
 	}
 
 	for i, arg := range args {
-		resolved, err := resolveAttrPathInPromise("", arg.literal, arg.path)
+		resolved, err := resolveAttrPathInPromise(context.Background(), nil, "", arg.literal, arg.path)
 		if arg.hasError {
 			assert.Error(t, err, i)
 			assert.ErrorContains(t, err, errors.PromiseAttributeResolveError, i)
diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go
index de520d2b7a9..00a99d6c54d 100644
--- a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go
+++ b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/datacatalog.go
@@ -259,7 +259,7 @@ func (m *CatalogClient) createArtifact(ctx context.Context, key catalog.Key, dat
 		}
 	}
 
-	logger.Debugf(ctx, "Successfully created artifact %+v for key %+v, dataset %+v and execution %+v", cachedArtifact, key, datasetID, metadata)
+	logger.Debugf(ctx, "Successfully created artifact %+v for key %+v, dataset %+v and execution %+v", cachedArtifact.Id, key, datasetID, metadata)
 	return catalog.NewStatus(core.CatalogCacheStatus_CACHE_POPULATED, EventCatalogMetadata(datasetID, tag, nil)), nil
 }
 
diff --git a/flytepropeller/pkg/controller/nodes/common/utils.go b/flytepropeller/pkg/controller/nodes/common/utils.go
index ae5145ef3bb..14ea44e24b4 100644
--- a/flytepropeller/pkg/controller/nodes/common/utils.go
+++ b/flytepropeller/pkg/controller/nodes/common/utils.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-
 	"strconv"
 
 	"github.com/golang/protobuf/proto"
diff --git a/flytepropeller/pkg/controller/nodes/common/utils_test.go b/flytepropeller/pkg/controller/nodes/common/utils_test.go
index 0dfba522ac6..875ede858bc 100644
--- a/flytepropeller/pkg/controller/nodes/common/utils_test.go
+++ b/flytepropeller/pkg/controller/nodes/common/utils_test.go
@@ -3,7 +3,6 @@ package common
 import (
 	"context"
 	"encoding/base64"
-	"github.com/flyteorg/flyte/flytestdlib/pbhash"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -16,6 +15,7 @@ import (
 	executorMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/executors/mocks"
 	nodeMocks "github.com/flyteorg/flyte/flytepropeller/pkg/controller/nodes/interfaces/mocks"
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
+	"github.com/flyteorg/flyte/flytestdlib/pbhash"
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
 	"github.com/flyteorg/flyte/flytestdlib/storage"
@@ -84,6 +84,40 @@ func init() {
 	labeled.SetMetricKeys(contextutils.AppNameKey)
 }
 
+func TestReadLargeLiteral(t *testing.T) {
+	t.Run("read successful", func(t *testing.T) {
+		ctx := context.Background()
+		datastore, _ := storage.NewDataStore(&storage.Config{Type: storage.TypeMemory}, promutils.NewTestScope())
+		dataReference := storage.DataReference("foo/bar")
+		toBeRead := &idlCore.Literal{
+			Value: &idlCore.Literal_Scalar{
+				Scalar: &idlCore.Scalar{
+					Value: &idlCore.Scalar_Primitive{
+						Primitive: &idlCore.Primitive{
+							Value: &idlCore.Primitive_Integer{
+								Integer: 1,
+							},
+						},
+					},
+				},
+			},
+		}
+		err := datastore.WriteProtobuf(ctx, dataReference, storage.Options{}, toBeRead)
+		assert.Nil(t, err)
+
+		offloadedLiteral := &idlCore.Literal{
+			Value: &idlCore.Literal_OffloadedMetadata{
+				OffloadedMetadata: &idlCore.LiteralOffloadedMetadata{
+					Uri: dataReference.String(),
+				},
+			},
+		}
+		err = ReadLargeLiteral(ctx, datastore, offloadedLiteral)
+		assert.Nil(t, err)
+		assert.Equal(t, int64(1), offloadedLiteral.GetScalar().GetPrimitive().GetInteger())
+	})
+}
+
 func TestOffloadLargeLiteral(t *testing.T) {
 	t.Run("offload successful with valid size", func(t *testing.T) {
 		ctx := context.Background()