diff --git a/protos/feast/core/DatasetService.proto b/protos/feast/core/DatasetService.proto
index 9e972859a23..fa17444566f 100644
--- a/protos/feast/core/DatasetService.proto
+++ b/protos/feast/core/DatasetService.proto
@@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto";
 
 option java_package = "feast.core";
 option java_outer_classname = "DatasetServiceProto";
-option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";
+option go_package = "github.com/gojek/feast/protos/generated/go/feast/core";
 
 service DatasetService {
   // Create training dataset for a feature set
diff --git a/protos/feast/specs/ImportSpec.proto b/protos/feast/specs/ImportSpec.proto
index 593aa852149..53838df3338 100644
--- a/protos/feast/specs/ImportSpec.proto
+++ b/protos/feast/specs/ImportSpec.proto
@@ -22,7 +22,6 @@ option java_package = "feast.specs";
 option java_outer_classname = "ImportSpecProto";
 option go_package = "github.com/gojek/feast/protos/generated/go/feast/specs";
 
-import "feast/types/Value.proto";
 import "google/protobuf/timestamp.proto";
 
 message ImportSpec {
diff --git a/protos/feast/storage/BigTable.proto b/protos/feast/storage/BigTable.proto
index 0d823dd650f..1a6f994d8db 100644
--- a/protos/feast/storage/BigTable.proto
+++ b/protos/feast/storage/BigTable.proto
@@ -16,8 +16,6 @@
 
 syntax = "proto3";
 
-import "feast/types/Value.proto";
-
 package feast.storage;
 
 option java_outer_classname = "BigTableProto";
diff --git a/protos/feast/types/Feature.proto b/protos/feast/types/Feature.proto
index 8db6c6ab5b5..a52bc8a995d 100644
--- a/protos/feast/types/Feature.proto
+++ b/protos/feast/types/Feature.proto
@@ -16,7 +16,6 @@
 
 syntax = "proto3";
 
-import "google/protobuf/timestamp.proto";
 import "feast/types/Value.proto";
 
 package feast.types;
@@ -27,5 +26,5 @@ option go_package = "github.com/gojek/feast/protos/generated/go/feast/types";
 
 message Feature {
   string id = 1;
-  Value value = 2;
+  feast.types.Value value = 2;
 }
diff --git a/protos/feast/types/FeatureRow.proto b/protos/feast/types/FeatureRow.proto
index cc13efcbd1b..55e9a5acca0 100644
--- a/protos/feast/types/FeatureRow.proto
+++ b/protos/feast/types/FeatureRow.proto
@@ -19,7 +19,6 @@ syntax = "proto3";
 import "google/protobuf/timestamp.proto";
 import "feast/types/Feature.proto";
 import "feast/types/Granularity.proto";
-import "feast/types/Value.proto";
 
 package feast.types;
 
diff --git a/sdk/python/feast/core/DatasetService_pb2.py b/sdk/python/feast/core/DatasetService_pb2.py
index 273b271426e..25171bad57d 100644
--- a/sdk/python/feast/core/DatasetService_pb2.py
+++ b/sdk/python/feast/core/DatasetService_pb2.py
@@ -19,8 +19,8 @@
   name='feast/core/DatasetService.proto',
   package='feast.core',
   syntax='proto3',
-  serialized_options=_b('\n\nfeast.coreB\023DatasetServiceProtoZ9github.com/gojektech/feast/protos/generated/go/feast/core'),
-  serialized_pb=_b('\n\x1f\x66\x65\x61st/core/DatasetService.proto\x12\nfeast.core\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa0\x02\n\x13\x44\x61tasetServiceTypes\x1a\xc1\x01\n\x14\x43reateDatasetRequest\x12*\n\nfeatureSet\x18\x01 \x01(\x0b\x32\x16.feast.core.FeatureSet\x12-\n\tstartDate\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x07\x65ndDate\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\r\n\x05limit\x18\x04 \x01(\x03\x12\x12\n\nnamePrefix\x18\x05 \x01(\t\x1a\x45\n\x15\x43reateDatasetResponse\x12,\n\x0b\x64\x61tasetInfo\x18\x01 \x01(\x0b\x32\x17.feast.core.DatasetInfo\"4\n\nFeatureSet\x12\x12\n\nentityName\x18\x01 \x01(\t\x12\x12\n\nfeatureIds\x18\x02 \x03(\t\"-\n\x0b\x44\x61tasetInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08tableUrl\x18\x02 \x01(\t2\x90\x01\n\x0e\x44\x61tasetService\x12~\n\rCreateDataset\x12\x34.feast.core.DatasetServiceTypes.CreateDatasetRequest\x1a\x35.feast.core.DatasetServiceTypes.CreateDatasetResponse\"\x00\x42\\\n\nfeast.coreB\x13\x44\x61tasetServiceProtoZ9github.com/gojektech/feast/protos/generated/go/feast/coreb\x06proto3')
+  serialized_options=_b('\n\nfeast.coreB\023DatasetServiceProtoZ5github.com/gojek/feast/protos/generated/go/feast/core'),
+  serialized_pb=_b('\n\x1f\x66\x65\x61st/core/DatasetService.proto\x12\nfeast.core\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa0\x02\n\x13\x44\x61tasetServiceTypes\x1a\xc1\x01\n\x14\x43reateDatasetRequest\x12*\n\nfeatureSet\x18\x01 \x01(\x0b\x32\x16.feast.core.FeatureSet\x12-\n\tstartDate\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x07\x65ndDate\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\r\n\x05limit\x18\x04 \x01(\x03\x12\x12\n\nnamePrefix\x18\x05 \x01(\t\x1a\x45\n\x15\x43reateDatasetResponse\x12,\n\x0b\x64\x61tasetInfo\x18\x01 \x01(\x0b\x32\x17.feast.core.DatasetInfo\"4\n\nFeatureSet\x12\x12\n\nentityName\x18\x01 \x01(\t\x12\x12\n\nfeatureIds\x18\x02 \x03(\t\"-\n\x0b\x44\x61tasetInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08tableUrl\x18\x02 \x01(\t2\x90\x01\n\x0e\x44\x61tasetService\x12~\n\rCreateDataset\x12\x34.feast.core.DatasetServiceTypes.CreateDatasetRequest\x1a\x35.feast.core.DatasetServiceTypes.CreateDatasetResponse\"\x00\x42X\n\nfeast.coreB\x13\x44\x61tasetServiceProtoZ5github.com/gojek/feast/protos/generated/go/feast/coreb\x06proto3')
   ,
   dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,])
 
diff --git a/sdk/python/feast/specs/ImportSpec_pb2.py b/sdk/python/feast/specs/ImportSpec_pb2.py
index 06a602c058a..d87fdafa4ad 100644
--- a/sdk/python/feast/specs/ImportSpec_pb2.py
+++ b/sdk/python/feast/specs/ImportSpec_pb2.py
@@ -12,7 +12,6 @@
 _sym_db = _symbol_database.Default()
 
 
-from feast.types import Value_pb2 as feast_dot_types_dot_Value__pb2
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
@@ -21,9 +20,9 @@
   package='feast.specs',
   syntax='proto3',
   serialized_options=_b('\n\013feast.specsB\017ImportSpecProtoZ6github.com/gojek/feast/protos/generated/go/feast/specs'),
-  serialized_pb=_b('\n\x1c\x66\x65\x61st/specs/ImportSpec.proto\x12\x0b\x66\x65\x61st.specs\x1a\x17\x66\x65\x61st/types/Value.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xb8\x01\n\nImportSpec\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x35\n\x07options\x18\x02 \x03(\x0b\x32$.feast.specs.ImportSpec.OptionsEntry\x12\x10\n\x08\x65ntities\x18\x03 \x03(\t\x12#\n\x06schema\x18\x04 \x01(\x0b\x32\x13.feast.specs.Schema\x1a.\n\x0cOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xa2\x01\n\x06Schema\x12\"\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x12.feast.specs.Field\x12\x19\n\x0ftimestampColumn\x18\x05 \x01(\tH\x00\x12\x34\n\x0etimestampValue\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x00\x12\x16\n\x0e\x65ntityIdColumn\x18\x07 \x01(\tB\x0b\n\ttimestamp\"(\n\x05\x46ield\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tfeatureId\x18\x02 \x01(\tBV\n\x0b\x66\x65\x61st.specsB\x0fImportSpecProtoZ6github.com/gojek/feast/protos/generated/go/feast/specsb\x06proto3')
+  serialized_pb=_b('\n\x1c\x66\x65\x61st/specs/ImportSpec.proto\x12\x0b\x66\x65\x61st.specs\x1a\x1fgoogle/protobuf/timestamp.proto\"\xb8\x01\n\nImportSpec\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x35\n\x07options\x18\x02 \x03(\x0b\x32$.feast.specs.ImportSpec.OptionsEntry\x12\x10\n\x08\x65ntities\x18\x03 \x03(\t\x12#\n\x06schema\x18\x04 \x01(\x0b\x32\x13.feast.specs.Schema\x1a.\n\x0cOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xa2\x01\n\x06Schema\x12\"\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x12.feast.specs.Field\x12\x19\n\x0ftimestampColumn\x18\x05 \x01(\tH\x00\x12\x34\n\x0etimestampValue\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x00\x12\x16\n\x0e\x65ntityIdColumn\x18\x07 \x01(\tB\x0b\n\ttimestamp\"(\n\x05\x46ield\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\tfeatureId\x18\x02 \x01(\tBV\n\x0b\x66\x65\x61st.specsB\x0fImportSpecProtoZ6github.com/gojek/feast/protos/generated/go/feast/specsb\x06proto3')
   ,
-  dependencies=[feast_dot_types_dot_Value__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,])
+  dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,])
 
 
 
@@ -61,8 +60,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=242,
-  serialized_end=288,
+  serialized_start=217,
+  serialized_end=263,
 )
 
 _IMPORTSPEC = _descriptor.Descriptor(
@@ -112,8 +111,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=104,
-  serialized_end=288,
+  serialized_start=79,
+  serialized_end=263,
 )
 
 
@@ -167,8 +166,8 @@
       name='timestamp', full_name='feast.specs.Schema.timestamp',
       index=0, containing_type=None, fields=[]),
   ],
-  serialized_start=291,
-  serialized_end=453,
+  serialized_start=266,
+  serialized_end=428,
 )
 
 
@@ -205,8 +204,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=455,
-  serialized_end=495,
+  serialized_start=430,
+  serialized_end=470,
 )
 
 _IMPORTSPEC_OPTIONSENTRY.containing_type = _IMPORTSPEC
diff --git a/sdk/python/feast/storage/BigTable_pb2.py b/sdk/python/feast/storage/BigTable_pb2.py
index a28799d71c1..4b59ff8b177 100644
--- a/sdk/python/feast/storage/BigTable_pb2.py
+++ b/sdk/python/feast/storage/BigTable_pb2.py
@@ -12,7 +12,6 @@
 _sym_db = _symbol_database.Default()
 
 
-from feast.types import Value_pb2 as feast_dot_types_dot_Value__pb2
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
@@ -20,9 +19,8 @@
   package='feast.storage',
   syntax='proto3',
   serialized_options=_b('\n\rfeast.storageB\rBigTableProtoZ8github.com/gojek/feast/protos/generated/go/feast/storage'),
-  serialized_pb=_b('\n\x1c\x66\x65\x61st/storage/BigTable.proto\x12\rfeast.storage\x1a\x17\x66\x65\x61st/types/Value.proto\"O\n\x0e\x42igTableRowKey\x12\x12\n\nsha1Prefix\x18\x01 \x01(\t\x12\x11\n\tentityKey\x18\x02 \x01(\t\x12\x16\n\x0ereversedMillis\x18\x03 \x01(\tBX\n\rfeast.storageB\rBigTableProtoZ8github.com/gojek/feast/protos/generated/go/feast/storageb\x06proto3')
-  ,
-  dependencies=[feast_dot_types_dot_Value__pb2.DESCRIPTOR,])
+  serialized_pb=_b('\n\x1c\x66\x65\x61st/storage/BigTable.proto\x12\rfeast.storage\"O\n\x0e\x42igTableRowKey\x12\x12\n\nsha1Prefix\x18\x01 \x01(\t\x12\x11\n\tentityKey\x18\x02 \x01(\t\x12\x16\n\x0ereversedMillis\x18\x03 \x01(\tBX\n\rfeast.storageB\rBigTableProtoZ8github.com/gojek/feast/protos/generated/go/feast/storageb\x06proto3')
+)
 
 
 
@@ -67,8 +65,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=72,
-  serialized_end=151,
+  serialized_start=47,
+  serialized_end=126,
 )
 
 DESCRIPTOR.message_types_by_name['BigTableRowKey'] = _BIGTABLEROWKEY
diff --git a/sdk/python/feast/types/FeatureRow_pb2.py b/sdk/python/feast/types/FeatureRow_pb2.py
index a371bdccb32..c9ed5a29bc0 100644
--- a/sdk/python/feast/types/FeatureRow_pb2.py
+++ b/sdk/python/feast/types/FeatureRow_pb2.py
@@ -15,7 +15,6 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 from feast.types import Feature_pb2 as feast_dot_types_dot_Feature__pb2
 from feast.types import Granularity_pb2 as feast_dot_types_dot_Granularity__pb2
-from feast.types import Value_pb2 as feast_dot_types_dot_Value__pb2
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
@@ -23,9 +22,9 @@
   package='feast.types',
   syntax='proto3',
   serialized_options=_b('\n\013feast.typesB\017FeatureRowProtoZ6github.com/gojek/feast/protos/generated/go/feast/types'),
-  serialized_pb=_b('\n\x1c\x66\x65\x61st/types/FeatureRow.proto\x12\x0b\x66\x65\x61st.types\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x19\x66\x65\x61st/types/Feature.proto\x1a\x1d\x66\x65\x61st/types/Granularity.proto\x1a\x17\x66\x65\x61st/types/Value.proto\"\x9e\x01\n\rFeatureRowKey\x12\x11\n\tentityKey\x18\x01 \x01(\t\x12\x32\n\x0e\x65ventTimestamp\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nentityName\x18\x04 \x01(\t\x12\x32\n\x0bgranularity\x18\x05 \x01(\x0e\x32\x1d.feast.types.Granularity.Enum\"\xc3\x01\n\nFeatureRow\x12\x11\n\tentityKey\x18\x01 \x01(\t\x12&\n\x08\x66\x65\x61tures\x18\x02 \x03(\x0b\x32\x14.feast.types.Feature\x12\x32\n\x0e\x65ventTimestamp\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nentityName\x18\x04 \x01(\t\x12\x32\n\x0bgranularity\x18\x05 \x01(\x0e\x32\x1d.feast.types.Granularity.EnumBV\n\x0b\x66\x65\x61st.typesB\x0f\x46\x65\x61tureRowProtoZ6github.com/gojek/feast/protos/generated/go/feast/typesb\x06proto3')
+  serialized_pb=_b('\n\x1c\x66\x65\x61st/types/FeatureRow.proto\x12\x0b\x66\x65\x61st.types\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x19\x66\x65\x61st/types/Feature.proto\x1a\x1d\x66\x65\x61st/types/Granularity.proto\"\x9e\x01\n\rFeatureRowKey\x12\x11\n\tentityKey\x18\x01 \x01(\t\x12\x32\n\x0e\x65ventTimestamp\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nentityName\x18\x04 \x01(\t\x12\x32\n\x0bgranularity\x18\x05 \x01(\x0e\x32\x1d.feast.types.Granularity.Enum\"\xc3\x01\n\nFeatureRow\x12\x11\n\tentityKey\x18\x01 \x01(\t\x12&\n\x08\x66\x65\x61tures\x18\x02 \x03(\x0b\x32\x14.feast.types.Feature\x12\x32\n\x0e\x65ventTimestamp\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nentityName\x18\x04 \x01(\t\x12\x32\n\x0bgranularity\x18\x05 \x01(\x0e\x32\x1d.feast.types.Granularity.EnumBV\n\x0b\x66\x65\x61st.typesB\x0f\x46\x65\x61tureRowProtoZ6github.com/gojek/feast/protos/generated/go/feast/typesb\x06proto3')
   ,
-  dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,feast_dot_types_dot_Feature__pb2.DESCRIPTOR,feast_dot_types_dot_Granularity__pb2.DESCRIPTOR,feast_dot_types_dot_Value__pb2.DESCRIPTOR,])
+  dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,feast_dot_types_dot_Feature__pb2.DESCRIPTOR,feast_dot_types_dot_Granularity__pb2.DESCRIPTOR,])
 
 
 
@@ -77,8 +76,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=162,
-  serialized_end=320,
+  serialized_start=137,
+  serialized_end=295,
 )
 
 
@@ -136,8 +135,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=323,
-  serialized_end=518,
+  serialized_start=298,
+  serialized_end=493,
 )
 
 _FEATUREROWKEY.fields_by_name['eventTimestamp'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
diff --git a/sdk/python/feast/types/Feature_pb2.py b/sdk/python/feast/types/Feature_pb2.py
index d24b6fc09b1..b880b4747e5 100644
--- a/sdk/python/feast/types/Feature_pb2.py
+++ b/sdk/python/feast/types/Feature_pb2.py
@@ -12,7 +12,6 @@
 _sym_db = _symbol_database.Default()
 
 
-from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 from feast.types import Value_pb2 as feast_dot_types_dot_Value__pb2
 
 
@@ -21,9 +20,9 @@
   package='feast.types',
   syntax='proto3',
   serialized_options=_b('\n\013feast.typesB\014FeatureProtoZ6github.com/gojek/feast/protos/generated/go/feast/types'),
-  serialized_pb=_b('\n\x19\x66\x65\x61st/types/Feature.proto\x12\x0b\x66\x65\x61st.types\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17\x66\x65\x61st/types/Value.proto\"8\n\x07\x46\x65\x61ture\x12\n\n\x02id\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.feast.types.ValueBS\n\x0b\x66\x65\x61st.typesB\x0c\x46\x65\x61tureProtoZ6github.com/gojek/feast/protos/generated/go/feast/typesb\x06proto3')
+  serialized_pb=_b('\n\x19\x66\x65\x61st/types/Feature.proto\x12\x0b\x66\x65\x61st.types\x1a\x17\x66\x65\x61st/types/Value.proto\"8\n\x07\x46\x65\x61ture\x12\n\n\x02id\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.feast.types.ValueBS\n\x0b\x66\x65\x61st.typesB\x0c\x46\x65\x61tureProtoZ6github.com/gojek/feast/protos/generated/go/feast/typesb\x06proto3')
   ,
-  dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,feast_dot_types_dot_Value__pb2.DESCRIPTOR,])
+  dependencies=[feast_dot_types_dot_Value__pb2.DESCRIPTOR,])
 
 
 
@@ -61,8 +60,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=100,
-  serialized_end=156,
+  serialized_start=67,
+  serialized_end=123,
 )
 
 _FEATURE.fields_by_name['value'].message_type = feast_dot_types_dot_Value__pb2._VALUE