diff --git a/v1/cpp/certificate.pb.cc b/v1/cpp/certificate.pb.cc
index 41d0c91..a811927 100644
--- a/v1/cpp/certificate.pb.cc
+++ b/v1/cpp/certificate.pb.cc
@@ -19,23 +19,23 @@
 #endif
 // @@protoc_insertion_point(includes)
 
-namespace pb {
+namespace legacy_pb {
 class CertificateDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Certificate>
       _instance;
 } _Certificate_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace protobuf_certificate_2eproto {
 static void InitDefaultsCertificate() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Certificate_default_instance_;
-    new (ptr) ::pb::Certificate();
+    void* ptr = &::legacy_pb::_Certificate_default_instance_;
+    new (ptr) ::legacy_pb::Certificate();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Certificate::InitAsDefaultInstance();
+  ::legacy_pb::Certificate::InitAsDefaultInstance();
 }
 
 ::google::protobuf::internal::SCCInfo<0> scc_info_Certificate =
@@ -49,24 +49,24 @@ void InitDefaults() {
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
 
 const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Certificate, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Certificate, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, keytype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, publickey_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Certificate, version_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Certificate, keytype_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Certificate, publickey_),
   1,
   2,
   0,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 8, sizeof(::pb::Certificate)},
+  { 0, 8, sizeof(::legacy_pb::Certificate)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Certificate_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Certificate_default_instance_),
 };
 
 void protobuf_AssignDescriptors() {
@@ -90,16 +90,16 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\021certificate.proto\022\002pb\"\224\001\n\013Certificate\022"
-      "(\n\007version\030\001 \002(\0162\027.pb.Certificate.Versio"
-      "n\022\034\n\007keyType\030\002 \002(\0162\013.pb.KeyType\022\021\n\tpubli"
-      "cKey\030\004 \002(\014\"*\n\007Version\022\023\n\017UNKNOWN_VERSION"
-      "\020\000\022\n\n\006_0_0_1\020\001*Q\n\007KeyType\022\033\n\027UNKNOWN_PUB"
-      "LIC_KEY_TYPE\020\000\022\014\n\010NIST256p\020\001\022\014\n\010NIST384p"
-      "\020\002\022\r\n\tSECP256k1\020\003"
+      "\n\021certificate.proto\022\tlegacy_pb\"\242\001\n\013Certi"
+      "ficate\022/\n\007version\030\001 \002(\0162\036.legacy_pb.Cert"
+      "ificate.Version\022#\n\007keyType\030\002 \002(\0162\022.legac"
+      "y_pb.KeyType\022\021\n\tpublicKey\030\004 \002(\014\"*\n\007Versi"
+      "on\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001*Q\n\007K"
+      "eyType\022\033\n\027UNKNOWN_PUBLIC_KEY_TYPE\020\000\022\014\n\010N"
+      "IST256p\020\001\022\014\n\010NIST384p\020\002\022\r\n\tSECP256k1\020\003"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 257);
+      descriptor, 278);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "certificate.proto", &protobuf_RegisterTypes);
 }
@@ -115,7 +115,7 @@ struct StaticDescriptorInitializer {
   }
 } static_descriptor_initializer;
 }  // namespace protobuf_certificate_2eproto
-namespace pb {
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Certificate_Version_descriptor() {
   protobuf_certificate_2eproto::protobuf_AssignDescriptorsOnce();
   return protobuf_certificate_2eproto::file_level_enum_descriptors[0];
@@ -169,7 +169,7 @@ Certificate::Certificate()
   ::google::protobuf::internal::InitSCC(
       &protobuf_certificate_2eproto::scc_info_Certificate.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Certificate)
+  // @@protoc_insertion_point(constructor:legacy_pb.Certificate)
 }
 Certificate::Certificate(const Certificate& from)
   : ::google::protobuf::Message(),
@@ -183,7 +183,7 @@ Certificate::Certificate(const Certificate& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&keytype_) -
     reinterpret_cast<char*>(&version_)) + sizeof(keytype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Certificate)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Certificate)
 }
 
 void Certificate::SharedCtor() {
@@ -194,7 +194,7 @@ void Certificate::SharedCtor() {
 }
 
 Certificate::~Certificate() {
-  // @@protoc_insertion_point(destructor:pb.Certificate)
+  // @@protoc_insertion_point(destructor:legacy_pb.Certificate)
   SharedDtor();
 }
 
@@ -217,7 +217,7 @@ const Certificate& Certificate::default_instance() {
 
 
 void Certificate::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Certificate)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Certificate)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -239,13 +239,13 @@ bool Certificate::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Certificate)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Certificate)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Certificate.Version version = 1;
+      // required .legacy_pb.Certificate.Version version = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -253,8 +253,8 @@ bool Certificate::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Certificate_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Certificate_Version >(value));
+          if (::legacy_pb::Certificate_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Certificate_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 1, static_cast< ::google::protobuf::uint64>(value));
@@ -265,7 +265,7 @@ bool Certificate::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.KeyType keyType = 2;
+      // required .legacy_pb.KeyType keyType = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
@@ -273,8 +273,8 @@ bool Certificate::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::KeyType_IsValid(value)) {
-            set_keytype(static_cast< ::pb::KeyType >(value));
+          if (::legacy_pb::KeyType_IsValid(value)) {
+            set_keytype(static_cast< ::legacy_pb::KeyType >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 2, static_cast< ::google::protobuf::uint64>(value));
@@ -309,28 +309,28 @@ bool Certificate::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Certificate)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Certificate)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Certificate)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Certificate)
   return false;
 #undef DO_
 }
 
 void Certificate::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Certificate)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Certificate)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Certificate.Version version = 1;
+  // required .legacy_pb.Certificate.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.KeyType keyType = 2;
+  // required .legacy_pb.KeyType keyType = 2;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->keytype(), output);
@@ -346,24 +346,24 @@ void Certificate::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Certificate)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Certificate)
 }
 
 ::google::protobuf::uint8* Certificate::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Certificate)
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Certificate)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Certificate.Version version = 1;
+  // required .legacy_pb.Certificate.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.KeyType keyType = 2;
+  // required .legacy_pb.KeyType keyType = 2;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->keytype(), target);
@@ -380,12 +380,12 @@ void Certificate::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Certificate)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Certificate)
   return target;
 }
 
 size_t Certificate::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Certificate)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Certificate)
   size_t total_size = 0;
 
   if (has_publickey()) {
@@ -396,13 +396,13 @@ size_t Certificate::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Certificate.Version version = 1;
+    // required .legacy_pb.Certificate.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_keytype()) {
-    // required .pb.KeyType keyType = 2;
+    // required .legacy_pb.KeyType keyType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->keytype());
   }
@@ -410,7 +410,7 @@ size_t Certificate::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Certificate::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Certificate)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Certificate)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -424,11 +424,11 @@ size_t Certificate::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::BytesSize(
         this->publickey());
 
-    // required .pb.Certificate.Version version = 1;
+    // required .legacy_pb.Certificate.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.KeyType keyType = 2;
+    // required .legacy_pb.KeyType keyType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->keytype());
 
@@ -441,22 +441,22 @@ size_t Certificate::ByteSizeLong() const {
 }
 
 void Certificate::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Certificate)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Certificate)
   GOOGLE_DCHECK_NE(&from, this);
   const Certificate* source =
       ::google::protobuf::internal::DynamicCastToGenerated<const Certificate>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Certificate)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Certificate)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Certificate)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Certificate)
     MergeFrom(*source);
   }
 }
 
 void Certificate::MergeFrom(const Certificate& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Certificate)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Certificate)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -479,14 +479,14 @@ void Certificate::MergeFrom(const Certificate& from) {
 }
 
 void Certificate::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Certificate)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Certificate)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Certificate::CopyFrom(const Certificate& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Certificate)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Certificate)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -518,11 +518,11 @@ void Certificate::InternalSwap(Certificate* other) {
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Certificate* Arena::CreateMaybeMessage< ::pb::Certificate >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Certificate >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Certificate* Arena::CreateMaybeMessage< ::legacy_pb::Certificate >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Certificate >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
diff --git a/v1/cpp/certificate.pb.h b/v1/cpp/certificate.pb.h
index abae66c..b3738c6 100644
--- a/v1/cpp/certificate.pb.h
+++ b/v1/cpp/certificate.pb.h
@@ -8,12 +8,12 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -46,17 +46,17 @@ struct TableStruct {
 };
 void AddDescriptors();
 }  // namespace protobuf_certificate_2eproto
-namespace pb {
+namespace legacy_pb {
 class Certificate;
 class CertificateDefaultTypeInternal;
 extern CertificateDefaultTypeInternal _Certificate_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Certificate* Arena::CreateMaybeMessage<::pb::Certificate>(Arena*);
+template<> ::legacy_pb::Certificate* Arena::CreateMaybeMessage<::legacy_pb::Certificate>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Certificate_Version {
   Certificate_Version_UNKNOWN_VERSION = 0,
@@ -100,7 +100,7 @@ inline bool KeyType_Parse(
 }
 // ===================================================================
 
-class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Certificate) */ {
+class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Certificate) */ {
  public:
   Certificate();
   virtual ~Certificate();
@@ -235,21 +235,21 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
   ::std::string* release_publickey();
   void set_allocated_publickey(::std::string* publickey);
 
-  // required .pb.Certificate.Version version = 1;
+  // required .legacy_pb.Certificate.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Certificate_Version version() const;
-  void set_version(::pb::Certificate_Version value);
+  ::legacy_pb::Certificate_Version version() const;
+  void set_version(::legacy_pb::Certificate_Version value);
 
-  // required .pb.KeyType keyType = 2;
+  // required .legacy_pb.KeyType keyType = 2;
   bool has_keytype() const;
   void clear_keytype();
   static const int kKeyTypeFieldNumber = 2;
-  ::pb::KeyType keytype() const;
-  void set_keytype(::pb::KeyType value);
+  ::legacy_pb::KeyType keytype() const;
+  void set_keytype(::legacy_pb::KeyType value);
 
-  // @@protoc_insertion_point(class_scope:pb.Certificate)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Certificate)
  private:
   void set_has_version();
   void clear_has_version();
@@ -280,7 +280,7 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
 #endif  // __GNUC__
 // Certificate
 
-// required .pb.Certificate.Version version = 1;
+// required .legacy_pb.Certificate.Version version = 1;
 inline bool Certificate::has_version() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -294,18 +294,18 @@ inline void Certificate::clear_version() {
   version_ = 0;
   clear_has_version();
 }
-inline ::pb::Certificate_Version Certificate::version() const {
-  // @@protoc_insertion_point(field_get:pb.Certificate.version)
-  return static_cast< ::pb::Certificate_Version >(version_);
+inline ::legacy_pb::Certificate_Version Certificate::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Certificate.version)
+  return static_cast< ::legacy_pb::Certificate_Version >(version_);
 }
-inline void Certificate::set_version(::pb::Certificate_Version value) {
-  assert(::pb::Certificate_Version_IsValid(value));
+inline void Certificate::set_version(::legacy_pb::Certificate_Version value) {
+  assert(::legacy_pb::Certificate_Version_IsValid(value));
   set_has_version();
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Certificate.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Certificate.version)
 }
 
-// required .pb.KeyType keyType = 2;
+// required .legacy_pb.KeyType keyType = 2;
 inline bool Certificate::has_keytype() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -319,15 +319,15 @@ inline void Certificate::clear_keytype() {
   keytype_ = 0;
   clear_has_keytype();
 }
-inline ::pb::KeyType Certificate::keytype() const {
-  // @@protoc_insertion_point(field_get:pb.Certificate.keyType)
-  return static_cast< ::pb::KeyType >(keytype_);
+inline ::legacy_pb::KeyType Certificate::keytype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Certificate.keyType)
+  return static_cast< ::legacy_pb::KeyType >(keytype_);
 }
-inline void Certificate::set_keytype(::pb::KeyType value) {
-  assert(::pb::KeyType_IsValid(value));
+inline void Certificate::set_keytype(::legacy_pb::KeyType value) {
+  assert(::legacy_pb::KeyType_IsValid(value));
   set_has_keytype();
   keytype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Certificate.keyType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Certificate.keyType)
 }
 
 // required bytes publicKey = 4;
@@ -345,41 +345,41 @@ inline void Certificate::clear_publickey() {
   clear_has_publickey();
 }
 inline const ::std::string& Certificate::publickey() const {
-  // @@protoc_insertion_point(field_get:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_get:legacy_pb.Certificate.publicKey)
   return publickey_.GetNoArena();
 }
 inline void Certificate::set_publickey(const ::std::string& value) {
   set_has_publickey();
   publickey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set:legacy_pb.Certificate.publicKey)
 }
 #if LANG_CXX11
 inline void Certificate::set_publickey(::std::string&& value) {
   set_has_publickey();
   publickey_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Certificate.publicKey)
 }
 #endif
 inline void Certificate::set_publickey(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_publickey();
   publickey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Certificate.publicKey)
 }
 inline void Certificate::set_publickey(const void* value, size_t size) {
   set_has_publickey();
   publickey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Certificate.publicKey)
 }
 inline ::std::string* Certificate::mutable_publickey() {
   set_has_publickey();
-  // @@protoc_insertion_point(field_mutable:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Certificate.publicKey)
   return publickey_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Certificate::release_publickey() {
-  // @@protoc_insertion_point(field_release:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_release:legacy_pb.Certificate.publicKey)
   if (!has_publickey()) {
     return NULL;
   }
@@ -393,7 +393,7 @@ inline void Certificate::set_allocated_publickey(::std::string* publickey) {
     clear_has_publickey();
   }
   publickey_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), publickey);
-  // @@protoc_insertion_point(field_set_allocated:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Certificate.publicKey)
 }
 
 #ifdef __GNUC__
@@ -402,20 +402,20 @@ inline void Certificate::set_allocated_publickey(::std::string* publickey) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Certificate_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Certificate_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Certificate_Version>() {
-  return ::pb::Certificate_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Certificate_Version>() {
+  return ::legacy_pb::Certificate_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::KeyType> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::KeyType> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::KeyType>() {
-  return ::pb::KeyType_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::KeyType>() {
+  return ::legacy_pb::KeyType_descriptor();
 }
 
 }  // namespace protobuf
diff --git a/v1/cpp/fee.pb.cc b/v1/cpp/fee.pb.cc
index 87fe489..3a2bfff 100644
--- a/v1/cpp/fee.pb.cc
+++ b/v1/cpp/fee.pb.cc
@@ -19,23 +19,23 @@
 #endif
 // @@protoc_insertion_point(includes)
 
-namespace pb {
+namespace legacy_pb {
 class FeeDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Fee>
       _instance;
 } _Fee_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace protobuf_fee_2eproto {
 static void InitDefaultsFee() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Fee_default_instance_;
-    new (ptr) ::pb::Fee();
+    void* ptr = &::legacy_pb::_Fee_default_instance_;
+    new (ptr) ::legacy_pb::Fee();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Fee::InitAsDefaultInstance();
+  ::legacy_pb::Fee::InitAsDefaultInstance();
 }
 
 ::google::protobuf::internal::SCCInfo<0> scc_info_Fee =
@@ -49,26 +49,26 @@ void InitDefaults() {
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
 
 const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, currency_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, address_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, amount_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, version_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, currency_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, address_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, amount_),
   1,
   2,
   0,
   3,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 9, sizeof(::pb::Fee)},
+  { 0, 9, sizeof(::legacy_pb::Fee)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Fee_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Fee_default_instance_),
 };
 
 void protobuf_AssignDescriptors() {
@@ -92,15 +92,16 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\tfee.proto\022\002pb\"\325\001\n\003Fee\022 \n\007version\030\001 \002(\016"
-      "2\017.pb.Fee.Version\022\"\n\010currency\030\002 \002(\0162\020.pb"
-      ".Fee.Currency\022\017\n\007address\030\003 \002(\014\022\016\n\006amount"
-      "\030\004 \002(\002\"*\n\007Version\022\023\n\017UNKNOWN_VERSION\020\000\022\n"
-      "\n\006_0_0_1\020\001\";\n\010Currency\022\024\n\020UNKNOWN_CURREN"
-      "CY\020\000\022\007\n\003LBC\020\001\022\007\n\003BTC\020\002\022\007\n\003USD\020\003"
+      "\n\tfee.proto\022\tlegacy_pb\"\343\001\n\003Fee\022\'\n\007versio"
+      "n\030\001 \002(\0162\026.legacy_pb.Fee.Version\022)\n\010curre"
+      "ncy\030\002 \002(\0162\027.legacy_pb.Fee.Currency\022\017\n\007ad"
+      "dress\030\003 \002(\014\022\016\n\006amount\030\004 \002(\002\"*\n\007Version\022\023"
+      "\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\";\n\010Curre"
+      "ncy\022\024\n\020UNKNOWN_CURRENCY\020\000\022\007\n\003LBC\020\001\022\007\n\003BT"
+      "C\020\002\022\007\n\003USD\020\003"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 231);
+      descriptor, 252);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "fee.proto", &protobuf_RegisterTypes);
 }
@@ -116,7 +117,7 @@ struct StaticDescriptorInitializer {
   }
 } static_descriptor_initializer;
 }  // namespace protobuf_fee_2eproto
-namespace pb {
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Fee_Version_descriptor() {
   protobuf_fee_2eproto::protobuf_AssignDescriptorsOnce();
   return protobuf_fee_2eproto::file_level_enum_descriptors[0];
@@ -180,7 +181,7 @@ Fee::Fee()
   ::google::protobuf::internal::InitSCC(
       &protobuf_fee_2eproto::scc_info_Fee.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Fee)
+  // @@protoc_insertion_point(constructor:legacy_pb.Fee)
 }
 Fee::Fee(const Fee& from)
   : ::google::protobuf::Message(),
@@ -194,7 +195,7 @@ Fee::Fee(const Fee& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&amount_) -
     reinterpret_cast<char*>(&version_)) + sizeof(amount_));
-  // @@protoc_insertion_point(copy_constructor:pb.Fee)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Fee)
 }
 
 void Fee::SharedCtor() {
@@ -205,7 +206,7 @@ void Fee::SharedCtor() {
 }
 
 Fee::~Fee() {
-  // @@protoc_insertion_point(destructor:pb.Fee)
+  // @@protoc_insertion_point(destructor:legacy_pb.Fee)
   SharedDtor();
 }
 
@@ -228,7 +229,7 @@ const Fee& Fee::default_instance() {
 
 
 void Fee::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Fee)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -250,13 +251,13 @@ bool Fee::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Fee)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Fee)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Fee.Version version = 1;
+      // required .legacy_pb.Fee.Version version = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -264,8 +265,8 @@ bool Fee::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Fee_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Fee_Version >(value));
+          if (::legacy_pb::Fee_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Fee_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 1, static_cast< ::google::protobuf::uint64>(value));
@@ -276,7 +277,7 @@ bool Fee::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Fee.Currency currency = 2;
+      // required .legacy_pb.Fee.Currency currency = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
@@ -284,8 +285,8 @@ bool Fee::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Fee_Currency_IsValid(value)) {
-            set_currency(static_cast< ::pb::Fee_Currency >(value));
+          if (::legacy_pb::Fee_Currency_IsValid(value)) {
+            set_currency(static_cast< ::legacy_pb::Fee_Currency >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 2, static_cast< ::google::protobuf::uint64>(value));
@@ -334,28 +335,28 @@ bool Fee::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Fee)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Fee)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Fee)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Fee)
   return false;
 #undef DO_
 }
 
 void Fee::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Fee)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Fee.Version version = 1;
+  // required .legacy_pb.Fee.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.Fee.Currency currency = 2;
+  // required .legacy_pb.Fee.Currency currency = 2;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->currency(), output);
@@ -376,24 +377,24 @@ void Fee::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Fee)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Fee)
 }
 
 ::google::protobuf::uint8* Fee::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Fee)
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Fee.Version version = 1;
+  // required .legacy_pb.Fee.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.Fee.Currency currency = 2;
+  // required .legacy_pb.Fee.Currency currency = 2;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->currency(), target);
@@ -415,12 +416,12 @@ void Fee::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Fee)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Fee)
   return target;
 }
 
 size_t Fee::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Fee)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Fee)
   size_t total_size = 0;
 
   if (has_address()) {
@@ -431,13 +432,13 @@ size_t Fee::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Fee.Version version = 1;
+    // required .legacy_pb.Fee.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_currency()) {
-    // required .pb.Fee.Currency currency = 2;
+    // required .legacy_pb.Fee.Currency currency = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->currency());
   }
@@ -450,7 +451,7 @@ size_t Fee::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Fee::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Fee)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Fee)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -464,11 +465,11 @@ size_t Fee::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::BytesSize(
         this->address());
 
-    // required .pb.Fee.Version version = 1;
+    // required .legacy_pb.Fee.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.Fee.Currency currency = 2;
+    // required .legacy_pb.Fee.Currency currency = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->currency());
 
@@ -484,22 +485,22 @@ size_t Fee::ByteSizeLong() const {
 }
 
 void Fee::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Fee)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Fee)
   GOOGLE_DCHECK_NE(&from, this);
   const Fee* source =
       ::google::protobuf::internal::DynamicCastToGenerated<const Fee>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Fee)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Fee)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Fee)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Fee)
     MergeFrom(*source);
   }
 }
 
 void Fee::MergeFrom(const Fee& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Fee)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Fee)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -525,14 +526,14 @@ void Fee::MergeFrom(const Fee& from) {
 }
 
 void Fee::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Fee)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Fee)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Fee::CopyFrom(const Fee& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Fee)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Fee)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -565,11 +566,11 @@ void Fee::InternalSwap(Fee* other) {
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Fee* Arena::CreateMaybeMessage< ::pb::Fee >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Fee >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Fee* Arena::CreateMaybeMessage< ::legacy_pb::Fee >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Fee >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
diff --git a/v1/cpp/fee.pb.h b/v1/cpp/fee.pb.h
index e675435..b3f1420 100644
--- a/v1/cpp/fee.pb.h
+++ b/v1/cpp/fee.pb.h
@@ -8,12 +8,12 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -46,17 +46,17 @@ struct TableStruct {
 };
 void AddDescriptors();
 }  // namespace protobuf_fee_2eproto
-namespace pb {
+namespace legacy_pb {
 class Fee;
 class FeeDefaultTypeInternal;
 extern FeeDefaultTypeInternal _Fee_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Fee* Arena::CreateMaybeMessage<::pb::Fee>(Arena*);
+template<> ::legacy_pb::Fee* Arena::CreateMaybeMessage<::legacy_pb::Fee>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Fee_Version {
   Fee_Version_UNKNOWN_VERSION = 0,
@@ -100,7 +100,7 @@ inline bool Fee_Currency_Parse(
 }
 // ===================================================================
 
-class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Fee) */ {
+class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Fee) */ {
  public:
   Fee();
   virtual ~Fee();
@@ -265,19 +265,19 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   ::std::string* release_address();
   void set_allocated_address(::std::string* address);
 
-  // required .pb.Fee.Version version = 1;
+  // required .legacy_pb.Fee.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Fee_Version version() const;
-  void set_version(::pb::Fee_Version value);
+  ::legacy_pb::Fee_Version version() const;
+  void set_version(::legacy_pb::Fee_Version value);
 
-  // required .pb.Fee.Currency currency = 2;
+  // required .legacy_pb.Fee.Currency currency = 2;
   bool has_currency() const;
   void clear_currency();
   static const int kCurrencyFieldNumber = 2;
-  ::pb::Fee_Currency currency() const;
-  void set_currency(::pb::Fee_Currency value);
+  ::legacy_pb::Fee_Currency currency() const;
+  void set_currency(::legacy_pb::Fee_Currency value);
 
   // required float amount = 4;
   bool has_amount() const;
@@ -286,7 +286,7 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   float amount() const;
   void set_amount(float value);
 
-  // @@protoc_insertion_point(class_scope:pb.Fee)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Fee)
  private:
   void set_has_version();
   void clear_has_version();
@@ -320,7 +320,7 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
 #endif  // __GNUC__
 // Fee
 
-// required .pb.Fee.Version version = 1;
+// required .legacy_pb.Fee.Version version = 1;
 inline bool Fee::has_version() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -334,18 +334,18 @@ inline void Fee::clear_version() {
   version_ = 0;
   clear_has_version();
 }
-inline ::pb::Fee_Version Fee::version() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.version)
-  return static_cast< ::pb::Fee_Version >(version_);
+inline ::legacy_pb::Fee_Version Fee::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.version)
+  return static_cast< ::legacy_pb::Fee_Version >(version_);
 }
-inline void Fee::set_version(::pb::Fee_Version value) {
-  assert(::pb::Fee_Version_IsValid(value));
+inline void Fee::set_version(::legacy_pb::Fee_Version value) {
+  assert(::legacy_pb::Fee_Version_IsValid(value));
   set_has_version();
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.version)
 }
 
-// required .pb.Fee.Currency currency = 2;
+// required .legacy_pb.Fee.Currency currency = 2;
 inline bool Fee::has_currency() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -359,15 +359,15 @@ inline void Fee::clear_currency() {
   currency_ = 0;
   clear_has_currency();
 }
-inline ::pb::Fee_Currency Fee::currency() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.currency)
-  return static_cast< ::pb::Fee_Currency >(currency_);
+inline ::legacy_pb::Fee_Currency Fee::currency() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.currency)
+  return static_cast< ::legacy_pb::Fee_Currency >(currency_);
 }
-inline void Fee::set_currency(::pb::Fee_Currency value) {
-  assert(::pb::Fee_Currency_IsValid(value));
+inline void Fee::set_currency(::legacy_pb::Fee_Currency value) {
+  assert(::legacy_pb::Fee_Currency_IsValid(value));
   set_has_currency();
   currency_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.currency)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.currency)
 }
 
 // required bytes address = 3;
@@ -385,41 +385,41 @@ inline void Fee::clear_address() {
   clear_has_address();
 }
 inline const ::std::string& Fee::address() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.address)
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.address)
   return address_.GetNoArena();
 }
 inline void Fee::set_address(const ::std::string& value) {
   set_has_address();
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Fee.address)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.address)
 }
 #if LANG_CXX11
 inline void Fee::set_address(::std::string&& value) {
   set_has_address();
   address_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Fee.address)
 }
 #endif
 inline void Fee::set_address(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_address();
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Fee.address)
 }
 inline void Fee::set_address(const void* value, size_t size) {
   set_has_address();
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Fee.address)
 }
 inline ::std::string* Fee::mutable_address() {
   set_has_address();
-  // @@protoc_insertion_point(field_mutable:pb.Fee.address)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Fee.address)
   return address_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Fee::release_address() {
-  // @@protoc_insertion_point(field_release:pb.Fee.address)
+  // @@protoc_insertion_point(field_release:legacy_pb.Fee.address)
   if (!has_address()) {
     return NULL;
   }
@@ -433,7 +433,7 @@ inline void Fee::set_allocated_address(::std::string* address) {
     clear_has_address();
   }
   address_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), address);
-  // @@protoc_insertion_point(field_set_allocated:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Fee.address)
 }
 
 // required float amount = 4;
@@ -451,13 +451,13 @@ inline void Fee::clear_amount() {
   clear_has_amount();
 }
 inline float Fee::amount() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.amount)
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.amount)
   return amount_;
 }
 inline void Fee::set_amount(float value) {
   set_has_amount();
   amount_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.amount)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.amount)
 }
 
 #ifdef __GNUC__
@@ -466,20 +466,20 @@ inline void Fee::set_amount(float value) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Fee_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Fee_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Fee_Version>() {
-  return ::pb::Fee_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Fee_Version>() {
+  return ::legacy_pb::Fee_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Fee_Currency> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Fee_Currency> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Fee_Currency>() {
-  return ::pb::Fee_Currency_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Fee_Currency>() {
+  return ::legacy_pb::Fee_Currency_descriptor();
 }
 
 }  // namespace protobuf
diff --git a/v1/cpp/claim.pb.cc b/v1/cpp/legacy_claim.pb.cc
similarity index 72%
rename from v1/cpp/claim.pb.cc
rename to v1/cpp/legacy_claim.pb.cc
index 7429622..cf8ced8 100644
--- a/v1/cpp/claim.pb.cc
+++ b/v1/cpp/legacy_claim.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: claim.proto
+// source: legacy_claim.proto
 
-#include "claim.pb.h"
+#include "legacy_claim.pb.h"
 
 #include <algorithm>
 
@@ -28,23 +28,23 @@ extern PROTOBUF_INTERNAL_EXPORT_protobuf_signature_2eproto ::google::protobuf::i
 namespace protobuf_stream_2eproto {
 extern PROTOBUF_INTERNAL_EXPORT_protobuf_stream_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_Stream;
 }  // namespace protobuf_stream_2eproto
-namespace pb {
+namespace legacy_pb {
 class ClaimDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Claim>
       _instance;
 } _Claim_default_instance_;
-}  // namespace pb
-namespace protobuf_claim_2eproto {
+}  // namespace legacy_pb
+namespace protobuf_legacy_5fclaim_2eproto {
 static void InitDefaultsClaim() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Claim_default_instance_;
-    new (ptr) ::pb::Claim();
+    void* ptr = &::legacy_pb::_Claim_default_instance_;
+    new (ptr) ::legacy_pb::Claim();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Claim::InitAsDefaultInstance();
+  ::legacy_pb::Claim::InitAsDefaultInstance();
 }
 
 ::google::protobuf::internal::SCCInfo<3> scc_info_Claim =
@@ -61,16 +61,16 @@ void InitDefaults() {
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
 
 const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, claimtype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, stream_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, certificate_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, publishersignature_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, version_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, claimtype_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, stream_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, certificate_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, publishersignature_),
   3,
   4,
   0,
@@ -78,17 +78,17 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   2,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 10, sizeof(::pb::Claim)},
+  { 0, 10, sizeof(::legacy_pb::Claim)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Claim_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Claim_default_instance_),
 };
 
 void protobuf_AssignDescriptors() {
   AddDescriptors();
   AssignDescriptors(
-      "claim.proto", schemas, file_default_instances, TableStruct::offsets,
+      "legacy_claim.proto", schemas, file_default_instances, TableStruct::offsets,
       file_level_metadata, file_level_enum_descriptors, NULL);
 }
 
@@ -106,21 +106,22 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\013claim.proto\022\002pb\032\014stream.proto\032\021certifi"
-      "cate.proto\032\017signature.proto\"\266\002\n\005Claim\022\"\n"
-      "\007version\030\001 \002(\0162\021.pb.Claim.Version\022&\n\tcla"
-      "imType\030\002 \002(\0162\023.pb.Claim.ClaimType\022\032\n\006str"
-      "eam\030\003 \001(\0132\n.pb.Stream\022$\n\013certificate\030\004 \001"
-      "(\0132\017.pb.Certificate\022)\n\022publisherSignatur"
-      "e\030\005 \001(\0132\r.pb.Signature\"*\n\007Version\022\023\n\017UNK"
-      "NOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\"H\n\tClaimType\022"
-      "\026\n\022UNKNOWN_CLAIM_TYPE\020\000\022\016\n\nstreamType\020\001\022"
-      "\023\n\017certificateType\020\002"
+      "\n\022legacy_claim.proto\022\tlegacy_pb\032\014stream."
+      "proto\032\021certificate.proto\032\017signature.prot"
+      "o\"\331\002\n\005Claim\022)\n\007version\030\001 \002(\0162\030.legacy_pb"
+      ".Claim.Version\022-\n\tclaimType\030\002 \002(\0162\032.lega"
+      "cy_pb.Claim.ClaimType\022!\n\006stream\030\003 \001(\0132\021."
+      "legacy_pb.Stream\022+\n\013certificate\030\004 \001(\0132\026."
+      "legacy_pb.Certificate\0220\n\022publisherSignat"
+      "ure\030\005 \001(\0132\024.legacy_pb.Signature\"*\n\007Versi"
+      "on\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\"H\n\tC"
+      "laimType\022\026\n\022UNKNOWN_CLAIM_TYPE\020\000\022\016\n\nstre"
+      "amType\020\001\022\023\n\017certificateType\020\002"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 380);
+      descriptor, 429);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "claim.proto", &protobuf_RegisterTypes);
+    "legacy_claim.proto", &protobuf_RegisterTypes);
   ::protobuf_stream_2eproto::AddDescriptors();
   ::protobuf_certificate_2eproto::AddDescriptors();
   ::protobuf_signature_2eproto::AddDescriptors();
@@ -136,11 +137,11 @@ struct StaticDescriptorInitializer {
     AddDescriptors();
   }
 } static_descriptor_initializer;
-}  // namespace protobuf_claim_2eproto
-namespace pb {
+}  // namespace protobuf_legacy_5fclaim_2eproto
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Claim_Version_descriptor() {
-  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_claim_2eproto::file_level_enum_descriptors[0];
+  protobuf_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
+  return protobuf_legacy_5fclaim_2eproto::file_level_enum_descriptors[0];
 }
 bool Claim_Version_IsValid(int value) {
   switch (value) {
@@ -160,8 +161,8 @@ const Claim_Version Claim::Version_MAX;
 const int Claim::Version_ARRAYSIZE;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 const ::google::protobuf::EnumDescriptor* Claim_ClaimType_descriptor() {
-  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_claim_2eproto::file_level_enum_descriptors[1];
+  protobuf_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
+  return protobuf_legacy_5fclaim_2eproto::file_level_enum_descriptors[1];
 }
 bool Claim_ClaimType_IsValid(int value) {
   switch (value) {
@@ -186,12 +187,12 @@ const int Claim::ClaimType_ARRAYSIZE;
 // ===================================================================
 
 void Claim::InitAsDefaultInstance() {
-  ::pb::_Claim_default_instance_._instance.get_mutable()->stream_ = const_cast< ::pb::Stream*>(
-      ::pb::Stream::internal_default_instance());
-  ::pb::_Claim_default_instance_._instance.get_mutable()->certificate_ = const_cast< ::pb::Certificate*>(
-      ::pb::Certificate::internal_default_instance());
-  ::pb::_Claim_default_instance_._instance.get_mutable()->publishersignature_ = const_cast< ::pb::Signature*>(
-      ::pb::Signature::internal_default_instance());
+  ::legacy_pb::_Claim_default_instance_._instance.get_mutable()->stream_ = const_cast< ::legacy_pb::Stream*>(
+      ::legacy_pb::Stream::internal_default_instance());
+  ::legacy_pb::_Claim_default_instance_._instance.get_mutable()->certificate_ = const_cast< ::legacy_pb::Certificate*>(
+      ::legacy_pb::Certificate::internal_default_instance());
+  ::legacy_pb::_Claim_default_instance_._instance.get_mutable()->publishersignature_ = const_cast< ::legacy_pb::Signature*>(
+      ::legacy_pb::Signature::internal_default_instance());
 }
 void Claim::clear_stream() {
   if (stream_ != NULL) stream_->Clear();
@@ -216,9 +217,9 @@ const int Claim::kPublisherSignatureFieldNumber;
 Claim::Claim()
   : ::google::protobuf::Message(), _internal_metadata_(NULL) {
   ::google::protobuf::internal::InitSCC(
-      &protobuf_claim_2eproto::scc_info_Claim.base);
+      &protobuf_legacy_5fclaim_2eproto::scc_info_Claim.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Claim)
+  // @@protoc_insertion_point(constructor:legacy_pb.Claim)
 }
 Claim::Claim(const Claim& from)
   : ::google::protobuf::Message(),
@@ -226,24 +227,24 @@ Claim::Claim(const Claim& from)
       _has_bits_(from._has_bits_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   if (from.has_stream()) {
-    stream_ = new ::pb::Stream(*from.stream_);
+    stream_ = new ::legacy_pb::Stream(*from.stream_);
   } else {
     stream_ = NULL;
   }
   if (from.has_certificate()) {
-    certificate_ = new ::pb::Certificate(*from.certificate_);
+    certificate_ = new ::legacy_pb::Certificate(*from.certificate_);
   } else {
     certificate_ = NULL;
   }
   if (from.has_publishersignature()) {
-    publishersignature_ = new ::pb::Signature(*from.publishersignature_);
+    publishersignature_ = new ::legacy_pb::Signature(*from.publishersignature_);
   } else {
     publishersignature_ = NULL;
   }
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&claimtype_) -
     reinterpret_cast<char*>(&version_)) + sizeof(claimtype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Claim)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Claim)
 }
 
 void Claim::SharedCtor() {
@@ -253,7 +254,7 @@ void Claim::SharedCtor() {
 }
 
 Claim::~Claim() {
-  // @@protoc_insertion_point(destructor:pb.Claim)
+  // @@protoc_insertion_point(destructor:legacy_pb.Claim)
   SharedDtor();
 }
 
@@ -267,18 +268,18 @@ void Claim::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
 const ::google::protobuf::Descriptor* Claim::descriptor() {
-  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
+  ::protobuf_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_legacy_5fclaim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
 }
 
 const Claim& Claim::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_Claim.base);
+  ::google::protobuf::internal::InitSCC(&protobuf_legacy_5fclaim_2eproto::scc_info_Claim.base);
   return *internal_default_instance();
 }
 
 
 void Claim::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Claim)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Claim)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -311,13 +312,13 @@ bool Claim::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Claim)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Claim)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Claim.Version version = 1;
+      // required .legacy_pb.Claim.Version version = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -325,8 +326,8 @@ bool Claim::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Claim_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Claim_Version >(value));
+          if (::legacy_pb::Claim_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Claim_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 1, static_cast< ::google::protobuf::uint64>(value));
@@ -337,7 +338,7 @@ bool Claim::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Claim.ClaimType claimType = 2;
+      // required .legacy_pb.Claim.ClaimType claimType = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
@@ -345,8 +346,8 @@ bool Claim::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Claim_ClaimType_IsValid(value)) {
-            set_claimtype(static_cast< ::pb::Claim_ClaimType >(value));
+          if (::legacy_pb::Claim_ClaimType_IsValid(value)) {
+            set_claimtype(static_cast< ::legacy_pb::Claim_ClaimType >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 2, static_cast< ::google::protobuf::uint64>(value));
@@ -357,7 +358,7 @@ bool Claim::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .pb.Stream stream = 3;
+      // optional .legacy_pb.Stream stream = 3;
       case 3: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
@@ -369,7 +370,7 @@ bool Claim::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .pb.Certificate certificate = 4;
+      // optional .legacy_pb.Certificate certificate = 4;
       case 4: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
@@ -381,7 +382,7 @@ bool Claim::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .pb.Signature publisherSignature = 5;
+      // optional .legacy_pb.Signature publisherSignature = 5;
       case 5: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
@@ -405,46 +406,46 @@ bool Claim::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Claim)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Claim)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Claim)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Claim)
   return false;
 #undef DO_
 }
 
 void Claim::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Claim)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Claim)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Claim.Version version = 1;
+  // required .legacy_pb.Claim.Version version = 1;
   if (cached_has_bits & 0x00000008u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.Claim.ClaimType claimType = 2;
+  // required .legacy_pb.Claim.ClaimType claimType = 2;
   if (cached_has_bits & 0x00000010u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->claimtype(), output);
   }
 
-  // optional .pb.Stream stream = 3;
+  // optional .legacy_pb.Stream stream = 3;
   if (cached_has_bits & 0x00000001u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->_internal_stream(), output);
   }
 
-  // optional .pb.Certificate certificate = 4;
+  // optional .legacy_pb.Certificate certificate = 4;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       4, this->_internal_certificate(), output);
   }
 
-  // optional .pb.Signature publisherSignature = 5;
+  // optional .legacy_pb.Signature publisherSignature = 5;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       5, this->_internal_publishersignature(), output);
@@ -454,44 +455,44 @@ void Claim::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Claim)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Claim)
 }
 
 ::google::protobuf::uint8* Claim::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Claim)
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Claim)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Claim.Version version = 1;
+  // required .legacy_pb.Claim.Version version = 1;
   if (cached_has_bits & 0x00000008u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.Claim.ClaimType claimType = 2;
+  // required .legacy_pb.Claim.ClaimType claimType = 2;
   if (cached_has_bits & 0x00000010u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->claimtype(), target);
   }
 
-  // optional .pb.Stream stream = 3;
+  // optional .legacy_pb.Stream stream = 3;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
         3, this->_internal_stream(), deterministic, target);
   }
 
-  // optional .pb.Certificate certificate = 4;
+  // optional .legacy_pb.Certificate certificate = 4;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
         4, this->_internal_certificate(), deterministic, target);
   }
 
-  // optional .pb.Signature publisherSignature = 5;
+  // optional .legacy_pb.Signature publisherSignature = 5;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
@@ -502,22 +503,22 @@ void Claim::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Claim)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Claim)
   return target;
 }
 
 size_t Claim::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Claim)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Claim)
   size_t total_size = 0;
 
   if (has_version()) {
-    // required .pb.Claim.Version version = 1;
+    // required .legacy_pb.Claim.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_claimtype()) {
-    // required .pb.Claim.ClaimType claimType = 2;
+    // required .legacy_pb.Claim.ClaimType claimType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->claimtype());
   }
@@ -525,7 +526,7 @@ size_t Claim::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Claim::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Claim)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Claim)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -534,11 +535,11 @@ size_t Claim::ByteSizeLong() const {
         _internal_metadata_.unknown_fields());
   }
   if (((_has_bits_[0] & 0x00000018) ^ 0x00000018) == 0) {  // All required fields are present.
-    // required .pb.Claim.Version version = 1;
+    // required .legacy_pb.Claim.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.Claim.ClaimType claimType = 2;
+    // required .legacy_pb.Claim.ClaimType claimType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->claimtype());
 
@@ -546,21 +547,21 @@ size_t Claim::ByteSizeLong() const {
     total_size += RequiredFieldsByteSizeFallback();
   }
   if (_has_bits_[0 / 32] & 7u) {
-    // optional .pb.Stream stream = 3;
+    // optional .legacy_pb.Stream stream = 3;
     if (has_stream()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
           *stream_);
     }
 
-    // optional .pb.Certificate certificate = 4;
+    // optional .legacy_pb.Certificate certificate = 4;
     if (has_certificate()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
           *certificate_);
     }
 
-    // optional .pb.Signature publisherSignature = 5;
+    // optional .legacy_pb.Signature publisherSignature = 5;
     if (has_publishersignature()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
@@ -574,22 +575,22 @@ size_t Claim::ByteSizeLong() const {
 }
 
 void Claim::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Claim)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Claim)
   GOOGLE_DCHECK_NE(&from, this);
   const Claim* source =
       ::google::protobuf::internal::DynamicCastToGenerated<const Claim>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Claim)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Claim)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Claim)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Claim)
     MergeFrom(*source);
   }
 }
 
 void Claim::MergeFrom(const Claim& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Claim)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Claim)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -598,13 +599,13 @@ void Claim::MergeFrom(const Claim& from) {
   cached_has_bits = from._has_bits_[0];
   if (cached_has_bits & 31u) {
     if (cached_has_bits & 0x00000001u) {
-      mutable_stream()->::pb::Stream::MergeFrom(from.stream());
+      mutable_stream()->::legacy_pb::Stream::MergeFrom(from.stream());
     }
     if (cached_has_bits & 0x00000002u) {
-      mutable_certificate()->::pb::Certificate::MergeFrom(from.certificate());
+      mutable_certificate()->::legacy_pb::Certificate::MergeFrom(from.certificate());
     }
     if (cached_has_bits & 0x00000004u) {
-      mutable_publishersignature()->::pb::Signature::MergeFrom(from.publishersignature());
+      mutable_publishersignature()->::legacy_pb::Signature::MergeFrom(from.publishersignature());
     }
     if (cached_has_bits & 0x00000008u) {
       version_ = from.version_;
@@ -617,14 +618,14 @@ void Claim::MergeFrom(const Claim& from) {
 }
 
 void Claim::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Claim)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Claim)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Claim::CopyFrom(const Claim& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Claim)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Claim)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -660,17 +661,17 @@ void Claim::InternalSwap(Claim* other) {
 }
 
 ::google::protobuf::Metadata Claim::GetMetadata() const {
-  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
+  protobuf_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_legacy_5fclaim_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Claim* Arena::CreateMaybeMessage< ::pb::Claim >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Claim >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Claim* Arena::CreateMaybeMessage< ::legacy_pb::Claim >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Claim >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
diff --git a/v1/cpp/claim.pb.h b/v1/cpp/legacy_claim.pb.h
similarity index 67%
rename from v1/cpp/claim.pb.h
rename to v1/cpp/legacy_claim.pb.h
index 9f29c90..2a04217 100644
--- a/v1/cpp/claim.pb.h
+++ b/v1/cpp/legacy_claim.pb.h
@@ -1,19 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: claim.proto
+// source: legacy_claim.proto
 
-#ifndef PROTOBUF_INCLUDED_claim_2eproto
-#define PROTOBUF_INCLUDED_claim_2eproto
+#ifndef PROTOBUF_INCLUDED_legacy_5fclaim_2eproto
+#define PROTOBUF_INCLUDED_legacy_5fclaim_2eproto
 
 #include <string>
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -35,9 +35,9 @@
 #include "certificate.pb.h"
 #include "signature.pb.h"
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto 
+#define PROTOBUF_INTERNAL_EXPORT_protobuf_legacy_5fclaim_2eproto 
 
-namespace protobuf_claim_2eproto {
+namespace protobuf_legacy_5fclaim_2eproto {
 // Internal implementation detail -- do not use these members.
 struct TableStruct {
   static const ::google::protobuf::internal::ParseTableField entries[];
@@ -48,18 +48,18 @@ struct TableStruct {
   static const ::google::protobuf::uint32 offsets[];
 };
 void AddDescriptors();
-}  // namespace protobuf_claim_2eproto
-namespace pb {
+}  // namespace protobuf_legacy_5fclaim_2eproto
+namespace legacy_pb {
 class Claim;
 class ClaimDefaultTypeInternal;
 extern ClaimDefaultTypeInternal _Claim_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Claim* Arena::CreateMaybeMessage<::pb::Claim>(Arena*);
+template<> ::legacy_pb::Claim* Arena::CreateMaybeMessage<::legacy_pb::Claim>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Claim_Version {
   Claim_Version_UNKNOWN_VERSION = 0,
@@ -102,7 +102,7 @@ inline bool Claim_ClaimType_Parse(
 }
 // ===================================================================
 
-class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Claim) */ {
+class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Claim) */ {
  public:
   Claim();
   virtual ~Claim();
@@ -250,57 +250,57 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
 
   // accessors -------------------------------------------------------
 
-  // optional .pb.Stream stream = 3;
+  // optional .legacy_pb.Stream stream = 3;
   bool has_stream() const;
   void clear_stream();
   static const int kStreamFieldNumber = 3;
   private:
-  const ::pb::Stream& _internal_stream() const;
+  const ::legacy_pb::Stream& _internal_stream() const;
   public:
-  const ::pb::Stream& stream() const;
-  ::pb::Stream* release_stream();
-  ::pb::Stream* mutable_stream();
-  void set_allocated_stream(::pb::Stream* stream);
+  const ::legacy_pb::Stream& stream() const;
+  ::legacy_pb::Stream* release_stream();
+  ::legacy_pb::Stream* mutable_stream();
+  void set_allocated_stream(::legacy_pb::Stream* stream);
 
-  // optional .pb.Certificate certificate = 4;
+  // optional .legacy_pb.Certificate certificate = 4;
   bool has_certificate() const;
   void clear_certificate();
   static const int kCertificateFieldNumber = 4;
   private:
-  const ::pb::Certificate& _internal_certificate() const;
+  const ::legacy_pb::Certificate& _internal_certificate() const;
   public:
-  const ::pb::Certificate& certificate() const;
-  ::pb::Certificate* release_certificate();
-  ::pb::Certificate* mutable_certificate();
-  void set_allocated_certificate(::pb::Certificate* certificate);
+  const ::legacy_pb::Certificate& certificate() const;
+  ::legacy_pb::Certificate* release_certificate();
+  ::legacy_pb::Certificate* mutable_certificate();
+  void set_allocated_certificate(::legacy_pb::Certificate* certificate);
 
-  // optional .pb.Signature publisherSignature = 5;
+  // optional .legacy_pb.Signature publisherSignature = 5;
   bool has_publishersignature() const;
   void clear_publishersignature();
   static const int kPublisherSignatureFieldNumber = 5;
   private:
-  const ::pb::Signature& _internal_publishersignature() const;
+  const ::legacy_pb::Signature& _internal_publishersignature() const;
   public:
-  const ::pb::Signature& publishersignature() const;
-  ::pb::Signature* release_publishersignature();
-  ::pb::Signature* mutable_publishersignature();
-  void set_allocated_publishersignature(::pb::Signature* publishersignature);
+  const ::legacy_pb::Signature& publishersignature() const;
+  ::legacy_pb::Signature* release_publishersignature();
+  ::legacy_pb::Signature* mutable_publishersignature();
+  void set_allocated_publishersignature(::legacy_pb::Signature* publishersignature);
 
-  // required .pb.Claim.Version version = 1;
+  // required .legacy_pb.Claim.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Claim_Version version() const;
-  void set_version(::pb::Claim_Version value);
+  ::legacy_pb::Claim_Version version() const;
+  void set_version(::legacy_pb::Claim_Version value);
 
-  // required .pb.Claim.ClaimType claimType = 2;
+  // required .legacy_pb.Claim.ClaimType claimType = 2;
   bool has_claimtype() const;
   void clear_claimtype();
   static const int kClaimTypeFieldNumber = 2;
-  ::pb::Claim_ClaimType claimtype() const;
-  void set_claimtype(::pb::Claim_ClaimType value);
+  ::legacy_pb::Claim_ClaimType claimtype() const;
+  void set_claimtype(::legacy_pb::Claim_ClaimType value);
 
-  // @@protoc_insertion_point(class_scope:pb.Claim)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Claim)
  private:
   void set_has_version();
   void clear_has_version();
@@ -319,12 +319,12 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::HasBits<1> _has_bits_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  ::pb::Stream* stream_;
-  ::pb::Certificate* certificate_;
-  ::pb::Signature* publishersignature_;
+  ::legacy_pb::Stream* stream_;
+  ::legacy_pb::Certificate* certificate_;
+  ::legacy_pb::Signature* publishersignature_;
   int version_;
   int claimtype_;
-  friend struct ::protobuf_claim_2eproto::TableStruct;
+  friend struct ::protobuf_legacy_5fclaim_2eproto::TableStruct;
 };
 // ===================================================================
 
@@ -337,7 +337,7 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
 #endif  // __GNUC__
 // Claim
 
-// required .pb.Claim.Version version = 1;
+// required .legacy_pb.Claim.Version version = 1;
 inline bool Claim::has_version() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -351,18 +351,18 @@ inline void Claim::clear_version() {
   version_ = 0;
   clear_has_version();
 }
-inline ::pb::Claim_Version Claim::version() const {
-  // @@protoc_insertion_point(field_get:pb.Claim.version)
-  return static_cast< ::pb::Claim_Version >(version_);
+inline ::legacy_pb::Claim_Version Claim::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.version)
+  return static_cast< ::legacy_pb::Claim_Version >(version_);
 }
-inline void Claim::set_version(::pb::Claim_Version value) {
-  assert(::pb::Claim_Version_IsValid(value));
+inline void Claim::set_version(::legacy_pb::Claim_Version value) {
+  assert(::legacy_pb::Claim_Version_IsValid(value));
   set_has_version();
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Claim.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Claim.version)
 }
 
-// required .pb.Claim.ClaimType claimType = 2;
+// required .legacy_pb.Claim.ClaimType claimType = 2;
 inline bool Claim::has_claimtype() const {
   return (_has_bits_[0] & 0x00000010u) != 0;
 }
@@ -376,18 +376,18 @@ inline void Claim::clear_claimtype() {
   claimtype_ = 0;
   clear_has_claimtype();
 }
-inline ::pb::Claim_ClaimType Claim::claimtype() const {
-  // @@protoc_insertion_point(field_get:pb.Claim.claimType)
-  return static_cast< ::pb::Claim_ClaimType >(claimtype_);
+inline ::legacy_pb::Claim_ClaimType Claim::claimtype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.claimType)
+  return static_cast< ::legacy_pb::Claim_ClaimType >(claimtype_);
 }
-inline void Claim::set_claimtype(::pb::Claim_ClaimType value) {
-  assert(::pb::Claim_ClaimType_IsValid(value));
+inline void Claim::set_claimtype(::legacy_pb::Claim_ClaimType value) {
+  assert(::legacy_pb::Claim_ClaimType_IsValid(value));
   set_has_claimtype();
   claimtype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Claim.claimType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Claim.claimType)
 }
 
-// optional .pb.Stream stream = 3;
+// optional .legacy_pb.Stream stream = 3;
 inline bool Claim::has_stream() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -397,32 +397,32 @@ inline void Claim::set_has_stream() {
 inline void Claim::clear_has_stream() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline const ::pb::Stream& Claim::_internal_stream() const {
+inline const ::legacy_pb::Stream& Claim::_internal_stream() const {
   return *stream_;
 }
-inline const ::pb::Stream& Claim::stream() const {
-  const ::pb::Stream* p = stream_;
-  // @@protoc_insertion_point(field_get:pb.Claim.stream)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Stream*>(
-      &::pb::_Stream_default_instance_);
+inline const ::legacy_pb::Stream& Claim::stream() const {
+  const ::legacy_pb::Stream* p = stream_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.stream)
+  return p != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Stream*>(
+      &::legacy_pb::_Stream_default_instance_);
 }
-inline ::pb::Stream* Claim::release_stream() {
-  // @@protoc_insertion_point(field_release:pb.Claim.stream)
+inline ::legacy_pb::Stream* Claim::release_stream() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Claim.stream)
   clear_has_stream();
-  ::pb::Stream* temp = stream_;
+  ::legacy_pb::Stream* temp = stream_;
   stream_ = NULL;
   return temp;
 }
-inline ::pb::Stream* Claim::mutable_stream() {
+inline ::legacy_pb::Stream* Claim::mutable_stream() {
   set_has_stream();
   if (stream_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Stream>(GetArenaNoVirtual());
+    auto* p = CreateMaybeMessage<::legacy_pb::Stream>(GetArenaNoVirtual());
     stream_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.stream)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Claim.stream)
   return stream_;
 }
-inline void Claim::set_allocated_stream(::pb::Stream* stream) {
+inline void Claim::set_allocated_stream(::legacy_pb::Stream* stream) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(stream_);
@@ -438,10 +438,10 @@ inline void Claim::set_allocated_stream(::pb::Stream* stream) {
     clear_has_stream();
   }
   stream_ = stream;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.stream)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Claim.stream)
 }
 
-// optional .pb.Certificate certificate = 4;
+// optional .legacy_pb.Certificate certificate = 4;
 inline bool Claim::has_certificate() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -451,32 +451,32 @@ inline void Claim::set_has_certificate() {
 inline void Claim::clear_has_certificate() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline const ::pb::Certificate& Claim::_internal_certificate() const {
+inline const ::legacy_pb::Certificate& Claim::_internal_certificate() const {
   return *certificate_;
 }
-inline const ::pb::Certificate& Claim::certificate() const {
-  const ::pb::Certificate* p = certificate_;
-  // @@protoc_insertion_point(field_get:pb.Claim.certificate)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Certificate*>(
-      &::pb::_Certificate_default_instance_);
+inline const ::legacy_pb::Certificate& Claim::certificate() const {
+  const ::legacy_pb::Certificate* p = certificate_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.certificate)
+  return p != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Certificate*>(
+      &::legacy_pb::_Certificate_default_instance_);
 }
-inline ::pb::Certificate* Claim::release_certificate() {
-  // @@protoc_insertion_point(field_release:pb.Claim.certificate)
+inline ::legacy_pb::Certificate* Claim::release_certificate() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Claim.certificate)
   clear_has_certificate();
-  ::pb::Certificate* temp = certificate_;
+  ::legacy_pb::Certificate* temp = certificate_;
   certificate_ = NULL;
   return temp;
 }
-inline ::pb::Certificate* Claim::mutable_certificate() {
+inline ::legacy_pb::Certificate* Claim::mutable_certificate() {
   set_has_certificate();
   if (certificate_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Certificate>(GetArenaNoVirtual());
+    auto* p = CreateMaybeMessage<::legacy_pb::Certificate>(GetArenaNoVirtual());
     certificate_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.certificate)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Claim.certificate)
   return certificate_;
 }
-inline void Claim::set_allocated_certificate(::pb::Certificate* certificate) {
+inline void Claim::set_allocated_certificate(::legacy_pb::Certificate* certificate) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(certificate_);
@@ -492,10 +492,10 @@ inline void Claim::set_allocated_certificate(::pb::Certificate* certificate) {
     clear_has_certificate();
   }
   certificate_ = certificate;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.certificate)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Claim.certificate)
 }
 
-// optional .pb.Signature publisherSignature = 5;
+// optional .legacy_pb.Signature publisherSignature = 5;
 inline bool Claim::has_publishersignature() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -505,32 +505,32 @@ inline void Claim::set_has_publishersignature() {
 inline void Claim::clear_has_publishersignature() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline const ::pb::Signature& Claim::_internal_publishersignature() const {
+inline const ::legacy_pb::Signature& Claim::_internal_publishersignature() const {
   return *publishersignature_;
 }
-inline const ::pb::Signature& Claim::publishersignature() const {
-  const ::pb::Signature* p = publishersignature_;
-  // @@protoc_insertion_point(field_get:pb.Claim.publisherSignature)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Signature*>(
-      &::pb::_Signature_default_instance_);
+inline const ::legacy_pb::Signature& Claim::publishersignature() const {
+  const ::legacy_pb::Signature* p = publishersignature_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.publisherSignature)
+  return p != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Signature*>(
+      &::legacy_pb::_Signature_default_instance_);
 }
-inline ::pb::Signature* Claim::release_publishersignature() {
-  // @@protoc_insertion_point(field_release:pb.Claim.publisherSignature)
+inline ::legacy_pb::Signature* Claim::release_publishersignature() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Claim.publisherSignature)
   clear_has_publishersignature();
-  ::pb::Signature* temp = publishersignature_;
+  ::legacy_pb::Signature* temp = publishersignature_;
   publishersignature_ = NULL;
   return temp;
 }
-inline ::pb::Signature* Claim::mutable_publishersignature() {
+inline ::legacy_pb::Signature* Claim::mutable_publishersignature() {
   set_has_publishersignature();
   if (publishersignature_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Signature>(GetArenaNoVirtual());
+    auto* p = CreateMaybeMessage<::legacy_pb::Signature>(GetArenaNoVirtual());
     publishersignature_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.publisherSignature)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Claim.publisherSignature)
   return publishersignature_;
 }
-inline void Claim::set_allocated_publishersignature(::pb::Signature* publishersignature) {
+inline void Claim::set_allocated_publishersignature(::legacy_pb::Signature* publishersignature) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(publishersignature_);
@@ -546,7 +546,7 @@ inline void Claim::set_allocated_publishersignature(::pb::Signature* publishersi
     clear_has_publishersignature();
   }
   publishersignature_ = publishersignature;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.publisherSignature)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Claim.publisherSignature)
 }
 
 #ifdef __GNUC__
@@ -555,20 +555,20 @@ inline void Claim::set_allocated_publishersignature(::pb::Signature* publishersi
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Claim_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Claim_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Claim_Version>() {
-  return ::pb::Claim_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Claim_Version>() {
+  return ::legacy_pb::Claim_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Claim_ClaimType> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Claim_ClaimType> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Claim_ClaimType>() {
-  return ::pb::Claim_ClaimType_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Claim_ClaimType>() {
+  return ::legacy_pb::Claim_ClaimType_descriptor();
 }
 
 }  // namespace protobuf
@@ -576,4 +576,4 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::Claim_ClaimType>() {
 
 // @@protoc_insertion_point(global_scope)
 
-#endif  // PROTOBUF_INCLUDED_claim_2eproto
+#endif  // PROTOBUF_INCLUDED_legacy_5fclaim_2eproto
diff --git a/v1/cpp/metadata.pb.cc b/v1/cpp/metadata.pb.cc
index c14c70f..c5fd867 100644
--- a/v1/cpp/metadata.pb.cc
+++ b/v1/cpp/metadata.pb.cc
@@ -22,23 +22,23 @@
 namespace protobuf_fee_2eproto {
 extern PROTOBUF_INTERNAL_EXPORT_protobuf_fee_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Fee;
 }  // namespace protobuf_fee_2eproto
-namespace pb {
+namespace legacy_pb {
 class MetadataDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Metadata>
       _instance;
 } _Metadata_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace protobuf_metadata_2eproto {
 static void InitDefaultsMetadata() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Metadata_default_instance_;
-    new (ptr) ::pb::Metadata();
+    void* ptr = &::legacy_pb::_Metadata_default_instance_;
+    new (ptr) ::legacy_pb::Metadata();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Metadata::InitAsDefaultInstance();
+  ::legacy_pb::Metadata::InitAsDefaultInstance();
 }
 
 ::google::protobuf::internal::SCCInfo<1> scc_info_Metadata =
@@ -53,22 +53,22 @@ void InitDefaults() {
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
 
 const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, language_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, title_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, description_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, author_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, license_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, nsfw_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, fee_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, thumbnail_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, preview_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Metadata, licenseurl_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, version_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, language_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, title_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, description_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, author_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, license_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, nsfw_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, fee_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, thumbnail_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, preview_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, licenseurl_),
   8,
   9,
   0,
@@ -82,11 +82,11 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   6,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 16, sizeof(::pb::Metadata)},
+  { 0, 16, sizeof(::legacy_pb::Metadata)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Metadata_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Metadata_default_instance_),
 };
 
 void protobuf_AssignDescriptors() {
@@ -110,58 +110,58 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\016metadata.proto\022\002pb\032\tfee.proto\"\347\016\n\010Meta"
-      "data\022%\n\007version\030\001 \002(\0162\024.pb.Metadata.Vers"
-      "ion\022\'\n\010language\030\002 \002(\0162\025.pb.Metadata.Lang"
-      "uage\022\r\n\005title\030\003 \002(\t\022\023\n\013description\030\004 \002(\t"
-      "\022\016\n\006author\030\005 \002(\t\022\017\n\007license\030\006 \002(\t\022\014\n\004nsf"
-      "w\030\007 \002(\010\022\024\n\003fee\030\010 \001(\0132\007.pb.Fee\022\021\n\tthumbna"
-      "il\030\t \001(\t\022\017\n\007preview\030\n \001(\t\022\022\n\nlicenseUrl\030"
-      "\013 \001(\t\"N\n\007Version\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n"
-      "\006_0_0_1\020\001\022\n\n\006_0_0_2\020\002\022\n\n\006_0_0_3\020\003\022\n\n\006_0_"
-      "1_0\020\004\"\231\014\n\010Language\022\024\n\020UNKNOWN_LANGUAGE\020\000"
-      "\022\006\n\002en\020\001\022\006\n\002aa\020\002\022\006\n\002ab\020\003\022\006\n\002ae\020\004\022\006\n\002af\020\005"
-      "\022\006\n\002ak\020\006\022\006\n\002am\020\007\022\006\n\002an\020\010\022\006\n\002ar\020\t\022\006\n\002as\020\n"
-      "\022\006\n\002av\020\013\022\006\n\002ay\020\014\022\006\n\002az\020\r\022\006\n\002ba\020\016\022\006\n\002be\020\017"
-      "\022\006\n\002bg\020\020\022\006\n\002bh\020\021\022\006\n\002bi\020\022\022\006\n\002bm\020\023\022\006\n\002bn\020\024"
-      "\022\006\n\002bo\020\025\022\006\n\002br\020\026\022\006\n\002bs\020\027\022\006\n\002ca\020\030\022\006\n\002ce\020\031"
-      "\022\006\n\002ch\020\032\022\006\n\002co\020\033\022\006\n\002cr\020\034\022\006\n\002cs\020\035\022\006\n\002cu\020\036"
-      "\022\006\n\002cv\020\037\022\006\n\002cy\020 \022\006\n\002da\020!\022\006\n\002de\020\"\022\006\n\002dv\020#"
-      "\022\006\n\002dz\020$\022\006\n\002ee\020%\022\006\n\002el\020&\022\006\n\002eo\020\'\022\006\n\002es\020("
-      "\022\006\n\002et\020)\022\006\n\002eu\020*\022\006\n\002fa\020+\022\006\n\002ff\020,\022\006\n\002fi\020-"
-      "\022\006\n\002fj\020.\022\006\n\002fo\020/\022\006\n\002fr\0200\022\006\n\002fy\0201\022\006\n\002ga\0202"
-      "\022\006\n\002gd\0203\022\006\n\002gl\0204\022\006\n\002gn\0205\022\006\n\002gu\0206\022\006\n\002gv\0207"
-      "\022\006\n\002ha\0208\022\006\n\002he\0209\022\006\n\002hi\020:\022\006\n\002ho\020;\022\006\n\002hr\020<"
-      "\022\006\n\002ht\020=\022\006\n\002hu\020>\022\006\n\002hy\020\?\022\006\n\002hz\020@\022\006\n\002ia\020A"
-      "\022\006\n\002id\020B\022\006\n\002ie\020C\022\006\n\002ig\020D\022\006\n\002ii\020E\022\006\n\002ik\020F"
-      "\022\006\n\002io\020G\022\006\n\002is\020H\022\006\n\002it\020I\022\006\n\002iu\020J\022\006\n\002ja\020K"
-      "\022\006\n\002jv\020L\022\006\n\002ka\020M\022\006\n\002kg\020N\022\006\n\002ki\020O\022\006\n\002kj\020P"
-      "\022\006\n\002kk\020Q\022\006\n\002kl\020R\022\006\n\002km\020S\022\006\n\002kn\020T\022\006\n\002ko\020U"
-      "\022\006\n\002kr\020V\022\006\n\002ks\020W\022\006\n\002ku\020X\022\006\n\002kv\020Y\022\006\n\002kw\020Z"
-      "\022\006\n\002ky\020[\022\006\n\002la\020\\\022\006\n\002lb\020]\022\006\n\002lg\020^\022\006\n\002li\020_"
-      "\022\006\n\002ln\020`\022\006\n\002lo\020a\022\006\n\002lt\020b\022\006\n\002lu\020c\022\006\n\002lv\020d"
-      "\022\006\n\002mg\020e\022\006\n\002mh\020f\022\006\n\002mi\020g\022\006\n\002mk\020h\022\006\n\002ml\020i"
-      "\022\006\n\002mn\020j\022\006\n\002mr\020k\022\006\n\002ms\020l\022\006\n\002mt\020m\022\006\n\002my\020n"
-      "\022\006\n\002na\020o\022\006\n\002nb\020p\022\006\n\002nd\020q\022\006\n\002ne\020r\022\006\n\002ng\020s"
-      "\022\006\n\002nl\020t\022\006\n\002nn\020u\022\006\n\002no\020v\022\006\n\002nr\020w\022\006\n\002nv\020x"
-      "\022\006\n\002ny\020y\022\006\n\002oc\020z\022\006\n\002oj\020{\022\006\n\002om\020|\022\006\n\002or\020}"
-      "\022\006\n\002os\020~\022\006\n\002pa\020\177\022\007\n\002pi\020\200\001\022\007\n\002pl\020\201\001\022\007\n\002ps"
-      "\020\202\001\022\007\n\002pt\020\203\001\022\007\n\002qu\020\204\001\022\007\n\002rm\020\205\001\022\007\n\002rn\020\206\001\022"
-      "\007\n\002ro\020\207\001\022\007\n\002ru\020\210\001\022\007\n\002rw\020\211\001\022\007\n\002sa\020\212\001\022\007\n\002s"
-      "c\020\213\001\022\007\n\002sd\020\214\001\022\007\n\002se\020\215\001\022\007\n\002sg\020\216\001\022\007\n\002si\020\217\001"
-      "\022\007\n\002sk\020\220\001\022\007\n\002sl\020\221\001\022\007\n\002sm\020\222\001\022\007\n\002sn\020\223\001\022\007\n\002"
-      "so\020\224\001\022\007\n\002sq\020\225\001\022\007\n\002sr\020\226\001\022\007\n\002ss\020\227\001\022\007\n\002st\020\230"
-      "\001\022\007\n\002su\020\231\001\022\007\n\002sv\020\232\001\022\007\n\002sw\020\233\001\022\007\n\002ta\020\234\001\022\007\n"
-      "\002te\020\235\001\022\007\n\002tg\020\236\001\022\007\n\002th\020\237\001\022\007\n\002ti\020\240\001\022\007\n\002tk\020"
-      "\241\001\022\007\n\002tl\020\242\001\022\007\n\002tn\020\243\001\022\007\n\002to\020\244\001\022\007\n\002tr\020\245\001\022\007"
-      "\n\002ts\020\246\001\022\007\n\002tt\020\247\001\022\007\n\002tw\020\250\001\022\007\n\002ty\020\251\001\022\007\n\002ug"
-      "\020\252\001\022\007\n\002uk\020\253\001\022\007\n\002ur\020\254\001\022\007\n\002uz\020\255\001\022\007\n\002ve\020\256\001\022"
-      "\007\n\002vi\020\257\001\022\007\n\002vo\020\260\001\022\007\n\002wa\020\261\001\022\007\n\002wo\020\262\001\022\007\n\002x"
-      "h\020\263\001\022\007\n\002yi\020\264\001\022\007\n\002yo\020\265\001\022\007\n\002za\020\266\001\022\007\n\002zh\020\267\001"
-      "\022\007\n\002zu\020\270\001"
+      "\n\016metadata.proto\022\tlegacy_pb\032\tfee.proto\"\374"
+      "\016\n\010Metadata\022,\n\007version\030\001 \002(\0162\033.legacy_pb"
+      ".Metadata.Version\022.\n\010language\030\002 \002(\0162\034.le"
+      "gacy_pb.Metadata.Language\022\r\n\005title\030\003 \002(\t"
+      "\022\023\n\013description\030\004 \002(\t\022\016\n\006author\030\005 \002(\t\022\017\n"
+      "\007license\030\006 \002(\t\022\014\n\004nsfw\030\007 \002(\010\022\033\n\003fee\030\010 \001("
+      "\0132\016.legacy_pb.Fee\022\021\n\tthumbnail\030\t \001(\t\022\017\n\007"
+      "preview\030\n \001(\t\022\022\n\nlicenseUrl\030\013 \001(\t\"N\n\007Ver"
+      "sion\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\022\n\n"
+      "\006_0_0_2\020\002\022\n\n\006_0_0_3\020\003\022\n\n\006_0_1_0\020\004\"\231\014\n\010La"
+      "nguage\022\024\n\020UNKNOWN_LANGUAGE\020\000\022\006\n\002en\020\001\022\006\n\002"
+      "aa\020\002\022\006\n\002ab\020\003\022\006\n\002ae\020\004\022\006\n\002af\020\005\022\006\n\002ak\020\006\022\006\n\002"
+      "am\020\007\022\006\n\002an\020\010\022\006\n\002ar\020\t\022\006\n\002as\020\n\022\006\n\002av\020\013\022\006\n\002"
+      "ay\020\014\022\006\n\002az\020\r\022\006\n\002ba\020\016\022\006\n\002be\020\017\022\006\n\002bg\020\020\022\006\n\002"
+      "bh\020\021\022\006\n\002bi\020\022\022\006\n\002bm\020\023\022\006\n\002bn\020\024\022\006\n\002bo\020\025\022\006\n\002"
+      "br\020\026\022\006\n\002bs\020\027\022\006\n\002ca\020\030\022\006\n\002ce\020\031\022\006\n\002ch\020\032\022\006\n\002"
+      "co\020\033\022\006\n\002cr\020\034\022\006\n\002cs\020\035\022\006\n\002cu\020\036\022\006\n\002cv\020\037\022\006\n\002"
+      "cy\020 \022\006\n\002da\020!\022\006\n\002de\020\"\022\006\n\002dv\020#\022\006\n\002dz\020$\022\006\n\002"
+      "ee\020%\022\006\n\002el\020&\022\006\n\002eo\020\'\022\006\n\002es\020(\022\006\n\002et\020)\022\006\n\002"
+      "eu\020*\022\006\n\002fa\020+\022\006\n\002ff\020,\022\006\n\002fi\020-\022\006\n\002fj\020.\022\006\n\002"
+      "fo\020/\022\006\n\002fr\0200\022\006\n\002fy\0201\022\006\n\002ga\0202\022\006\n\002gd\0203\022\006\n\002"
+      "gl\0204\022\006\n\002gn\0205\022\006\n\002gu\0206\022\006\n\002gv\0207\022\006\n\002ha\0208\022\006\n\002"
+      "he\0209\022\006\n\002hi\020:\022\006\n\002ho\020;\022\006\n\002hr\020<\022\006\n\002ht\020=\022\006\n\002"
+      "hu\020>\022\006\n\002hy\020\?\022\006\n\002hz\020@\022\006\n\002ia\020A\022\006\n\002id\020B\022\006\n\002"
+      "ie\020C\022\006\n\002ig\020D\022\006\n\002ii\020E\022\006\n\002ik\020F\022\006\n\002io\020G\022\006\n\002"
+      "is\020H\022\006\n\002it\020I\022\006\n\002iu\020J\022\006\n\002ja\020K\022\006\n\002jv\020L\022\006\n\002"
+      "ka\020M\022\006\n\002kg\020N\022\006\n\002ki\020O\022\006\n\002kj\020P\022\006\n\002kk\020Q\022\006\n\002"
+      "kl\020R\022\006\n\002km\020S\022\006\n\002kn\020T\022\006\n\002ko\020U\022\006\n\002kr\020V\022\006\n\002"
+      "ks\020W\022\006\n\002ku\020X\022\006\n\002kv\020Y\022\006\n\002kw\020Z\022\006\n\002ky\020[\022\006\n\002"
+      "la\020\\\022\006\n\002lb\020]\022\006\n\002lg\020^\022\006\n\002li\020_\022\006\n\002ln\020`\022\006\n\002"
+      "lo\020a\022\006\n\002lt\020b\022\006\n\002lu\020c\022\006\n\002lv\020d\022\006\n\002mg\020e\022\006\n\002"
+      "mh\020f\022\006\n\002mi\020g\022\006\n\002mk\020h\022\006\n\002ml\020i\022\006\n\002mn\020j\022\006\n\002"
+      "mr\020k\022\006\n\002ms\020l\022\006\n\002mt\020m\022\006\n\002my\020n\022\006\n\002na\020o\022\006\n\002"
+      "nb\020p\022\006\n\002nd\020q\022\006\n\002ne\020r\022\006\n\002ng\020s\022\006\n\002nl\020t\022\006\n\002"
+      "nn\020u\022\006\n\002no\020v\022\006\n\002nr\020w\022\006\n\002nv\020x\022\006\n\002ny\020y\022\006\n\002"
+      "oc\020z\022\006\n\002oj\020{\022\006\n\002om\020|\022\006\n\002or\020}\022\006\n\002os\020~\022\006\n\002"
+      "pa\020\177\022\007\n\002pi\020\200\001\022\007\n\002pl\020\201\001\022\007\n\002ps\020\202\001\022\007\n\002pt\020\203\001"
+      "\022\007\n\002qu\020\204\001\022\007\n\002rm\020\205\001\022\007\n\002rn\020\206\001\022\007\n\002ro\020\207\001\022\007\n\002"
+      "ru\020\210\001\022\007\n\002rw\020\211\001\022\007\n\002sa\020\212\001\022\007\n\002sc\020\213\001\022\007\n\002sd\020\214"
+      "\001\022\007\n\002se\020\215\001\022\007\n\002sg\020\216\001\022\007\n\002si\020\217\001\022\007\n\002sk\020\220\001\022\007\n"
+      "\002sl\020\221\001\022\007\n\002sm\020\222\001\022\007\n\002sn\020\223\001\022\007\n\002so\020\224\001\022\007\n\002sq\020"
+      "\225\001\022\007\n\002sr\020\226\001\022\007\n\002ss\020\227\001\022\007\n\002st\020\230\001\022\007\n\002su\020\231\001\022\007"
+      "\n\002sv\020\232\001\022\007\n\002sw\020\233\001\022\007\n\002ta\020\234\001\022\007\n\002te\020\235\001\022\007\n\002tg"
+      "\020\236\001\022\007\n\002th\020\237\001\022\007\n\002ti\020\240\001\022\007\n\002tk\020\241\001\022\007\n\002tl\020\242\001\022"
+      "\007\n\002tn\020\243\001\022\007\n\002to\020\244\001\022\007\n\002tr\020\245\001\022\007\n\002ts\020\246\001\022\007\n\002t"
+      "t\020\247\001\022\007\n\002tw\020\250\001\022\007\n\002ty\020\251\001\022\007\n\002ug\020\252\001\022\007\n\002uk\020\253\001"
+      "\022\007\n\002ur\020\254\001\022\007\n\002uz\020\255\001\022\007\n\002ve\020\256\001\022\007\n\002vi\020\257\001\022\007\n\002"
+      "vo\020\260\001\022\007\n\002wa\020\261\001\022\007\n\002wo\020\262\001\022\007\n\002xh\020\263\001\022\007\n\002yi\020\264"
+      "\001\022\007\n\002yo\020\265\001\022\007\n\002za\020\266\001\022\007\n\002zh\020\267\001\022\007\n\002zu\020\270\001"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 1929);
+      descriptor, 1957);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "metadata.proto", &protobuf_RegisterTypes);
   ::protobuf_fee_2eproto::AddDescriptors();
@@ -178,7 +178,7 @@ struct StaticDescriptorInitializer {
   }
 } static_descriptor_initializer;
 }  // namespace protobuf_metadata_2eproto
-namespace pb {
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Metadata_Version_descriptor() {
   protobuf_metadata_2eproto::protobuf_AssignDescriptorsOnce();
   return protobuf_metadata_2eproto::file_level_enum_descriptors[0];
@@ -597,8 +597,8 @@ const int Metadata::Language_ARRAYSIZE;
 // ===================================================================
 
 void Metadata::InitAsDefaultInstance() {
-  ::pb::_Metadata_default_instance_._instance.get_mutable()->fee_ = const_cast< ::pb::Fee*>(
-      ::pb::Fee::internal_default_instance());
+  ::legacy_pb::_Metadata_default_instance_._instance.get_mutable()->fee_ = const_cast< ::legacy_pb::Fee*>(
+      ::legacy_pb::Fee::internal_default_instance());
 }
 void Metadata::clear_fee() {
   if (fee_ != NULL) fee_->Clear();
@@ -623,7 +623,7 @@ Metadata::Metadata()
   ::google::protobuf::internal::InitSCC(
       &protobuf_metadata_2eproto::scc_info_Metadata.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Metadata)
+  // @@protoc_insertion_point(constructor:legacy_pb.Metadata)
 }
 Metadata::Metadata(const Metadata& from)
   : ::google::protobuf::Message(),
@@ -659,14 +659,14 @@ Metadata::Metadata(const Metadata& from)
     licenseurl_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.licenseurl_);
   }
   if (from.has_fee()) {
-    fee_ = new ::pb::Fee(*from.fee_);
+    fee_ = new ::legacy_pb::Fee(*from.fee_);
   } else {
     fee_ = NULL;
   }
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&nsfw_) -
     reinterpret_cast<char*>(&version_)) + sizeof(nsfw_));
-  // @@protoc_insertion_point(copy_constructor:pb.Metadata)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Metadata)
 }
 
 void Metadata::SharedCtor() {
@@ -683,7 +683,7 @@ void Metadata::SharedCtor() {
 }
 
 Metadata::~Metadata() {
-  // @@protoc_insertion_point(destructor:pb.Metadata)
+  // @@protoc_insertion_point(destructor:legacy_pb.Metadata)
   SharedDtor();
 }
 
@@ -713,7 +713,7 @@ const Metadata& Metadata::default_instance() {
 
 
 void Metadata::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Metadata)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Metadata)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -759,13 +759,13 @@ bool Metadata::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Metadata)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Metadata)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Metadata.Version version = 1;
+      // required .legacy_pb.Metadata.Version version = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -773,8 +773,8 @@ bool Metadata::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Metadata_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Metadata_Version >(value));
+          if (::legacy_pb::Metadata_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Metadata_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 1, static_cast< ::google::protobuf::uint64>(value));
@@ -785,7 +785,7 @@ bool Metadata::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Metadata.Language language = 2;
+      // required .legacy_pb.Metadata.Language language = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
@@ -793,8 +793,8 @@ bool Metadata::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Metadata_Language_IsValid(value)) {
-            set_language(static_cast< ::pb::Metadata_Language >(value));
+          if (::legacy_pb::Metadata_Language_IsValid(value)) {
+            set_language(static_cast< ::legacy_pb::Metadata_Language >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 2, static_cast< ::google::protobuf::uint64>(value));
@@ -814,7 +814,7 @@ bool Metadata::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->title().data(), static_cast<int>(this->title().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Metadata.title");
+            "legacy_pb.Metadata.title");
         } else {
           goto handle_unusual;
         }
@@ -830,7 +830,7 @@ bool Metadata::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->description().data(), static_cast<int>(this->description().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Metadata.description");
+            "legacy_pb.Metadata.description");
         } else {
           goto handle_unusual;
         }
@@ -846,7 +846,7 @@ bool Metadata::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->author().data(), static_cast<int>(this->author().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Metadata.author");
+            "legacy_pb.Metadata.author");
         } else {
           goto handle_unusual;
         }
@@ -862,7 +862,7 @@ bool Metadata::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->license().data(), static_cast<int>(this->license().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Metadata.license");
+            "legacy_pb.Metadata.license");
         } else {
           goto handle_unusual;
         }
@@ -883,7 +883,7 @@ bool Metadata::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .pb.Fee fee = 8;
+      // optional .legacy_pb.Fee fee = 8;
       case 8: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(66u /* 66 & 0xFF */)) {
@@ -904,7 +904,7 @@ bool Metadata::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->thumbnail().data(), static_cast<int>(this->thumbnail().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Metadata.thumbnail");
+            "legacy_pb.Metadata.thumbnail");
         } else {
           goto handle_unusual;
         }
@@ -920,7 +920,7 @@ bool Metadata::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->preview().data(), static_cast<int>(this->preview().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Metadata.preview");
+            "legacy_pb.Metadata.preview");
         } else {
           goto handle_unusual;
         }
@@ -936,7 +936,7 @@ bool Metadata::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->licenseurl().data(), static_cast<int>(this->licenseurl().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Metadata.licenseUrl");
+            "legacy_pb.Metadata.licenseUrl");
         } else {
           goto handle_unusual;
         }
@@ -955,28 +955,28 @@ bool Metadata::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Metadata)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Metadata)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Metadata)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Metadata)
   return false;
 #undef DO_
 }
 
 void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Metadata)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Metadata)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Metadata.Version version = 1;
+  // required .legacy_pb.Metadata.Version version = 1;
   if (cached_has_bits & 0x00000100u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.Metadata.Language language = 2;
+  // required .legacy_pb.Metadata.Language language = 2;
   if (cached_has_bits & 0x00000200u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->language(), output);
@@ -987,7 +987,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->title().data(), static_cast<int>(this->title().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.title");
+      "legacy_pb.Metadata.title");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       3, this->title(), output);
   }
@@ -997,7 +997,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.description");
+      "legacy_pb.Metadata.description");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       4, this->description(), output);
   }
@@ -1007,7 +1007,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->author().data(), static_cast<int>(this->author().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.author");
+      "legacy_pb.Metadata.author");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       5, this->author(), output);
   }
@@ -1017,7 +1017,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->license().data(), static_cast<int>(this->license().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.license");
+      "legacy_pb.Metadata.license");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       6, this->license(), output);
   }
@@ -1027,7 +1027,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->nsfw(), output);
   }
 
-  // optional .pb.Fee fee = 8;
+  // optional .legacy_pb.Fee fee = 8;
   if (cached_has_bits & 0x00000080u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       8, this->_internal_fee(), output);
@@ -1038,7 +1038,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->thumbnail().data(), static_cast<int>(this->thumbnail().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.thumbnail");
+      "legacy_pb.Metadata.thumbnail");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       9, this->thumbnail(), output);
   }
@@ -1048,7 +1048,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->preview().data(), static_cast<int>(this->preview().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.preview");
+      "legacy_pb.Metadata.preview");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       10, this->preview(), output);
   }
@@ -1058,7 +1058,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->licenseurl().data(), static_cast<int>(this->licenseurl().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.licenseUrl");
+      "legacy_pb.Metadata.licenseUrl");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       11, this->licenseurl(), output);
   }
@@ -1067,24 +1067,24 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Metadata)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Metadata)
 }
 
 ::google::protobuf::uint8* Metadata::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Metadata)
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Metadata)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Metadata.Version version = 1;
+  // required .legacy_pb.Metadata.Version version = 1;
   if (cached_has_bits & 0x00000100u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.Metadata.Language language = 2;
+  // required .legacy_pb.Metadata.Language language = 2;
   if (cached_has_bits & 0x00000200u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->language(), target);
@@ -1095,7 +1095,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->title().data(), static_cast<int>(this->title().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.title");
+      "legacy_pb.Metadata.title");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         3, this->title(), target);
@@ -1106,7 +1106,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.description");
+      "legacy_pb.Metadata.description");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         4, this->description(), target);
@@ -1117,7 +1117,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->author().data(), static_cast<int>(this->author().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.author");
+      "legacy_pb.Metadata.author");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         5, this->author(), target);
@@ -1128,7 +1128,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->license().data(), static_cast<int>(this->license().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.license");
+      "legacy_pb.Metadata.license");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         6, this->license(), target);
@@ -1139,7 +1139,7 @@ void Metadata::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->nsfw(), target);
   }
 
-  // optional .pb.Fee fee = 8;
+  // optional .legacy_pb.Fee fee = 8;
   if (cached_has_bits & 0x00000080u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
@@ -1151,7 +1151,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->thumbnail().data(), static_cast<int>(this->thumbnail().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.thumbnail");
+      "legacy_pb.Metadata.thumbnail");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         9, this->thumbnail(), target);
@@ -1162,7 +1162,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->preview().data(), static_cast<int>(this->preview().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.preview");
+      "legacy_pb.Metadata.preview");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         10, this->preview(), target);
@@ -1173,7 +1173,7 @@ void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->licenseurl().data(), static_cast<int>(this->licenseurl().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Metadata.licenseUrl");
+      "legacy_pb.Metadata.licenseUrl");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         11, this->licenseurl(), target);
@@ -1183,12 +1183,12 @@ void Metadata::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Metadata)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Metadata)
   return target;
 }
 
 size_t Metadata::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Metadata)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Metadata)
   size_t total_size = 0;
 
   if (has_title()) {
@@ -1220,13 +1220,13 @@ size_t Metadata::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Metadata.Version version = 1;
+    // required .legacy_pb.Metadata.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_language()) {
-    // required .pb.Metadata.Language language = 2;
+    // required .legacy_pb.Metadata.Language language = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->language());
   }
@@ -1239,7 +1239,7 @@ size_t Metadata::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Metadata::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Metadata)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Metadata)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -1268,11 +1268,11 @@ size_t Metadata::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::StringSize(
         this->license());
 
-    // required .pb.Metadata.Version version = 1;
+    // required .legacy_pb.Metadata.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.Metadata.Language language = 2;
+    // required .legacy_pb.Metadata.Language language = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->language());
 
@@ -1304,7 +1304,7 @@ size_t Metadata::ByteSizeLong() const {
           this->licenseurl());
     }
 
-    // optional .pb.Fee fee = 8;
+    // optional .legacy_pb.Fee fee = 8;
     if (has_fee()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
@@ -1318,22 +1318,22 @@ size_t Metadata::ByteSizeLong() const {
 }
 
 void Metadata::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Metadata)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Metadata)
   GOOGLE_DCHECK_NE(&from, this);
   const Metadata* source =
       ::google::protobuf::internal::DynamicCastToGenerated<const Metadata>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Metadata)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Metadata)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Metadata)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Metadata)
     MergeFrom(*source);
   }
 }
 
 void Metadata::MergeFrom(const Metadata& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Metadata)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Metadata)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -1370,7 +1370,7 @@ void Metadata::MergeFrom(const Metadata& from) {
       licenseurl_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.licenseurl_);
     }
     if (cached_has_bits & 0x00000080u) {
-      mutable_fee()->::pb::Fee::MergeFrom(from.fee());
+      mutable_fee()->::legacy_pb::Fee::MergeFrom(from.fee());
     }
   }
   if (cached_has_bits & 1792u) {
@@ -1388,14 +1388,14 @@ void Metadata::MergeFrom(const Metadata& from) {
 }
 
 void Metadata::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Metadata)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Metadata)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Metadata::CopyFrom(const Metadata& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Metadata)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Metadata)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -1444,11 +1444,11 @@ void Metadata::InternalSwap(Metadata* other) {
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Metadata* Arena::CreateMaybeMessage< ::pb::Metadata >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Metadata >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Metadata* Arena::CreateMaybeMessage< ::legacy_pb::Metadata >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Metadata >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
diff --git a/v1/cpp/metadata.pb.h b/v1/cpp/metadata.pb.h
index e028e81..67231e3 100644
--- a/v1/cpp/metadata.pb.h
+++ b/v1/cpp/metadata.pb.h
@@ -8,12 +8,12 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -47,17 +47,17 @@ struct TableStruct {
 };
 void AddDescriptors();
 }  // namespace protobuf_metadata_2eproto
-namespace pb {
+namespace legacy_pb {
 class Metadata;
 class MetadataDefaultTypeInternal;
 extern MetadataDefaultTypeInternal _Metadata_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Metadata* Arena::CreateMaybeMessage<::pb::Metadata>(Arena*);
+template<> ::legacy_pb::Metadata* Arena::CreateMaybeMessage<::legacy_pb::Metadata>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Metadata_Version {
   Metadata_Version_UNKNOWN_VERSION = 0,
@@ -285,7 +285,7 @@ inline bool Metadata_Language_Parse(
 }
 // ===================================================================
 
-class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Metadata) */ {
+class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Metadata) */ {
  public:
   Metadata();
   virtual ~Metadata();
@@ -908,31 +908,31 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   ::std::string* release_licenseurl();
   void set_allocated_licenseurl(::std::string* licenseurl);
 
-  // optional .pb.Fee fee = 8;
+  // optional .legacy_pb.Fee fee = 8;
   bool has_fee() const;
   void clear_fee();
   static const int kFeeFieldNumber = 8;
   private:
-  const ::pb::Fee& _internal_fee() const;
+  const ::legacy_pb::Fee& _internal_fee() const;
   public:
-  const ::pb::Fee& fee() const;
-  ::pb::Fee* release_fee();
-  ::pb::Fee* mutable_fee();
-  void set_allocated_fee(::pb::Fee* fee);
+  const ::legacy_pb::Fee& fee() const;
+  ::legacy_pb::Fee* release_fee();
+  ::legacy_pb::Fee* mutable_fee();
+  void set_allocated_fee(::legacy_pb::Fee* fee);
 
-  // required .pb.Metadata.Version version = 1;
+  // required .legacy_pb.Metadata.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Metadata_Version version() const;
-  void set_version(::pb::Metadata_Version value);
+  ::legacy_pb::Metadata_Version version() const;
+  void set_version(::legacy_pb::Metadata_Version value);
 
-  // required .pb.Metadata.Language language = 2;
+  // required .legacy_pb.Metadata.Language language = 2;
   bool has_language() const;
   void clear_language();
   static const int kLanguageFieldNumber = 2;
-  ::pb::Metadata_Language language() const;
-  void set_language(::pb::Metadata_Language value);
+  ::legacy_pb::Metadata_Language language() const;
+  void set_language(::legacy_pb::Metadata_Language value);
 
   // required bool nsfw = 7;
   bool has_nsfw() const;
@@ -941,7 +941,7 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   bool nsfw() const;
   void set_nsfw(bool value);
 
-  // @@protoc_insertion_point(class_scope:pb.Metadata)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Metadata)
  private:
   void set_has_version();
   void clear_has_version();
@@ -979,7 +979,7 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   ::google::protobuf::internal::ArenaStringPtr thumbnail_;
   ::google::protobuf::internal::ArenaStringPtr preview_;
   ::google::protobuf::internal::ArenaStringPtr licenseurl_;
-  ::pb::Fee* fee_;
+  ::legacy_pb::Fee* fee_;
   int version_;
   int language_;
   bool nsfw_;
@@ -996,7 +996,7 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
 #endif  // __GNUC__
 // Metadata
 
-// required .pb.Metadata.Version version = 1;
+// required .legacy_pb.Metadata.Version version = 1;
 inline bool Metadata::has_version() const {
   return (_has_bits_[0] & 0x00000100u) != 0;
 }
@@ -1010,18 +1010,18 @@ inline void Metadata::clear_version() {
   version_ = 0;
   clear_has_version();
 }
-inline ::pb::Metadata_Version Metadata::version() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.version)
-  return static_cast< ::pb::Metadata_Version >(version_);
+inline ::legacy_pb::Metadata_Version Metadata::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.version)
+  return static_cast< ::legacy_pb::Metadata_Version >(version_);
 }
-inline void Metadata::set_version(::pb::Metadata_Version value) {
-  assert(::pb::Metadata_Version_IsValid(value));
+inline void Metadata::set_version(::legacy_pb::Metadata_Version value) {
+  assert(::legacy_pb::Metadata_Version_IsValid(value));
   set_has_version();
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Metadata.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.version)
 }
 
-// required .pb.Metadata.Language language = 2;
+// required .legacy_pb.Metadata.Language language = 2;
 inline bool Metadata::has_language() const {
   return (_has_bits_[0] & 0x00000200u) != 0;
 }
@@ -1035,15 +1035,15 @@ inline void Metadata::clear_language() {
   language_ = 0;
   clear_has_language();
 }
-inline ::pb::Metadata_Language Metadata::language() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.language)
-  return static_cast< ::pb::Metadata_Language >(language_);
+inline ::legacy_pb::Metadata_Language Metadata::language() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.language)
+  return static_cast< ::legacy_pb::Metadata_Language >(language_);
 }
-inline void Metadata::set_language(::pb::Metadata_Language value) {
-  assert(::pb::Metadata_Language_IsValid(value));
+inline void Metadata::set_language(::legacy_pb::Metadata_Language value) {
+  assert(::legacy_pb::Metadata_Language_IsValid(value));
   set_has_language();
   language_ = value;
-  // @@protoc_insertion_point(field_set:pb.Metadata.language)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.language)
 }
 
 // required string title = 3;
@@ -1061,41 +1061,41 @@ inline void Metadata::clear_title() {
   clear_has_title();
 }
 inline const ::std::string& Metadata::title() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.title)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.title)
   return title_.GetNoArena();
 }
 inline void Metadata::set_title(const ::std::string& value) {
   set_has_title();
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Metadata.title)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.title)
 }
 #if LANG_CXX11
 inline void Metadata::set_title(::std::string&& value) {
   set_has_title();
   title_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Metadata.title)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.title)
 }
 #endif
 inline void Metadata::set_title(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_title();
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Metadata.title)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.title)
 }
 inline void Metadata::set_title(const char* value, size_t size) {
   set_has_title();
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Metadata.title)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.title)
 }
 inline ::std::string* Metadata::mutable_title() {
   set_has_title();
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.title)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.title)
   return title_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_title() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.title)
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.title)
   if (!has_title()) {
     return NULL;
   }
@@ -1109,7 +1109,7 @@ inline void Metadata::set_allocated_title(::std::string* title) {
     clear_has_title();
   }
   title_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), title);
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.title)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.title)
 }
 
 // required string description = 4;
@@ -1127,41 +1127,41 @@ inline void Metadata::clear_description() {
   clear_has_description();
 }
 inline const ::std::string& Metadata::description() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.description)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.description)
   return description_.GetNoArena();
 }
 inline void Metadata::set_description(const ::std::string& value) {
   set_has_description();
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Metadata.description)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.description)
 }
 #if LANG_CXX11
 inline void Metadata::set_description(::std::string&& value) {
   set_has_description();
   description_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Metadata.description)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.description)
 }
 #endif
 inline void Metadata::set_description(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_description();
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Metadata.description)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.description)
 }
 inline void Metadata::set_description(const char* value, size_t size) {
   set_has_description();
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Metadata.description)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.description)
 }
 inline ::std::string* Metadata::mutable_description() {
   set_has_description();
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.description)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.description)
   return description_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_description() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.description)
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.description)
   if (!has_description()) {
     return NULL;
   }
@@ -1175,7 +1175,7 @@ inline void Metadata::set_allocated_description(::std::string* description) {
     clear_has_description();
   }
   description_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), description);
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.description)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.description)
 }
 
 // required string author = 5;
@@ -1193,41 +1193,41 @@ inline void Metadata::clear_author() {
   clear_has_author();
 }
 inline const ::std::string& Metadata::author() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.author)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.author)
   return author_.GetNoArena();
 }
 inline void Metadata::set_author(const ::std::string& value) {
   set_has_author();
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Metadata.author)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.author)
 }
 #if LANG_CXX11
 inline void Metadata::set_author(::std::string&& value) {
   set_has_author();
   author_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Metadata.author)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.author)
 }
 #endif
 inline void Metadata::set_author(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_author();
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Metadata.author)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.author)
 }
 inline void Metadata::set_author(const char* value, size_t size) {
   set_has_author();
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Metadata.author)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.author)
 }
 inline ::std::string* Metadata::mutable_author() {
   set_has_author();
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.author)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.author)
   return author_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_author() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.author)
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.author)
   if (!has_author()) {
     return NULL;
   }
@@ -1241,7 +1241,7 @@ inline void Metadata::set_allocated_author(::std::string* author) {
     clear_has_author();
   }
   author_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), author);
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.author)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.author)
 }
 
 // required string license = 6;
@@ -1259,41 +1259,41 @@ inline void Metadata::clear_license() {
   clear_has_license();
 }
 inline const ::std::string& Metadata::license() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.license)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.license)
   return license_.GetNoArena();
 }
 inline void Metadata::set_license(const ::std::string& value) {
   set_has_license();
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Metadata.license)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.license)
 }
 #if LANG_CXX11
 inline void Metadata::set_license(::std::string&& value) {
   set_has_license();
   license_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Metadata.license)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.license)
 }
 #endif
 inline void Metadata::set_license(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_license();
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Metadata.license)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.license)
 }
 inline void Metadata::set_license(const char* value, size_t size) {
   set_has_license();
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Metadata.license)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.license)
 }
 inline ::std::string* Metadata::mutable_license() {
   set_has_license();
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.license)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.license)
   return license_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_license() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.license)
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.license)
   if (!has_license()) {
     return NULL;
   }
@@ -1307,7 +1307,7 @@ inline void Metadata::set_allocated_license(::std::string* license) {
     clear_has_license();
   }
   license_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), license);
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.license)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.license)
 }
 
 // required bool nsfw = 7;
@@ -1325,16 +1325,16 @@ inline void Metadata::clear_nsfw() {
   clear_has_nsfw();
 }
 inline bool Metadata::nsfw() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.nsfw)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.nsfw)
   return nsfw_;
 }
 inline void Metadata::set_nsfw(bool value) {
   set_has_nsfw();
   nsfw_ = value;
-  // @@protoc_insertion_point(field_set:pb.Metadata.nsfw)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.nsfw)
 }
 
-// optional .pb.Fee fee = 8;
+// optional .legacy_pb.Fee fee = 8;
 inline bool Metadata::has_fee() const {
   return (_has_bits_[0] & 0x00000080u) != 0;
 }
@@ -1344,32 +1344,32 @@ inline void Metadata::set_has_fee() {
 inline void Metadata::clear_has_fee() {
   _has_bits_[0] &= ~0x00000080u;
 }
-inline const ::pb::Fee& Metadata::_internal_fee() const {
+inline const ::legacy_pb::Fee& Metadata::_internal_fee() const {
   return *fee_;
 }
-inline const ::pb::Fee& Metadata::fee() const {
-  const ::pb::Fee* p = fee_;
-  // @@protoc_insertion_point(field_get:pb.Metadata.fee)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Fee*>(
-      &::pb::_Fee_default_instance_);
+inline const ::legacy_pb::Fee& Metadata::fee() const {
+  const ::legacy_pb::Fee* p = fee_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.fee)
+  return p != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Fee*>(
+      &::legacy_pb::_Fee_default_instance_);
 }
-inline ::pb::Fee* Metadata::release_fee() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.fee)
+inline ::legacy_pb::Fee* Metadata::release_fee() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.fee)
   clear_has_fee();
-  ::pb::Fee* temp = fee_;
+  ::legacy_pb::Fee* temp = fee_;
   fee_ = NULL;
   return temp;
 }
-inline ::pb::Fee* Metadata::mutable_fee() {
+inline ::legacy_pb::Fee* Metadata::mutable_fee() {
   set_has_fee();
   if (fee_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Fee>(GetArenaNoVirtual());
+    auto* p = CreateMaybeMessage<::legacy_pb::Fee>(GetArenaNoVirtual());
     fee_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.fee)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.fee)
   return fee_;
 }
-inline void Metadata::set_allocated_fee(::pb::Fee* fee) {
+inline void Metadata::set_allocated_fee(::legacy_pb::Fee* fee) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(fee_);
@@ -1385,7 +1385,7 @@ inline void Metadata::set_allocated_fee(::pb::Fee* fee) {
     clear_has_fee();
   }
   fee_ = fee;
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.fee)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.fee)
 }
 
 // optional string thumbnail = 9;
@@ -1403,41 +1403,41 @@ inline void Metadata::clear_thumbnail() {
   clear_has_thumbnail();
 }
 inline const ::std::string& Metadata::thumbnail() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.thumbnail)
   return thumbnail_.GetNoArena();
 }
 inline void Metadata::set_thumbnail(const ::std::string& value) {
   set_has_thumbnail();
   thumbnail_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.thumbnail)
 }
 #if LANG_CXX11
 inline void Metadata::set_thumbnail(::std::string&& value) {
   set_has_thumbnail();
   thumbnail_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.thumbnail)
 }
 #endif
 inline void Metadata::set_thumbnail(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_thumbnail();
   thumbnail_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.thumbnail)
 }
 inline void Metadata::set_thumbnail(const char* value, size_t size) {
   set_has_thumbnail();
   thumbnail_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.thumbnail)
 }
 inline ::std::string* Metadata::mutable_thumbnail() {
   set_has_thumbnail();
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.thumbnail)
   return thumbnail_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_thumbnail() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.thumbnail)
   if (!has_thumbnail()) {
     return NULL;
   }
@@ -1451,7 +1451,7 @@ inline void Metadata::set_allocated_thumbnail(::std::string* thumbnail) {
     clear_has_thumbnail();
   }
   thumbnail_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), thumbnail);
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.thumbnail)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.thumbnail)
 }
 
 // optional string preview = 10;
@@ -1469,41 +1469,41 @@ inline void Metadata::clear_preview() {
   clear_has_preview();
 }
 inline const ::std::string& Metadata::preview() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.preview)
   return preview_.GetNoArena();
 }
 inline void Metadata::set_preview(const ::std::string& value) {
   set_has_preview();
   preview_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.preview)
 }
 #if LANG_CXX11
 inline void Metadata::set_preview(::std::string&& value) {
   set_has_preview();
   preview_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.preview)
 }
 #endif
 inline void Metadata::set_preview(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_preview();
   preview_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.preview)
 }
 inline void Metadata::set_preview(const char* value, size_t size) {
   set_has_preview();
   preview_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.preview)
 }
 inline ::std::string* Metadata::mutable_preview() {
   set_has_preview();
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.preview)
   return preview_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_preview() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.preview)
   if (!has_preview()) {
     return NULL;
   }
@@ -1517,7 +1517,7 @@ inline void Metadata::set_allocated_preview(::std::string* preview) {
     clear_has_preview();
   }
   preview_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), preview);
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.preview)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.preview)
 }
 
 // optional string licenseUrl = 11;
@@ -1535,41 +1535,41 @@ inline void Metadata::clear_licenseurl() {
   clear_has_licenseurl();
 }
 inline const ::std::string& Metadata::licenseurl() const {
-  // @@protoc_insertion_point(field_get:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_get:legacy_pb.Metadata.licenseUrl)
   return licenseurl_.GetNoArena();
 }
 inline void Metadata::set_licenseurl(const ::std::string& value) {
   set_has_licenseurl();
   licenseurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_set:legacy_pb.Metadata.licenseUrl)
 }
 #if LANG_CXX11
 inline void Metadata::set_licenseurl(::std::string&& value) {
   set_has_licenseurl();
   licenseurl_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.licenseUrl)
 }
 #endif
 inline void Metadata::set_licenseurl(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_licenseurl();
   licenseurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.licenseUrl)
 }
 inline void Metadata::set_licenseurl(const char* value, size_t size) {
   set_has_licenseurl();
   licenseurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.licenseUrl)
 }
 inline ::std::string* Metadata::mutable_licenseurl() {
   set_has_licenseurl();
-  // @@protoc_insertion_point(field_mutable:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.licenseUrl)
   return licenseurl_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_licenseurl() {
-  // @@protoc_insertion_point(field_release:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_release:legacy_pb.Metadata.licenseUrl)
   if (!has_licenseurl()) {
     return NULL;
   }
@@ -1583,7 +1583,7 @@ inline void Metadata::set_allocated_licenseurl(::std::string* licenseurl) {
     clear_has_licenseurl();
   }
   licenseurl_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), licenseurl);
-  // @@protoc_insertion_point(field_set_allocated:pb.Metadata.licenseUrl)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.licenseUrl)
 }
 
 #ifdef __GNUC__
@@ -1592,20 +1592,20 @@ inline void Metadata::set_allocated_licenseurl(::std::string* licenseurl) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Metadata_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Metadata_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Metadata_Version>() {
-  return ::pb::Metadata_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Metadata_Version>() {
+  return ::legacy_pb::Metadata_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Metadata_Language> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Metadata_Language> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Metadata_Language>() {
-  return ::pb::Metadata_Language_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Metadata_Language>() {
+  return ::legacy_pb::Metadata_Language_descriptor();
 }
 
 }  // namespace protobuf
diff --git a/v1/cpp/signature.pb.cc b/v1/cpp/signature.pb.cc
index 55cab08..61843a4 100644
--- a/v1/cpp/signature.pb.cc
+++ b/v1/cpp/signature.pb.cc
@@ -19,23 +19,23 @@
 #endif
 // @@protoc_insertion_point(includes)
 
-namespace pb {
+namespace legacy_pb {
 class SignatureDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Signature>
       _instance;
 } _Signature_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace protobuf_signature_2eproto {
 static void InitDefaultsSignature() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Signature_default_instance_;
-    new (ptr) ::pb::Signature();
+    void* ptr = &::legacy_pb::_Signature_default_instance_;
+    new (ptr) ::legacy_pb::Signature();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Signature::InitAsDefaultInstance();
+  ::legacy_pb::Signature::InitAsDefaultInstance();
 }
 
 ::google::protobuf::internal::SCCInfo<0> scc_info_Signature =
@@ -49,26 +49,26 @@ void InitDefaults() {
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
 
 const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, signaturetype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, signature_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, certificateid_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, version_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, signaturetype_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, signature_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, certificateid_),
   2,
   3,
   0,
   1,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 9, sizeof(::pb::Signature)},
+  { 0, 9, sizeof(::legacy_pb::Signature)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Signature_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Signature_default_instance_),
 };
 
 void protobuf_AssignDescriptors() {
@@ -92,15 +92,15 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\017signature.proto\022\002pb\032\021certificate.proto"
-      "\"\255\001\n\tSignature\022&\n\007version\030\001 \002(\0162\025.pb.Sig"
-      "nature.Version\022\"\n\rsignatureType\030\002 \002(\0162\013."
-      "pb.KeyType\022\021\n\tsignature\030\003 \002(\014\022\025\n\rcertifi"
-      "cateId\030\004 \002(\014\"*\n\007Version\022\023\n\017UNKNOWN_VERSI"
-      "ON\020\000\022\n\n\006_0_0_1\020\001"
+      "\n\017signature.proto\022\tlegacy_pb\032\021certificat"
+      "e.proto\"\273\001\n\tSignature\022-\n\007version\030\001 \002(\0162\034"
+      ".legacy_pb.Signature.Version\022)\n\rsignatur"
+      "eType\030\002 \002(\0162\022.legacy_pb.KeyType\022\021\n\tsigna"
+      "ture\030\003 \002(\014\022\025\n\rcertificateId\030\004 \002(\014\"*\n\007Ver"
+      "sion\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 216);
+      descriptor, 237);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "signature.proto", &protobuf_RegisterTypes);
   ::protobuf_certificate_2eproto::AddDescriptors();
@@ -117,7 +117,7 @@ struct StaticDescriptorInitializer {
   }
 } static_descriptor_initializer;
 }  // namespace protobuf_signature_2eproto
-namespace pb {
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Signature_Version_descriptor() {
   protobuf_signature_2eproto::protobuf_AssignDescriptorsOnce();
   return protobuf_signature_2eproto::file_level_enum_descriptors[0];
@@ -156,7 +156,7 @@ Signature::Signature()
   ::google::protobuf::internal::InitSCC(
       &protobuf_signature_2eproto::scc_info_Signature.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Signature)
+  // @@protoc_insertion_point(constructor:legacy_pb.Signature)
 }
 Signature::Signature(const Signature& from)
   : ::google::protobuf::Message(),
@@ -174,7 +174,7 @@ Signature::Signature(const Signature& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&signaturetype_) -
     reinterpret_cast<char*>(&version_)) + sizeof(signaturetype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Signature)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Signature)
 }
 
 void Signature::SharedCtor() {
@@ -186,7 +186,7 @@ void Signature::SharedCtor() {
 }
 
 Signature::~Signature() {
-  // @@protoc_insertion_point(destructor:pb.Signature)
+  // @@protoc_insertion_point(destructor:legacy_pb.Signature)
   SharedDtor();
 }
 
@@ -210,7 +210,7 @@ const Signature& Signature::default_instance() {
 
 
 void Signature::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Signature)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Signature)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -237,13 +237,13 @@ bool Signature::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Signature)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Signature)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Signature.Version version = 1;
+      // required .legacy_pb.Signature.Version version = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -251,8 +251,8 @@ bool Signature::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Signature_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Signature_Version >(value));
+          if (::legacy_pb::Signature_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Signature_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 1, static_cast< ::google::protobuf::uint64>(value));
@@ -263,7 +263,7 @@ bool Signature::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.KeyType signatureType = 2;
+      // required .legacy_pb.KeyType signatureType = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
@@ -271,8 +271,8 @@ bool Signature::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::KeyType_IsValid(value)) {
-            set_signaturetype(static_cast< ::pb::KeyType >(value));
+          if (::legacy_pb::KeyType_IsValid(value)) {
+            set_signaturetype(static_cast< ::legacy_pb::KeyType >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 2, static_cast< ::google::protobuf::uint64>(value));
@@ -319,28 +319,28 @@ bool Signature::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Signature)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Signature)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Signature)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Signature)
   return false;
 #undef DO_
 }
 
 void Signature::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Signature)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Signature)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Signature.Version version = 1;
+  // required .legacy_pb.Signature.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.KeyType signatureType = 2;
+  // required .legacy_pb.KeyType signatureType = 2;
   if (cached_has_bits & 0x00000008u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->signaturetype(), output);
@@ -362,24 +362,24 @@ void Signature::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Signature)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Signature)
 }
 
 ::google::protobuf::uint8* Signature::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Signature)
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Signature)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Signature.Version version = 1;
+  // required .legacy_pb.Signature.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.KeyType signatureType = 2;
+  // required .legacy_pb.KeyType signatureType = 2;
   if (cached_has_bits & 0x00000008u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->signaturetype(), target);
@@ -403,12 +403,12 @@ void Signature::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Signature)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Signature)
   return target;
 }
 
 size_t Signature::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Signature)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Signature)
   size_t total_size = 0;
 
   if (has_signature()) {
@@ -426,13 +426,13 @@ size_t Signature::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Signature.Version version = 1;
+    // required .legacy_pb.Signature.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_signaturetype()) {
-    // required .pb.KeyType signatureType = 2;
+    // required .legacy_pb.KeyType signatureType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->signaturetype());
   }
@@ -440,7 +440,7 @@ size_t Signature::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Signature::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Signature)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Signature)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -459,11 +459,11 @@ size_t Signature::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::BytesSize(
         this->certificateid());
 
-    // required .pb.Signature.Version version = 1;
+    // required .legacy_pb.Signature.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.KeyType signatureType = 2;
+    // required .legacy_pb.KeyType signatureType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->signaturetype());
 
@@ -476,22 +476,22 @@ size_t Signature::ByteSizeLong() const {
 }
 
 void Signature::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Signature)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Signature)
   GOOGLE_DCHECK_NE(&from, this);
   const Signature* source =
       ::google::protobuf::internal::DynamicCastToGenerated<const Signature>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Signature)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Signature)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Signature)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Signature)
     MergeFrom(*source);
   }
 }
 
 void Signature::MergeFrom(const Signature& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Signature)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Signature)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -518,14 +518,14 @@ void Signature::MergeFrom(const Signature& from) {
 }
 
 void Signature::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Signature)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Signature)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Signature::CopyFrom(const Signature& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Signature)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Signature)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -559,11 +559,11 @@ void Signature::InternalSwap(Signature* other) {
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Signature* Arena::CreateMaybeMessage< ::pb::Signature >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Signature >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Signature* Arena::CreateMaybeMessage< ::legacy_pb::Signature >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Signature >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
diff --git a/v1/cpp/signature.pb.h b/v1/cpp/signature.pb.h
index 01d1311..6ab8f1b 100644
--- a/v1/cpp/signature.pb.h
+++ b/v1/cpp/signature.pb.h
@@ -8,12 +8,12 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -47,17 +47,17 @@ struct TableStruct {
 };
 void AddDescriptors();
 }  // namespace protobuf_signature_2eproto
-namespace pb {
+namespace legacy_pb {
 class Signature;
 class SignatureDefaultTypeInternal;
 extern SignatureDefaultTypeInternal _Signature_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Signature* Arena::CreateMaybeMessage<::pb::Signature>(Arena*);
+template<> ::legacy_pb::Signature* Arena::CreateMaybeMessage<::legacy_pb::Signature>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Signature_Version {
   Signature_Version_UNKNOWN_VERSION = 0,
@@ -80,7 +80,7 @@ inline bool Signature_Version_Parse(
 }
 // ===================================================================
 
-class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Signature) */ {
+class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Signature) */ {
  public:
   Signature();
   virtual ~Signature();
@@ -230,21 +230,21 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
   ::std::string* release_certificateid();
   void set_allocated_certificateid(::std::string* certificateid);
 
-  // required .pb.Signature.Version version = 1;
+  // required .legacy_pb.Signature.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Signature_Version version() const;
-  void set_version(::pb::Signature_Version value);
+  ::legacy_pb::Signature_Version version() const;
+  void set_version(::legacy_pb::Signature_Version value);
 
-  // required .pb.KeyType signatureType = 2;
+  // required .legacy_pb.KeyType signatureType = 2;
   bool has_signaturetype() const;
   void clear_signaturetype();
   static const int kSignatureTypeFieldNumber = 2;
-  ::pb::KeyType signaturetype() const;
-  void set_signaturetype(::pb::KeyType value);
+  ::legacy_pb::KeyType signaturetype() const;
+  void set_signaturetype(::legacy_pb::KeyType value);
 
-  // @@protoc_insertion_point(class_scope:pb.Signature)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Signature)
  private:
   void set_has_version();
   void clear_has_version();
@@ -278,7 +278,7 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
 #endif  // __GNUC__
 // Signature
 
-// required .pb.Signature.Version version = 1;
+// required .legacy_pb.Signature.Version version = 1;
 inline bool Signature::has_version() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -292,18 +292,18 @@ inline void Signature::clear_version() {
   version_ = 0;
   clear_has_version();
 }
-inline ::pb::Signature_Version Signature::version() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.version)
-  return static_cast< ::pb::Signature_Version >(version_);
+inline ::legacy_pb::Signature_Version Signature::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.version)
+  return static_cast< ::legacy_pb::Signature_Version >(version_);
 }
-inline void Signature::set_version(::pb::Signature_Version value) {
-  assert(::pb::Signature_Version_IsValid(value));
+inline void Signature::set_version(::legacy_pb::Signature_Version value) {
+  assert(::legacy_pb::Signature_Version_IsValid(value));
   set_has_version();
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Signature.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.version)
 }
 
-// required .pb.KeyType signatureType = 2;
+// required .legacy_pb.KeyType signatureType = 2;
 inline bool Signature::has_signaturetype() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -317,15 +317,15 @@ inline void Signature::clear_signaturetype() {
   signaturetype_ = 0;
   clear_has_signaturetype();
 }
-inline ::pb::KeyType Signature::signaturetype() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.signatureType)
-  return static_cast< ::pb::KeyType >(signaturetype_);
+inline ::legacy_pb::KeyType Signature::signaturetype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.signatureType)
+  return static_cast< ::legacy_pb::KeyType >(signaturetype_);
 }
-inline void Signature::set_signaturetype(::pb::KeyType value) {
-  assert(::pb::KeyType_IsValid(value));
+inline void Signature::set_signaturetype(::legacy_pb::KeyType value) {
+  assert(::legacy_pb::KeyType_IsValid(value));
   set_has_signaturetype();
   signaturetype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Signature.signatureType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.signatureType)
 }
 
 // required bytes signature = 3;
@@ -343,41 +343,41 @@ inline void Signature::clear_signature() {
   clear_has_signature();
 }
 inline const ::std::string& Signature::signature() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.signature)
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.signature)
   return signature_.GetNoArena();
 }
 inline void Signature::set_signature(const ::std::string& value) {
   set_has_signature();
   signature_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.signature)
 }
 #if LANG_CXX11
 inline void Signature::set_signature(::std::string&& value) {
   set_has_signature();
   signature_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Signature.signature)
 }
 #endif
 inline void Signature::set_signature(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_signature();
   signature_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Signature.signature)
 }
 inline void Signature::set_signature(const void* value, size_t size) {
   set_has_signature();
   signature_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Signature.signature)
 }
 inline ::std::string* Signature::mutable_signature() {
   set_has_signature();
-  // @@protoc_insertion_point(field_mutable:pb.Signature.signature)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Signature.signature)
   return signature_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Signature::release_signature() {
-  // @@protoc_insertion_point(field_release:pb.Signature.signature)
+  // @@protoc_insertion_point(field_release:legacy_pb.Signature.signature)
   if (!has_signature()) {
     return NULL;
   }
@@ -391,7 +391,7 @@ inline void Signature::set_allocated_signature(::std::string* signature) {
     clear_has_signature();
   }
   signature_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), signature);
-  // @@protoc_insertion_point(field_set_allocated:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Signature.signature)
 }
 
 // required bytes certificateId = 4;
@@ -409,41 +409,41 @@ inline void Signature::clear_certificateid() {
   clear_has_certificateid();
 }
 inline const ::std::string& Signature::certificateid() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.certificateId)
   return certificateid_.GetNoArena();
 }
 inline void Signature::set_certificateid(const ::std::string& value) {
   set_has_certificateid();
   certificateid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.certificateId)
 }
 #if LANG_CXX11
 inline void Signature::set_certificateid(::std::string&& value) {
   set_has_certificateid();
   certificateid_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Signature.certificateId)
 }
 #endif
 inline void Signature::set_certificateid(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_certificateid();
   certificateid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Signature.certificateId)
 }
 inline void Signature::set_certificateid(const void* value, size_t size) {
   set_has_certificateid();
   certificateid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Signature.certificateId)
 }
 inline ::std::string* Signature::mutable_certificateid() {
   set_has_certificateid();
-  // @@protoc_insertion_point(field_mutable:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Signature.certificateId)
   return certificateid_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Signature::release_certificateid() {
-  // @@protoc_insertion_point(field_release:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_release:legacy_pb.Signature.certificateId)
   if (!has_certificateid()) {
     return NULL;
   }
@@ -457,7 +457,7 @@ inline void Signature::set_allocated_certificateid(::std::string* certificateid)
     clear_has_certificateid();
   }
   certificateid_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), certificateid);
-  // @@protoc_insertion_point(field_set_allocated:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Signature.certificateId)
 }
 
 #ifdef __GNUC__
@@ -466,15 +466,15 @@ inline void Signature::set_allocated_certificateid(::std::string* certificateid)
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Signature_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Signature_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Signature_Version>() {
-  return ::pb::Signature_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Signature_Version>() {
+  return ::legacy_pb::Signature_Version_descriptor();
 }
 
 }  // namespace protobuf
diff --git a/v1/cpp/source.pb.cc b/v1/cpp/source.pb.cc
index 470a5ac..402d421 100644
--- a/v1/cpp/source.pb.cc
+++ b/v1/cpp/source.pb.cc
@@ -19,23 +19,23 @@
 #endif
 // @@protoc_insertion_point(includes)
 
-namespace pb {
+namespace legacy_pb {
 class SourceDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Source>
       _instance;
 } _Source_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace protobuf_source_2eproto {
 static void InitDefaultsSource() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Source_default_instance_;
-    new (ptr) ::pb::Source();
+    void* ptr = &::legacy_pb::_Source_default_instance_;
+    new (ptr) ::legacy_pb::Source();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Source::InitAsDefaultInstance();
+  ::legacy_pb::Source::InitAsDefaultInstance();
 }
 
 ::google::protobuf::internal::SCCInfo<0> scc_info_Source =
@@ -49,26 +49,26 @@ void InitDefaults() {
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
 
 const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, sourcetype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, source_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, contenttype_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, version_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, sourcetype_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, source_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, contenttype_),
   2,
   3,
   0,
   1,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 9, sizeof(::pb::Source)},
+  { 0, 9, sizeof(::legacy_pb::Source)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Source_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Source_default_instance_),
 };
 
 void protobuf_AssignDescriptors() {
@@ -92,16 +92,16 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\014source.proto\022\002pb\"\344\001\n\006Source\022#\n\007version"
-      "\030\001 \002(\0162\022.pb.Source.Version\022*\n\nsourceType"
-      "\030\002 \002(\0162\026.pb.Source.SourceTypes\022\016\n\006source"
-      "\030\003 \002(\014\022\023\n\013contentType\030\004 \002(\t\"*\n\007Version\022\023"
-      "\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\"8\n\013Sourc"
-      "eTypes\022\027\n\023UNKNOWN_SOURCE_TYPE\020\000\022\020\n\014lbry_"
-      "sd_hash\020\001"
+      "\n\014source.proto\022\tlegacy_pb\"\362\001\n\006Source\022*\n\007"
+      "version\030\001 \002(\0162\031.legacy_pb.Source.Version"
+      "\0221\n\nsourceType\030\002 \002(\0162\035.legacy_pb.Source."
+      "SourceTypes\022\016\n\006source\030\003 \002(\014\022\023\n\013contentTy"
+      "pe\030\004 \002(\t\"*\n\007Version\022\023\n\017UNKNOWN_VERSION\020\000"
+      "\022\n\n\006_0_0_1\020\001\"8\n\013SourceTypes\022\027\n\023UNKNOWN_S"
+      "OURCE_TYPE\020\000\022\020\n\014lbry_sd_hash\020\001"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 249);
+      descriptor, 270);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "source.proto", &protobuf_RegisterTypes);
 }
@@ -117,7 +117,7 @@ struct StaticDescriptorInitializer {
   }
 } static_descriptor_initializer;
 }  // namespace protobuf_source_2eproto
-namespace pb {
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Source_Version_descriptor() {
   protobuf_source_2eproto::protobuf_AssignDescriptorsOnce();
   return protobuf_source_2eproto::file_level_enum_descriptors[0];
@@ -177,7 +177,7 @@ Source::Source()
   ::google::protobuf::internal::InitSCC(
       &protobuf_source_2eproto::scc_info_Source.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Source)
+  // @@protoc_insertion_point(constructor:legacy_pb.Source)
 }
 Source::Source(const Source& from)
   : ::google::protobuf::Message(),
@@ -195,7 +195,7 @@ Source::Source(const Source& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&sourcetype_) -
     reinterpret_cast<char*>(&version_)) + sizeof(sourcetype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Source)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Source)
 }
 
 void Source::SharedCtor() {
@@ -207,7 +207,7 @@ void Source::SharedCtor() {
 }
 
 Source::~Source() {
-  // @@protoc_insertion_point(destructor:pb.Source)
+  // @@protoc_insertion_point(destructor:legacy_pb.Source)
   SharedDtor();
 }
 
@@ -231,7 +231,7 @@ const Source& Source::default_instance() {
 
 
 void Source::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Source)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Source)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -258,13 +258,13 @@ bool Source::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Source)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Source)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Source.Version version = 1;
+      // required .legacy_pb.Source.Version version = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -272,8 +272,8 @@ bool Source::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Source_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Source_Version >(value));
+          if (::legacy_pb::Source_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Source_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 1, static_cast< ::google::protobuf::uint64>(value));
@@ -284,7 +284,7 @@ bool Source::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Source.SourceTypes sourceType = 2;
+      // required .legacy_pb.Source.SourceTypes sourceType = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
@@ -292,8 +292,8 @@ bool Source::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Source_SourceTypes_IsValid(value)) {
-            set_sourcetype(static_cast< ::pb::Source_SourceTypes >(value));
+          if (::legacy_pb::Source_SourceTypes_IsValid(value)) {
+            set_sourcetype(static_cast< ::legacy_pb::Source_SourceTypes >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 2, static_cast< ::google::protobuf::uint64>(value));
@@ -325,7 +325,7 @@ bool Source::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->contenttype().data(), static_cast<int>(this->contenttype().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Source.contentType");
+            "legacy_pb.Source.contentType");
         } else {
           goto handle_unusual;
         }
@@ -344,28 +344,28 @@ bool Source::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Source)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Source)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Source)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Source)
   return false;
 #undef DO_
 }
 
 void Source::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Source)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Source)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Source.Version version = 1;
+  // required .legacy_pb.Source.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.Source.SourceTypes sourceType = 2;
+  // required .legacy_pb.Source.SourceTypes sourceType = 2;
   if (cached_has_bits & 0x00000008u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->sourcetype(), output);
@@ -382,7 +382,7 @@ void Source::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->contenttype().data(), static_cast<int>(this->contenttype().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Source.contentType");
+      "legacy_pb.Source.contentType");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       4, this->contenttype(), output);
   }
@@ -391,24 +391,24 @@ void Source::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Source)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Source)
 }
 
 ::google::protobuf::uint8* Source::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Source)
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Source)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Source.Version version = 1;
+  // required .legacy_pb.Source.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.Source.SourceTypes sourceType = 2;
+  // required .legacy_pb.Source.SourceTypes sourceType = 2;
   if (cached_has_bits & 0x00000008u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->sourcetype(), target);
@@ -426,7 +426,7 @@ void Source::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->contenttype().data(), static_cast<int>(this->contenttype().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Source.contentType");
+      "legacy_pb.Source.contentType");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         4, this->contenttype(), target);
@@ -436,12 +436,12 @@ void Source::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Source)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Source)
   return target;
 }
 
 size_t Source::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Source)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Source)
   size_t total_size = 0;
 
   if (has_source()) {
@@ -459,13 +459,13 @@ size_t Source::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Source.Version version = 1;
+    // required .legacy_pb.Source.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_sourcetype()) {
-    // required .pb.Source.SourceTypes sourceType = 2;
+    // required .legacy_pb.Source.SourceTypes sourceType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->sourcetype());
   }
@@ -473,7 +473,7 @@ size_t Source::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Source::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Source)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Source)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -492,11 +492,11 @@ size_t Source::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::StringSize(
         this->contenttype());
 
-    // required .pb.Source.Version version = 1;
+    // required .legacy_pb.Source.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.Source.SourceTypes sourceType = 2;
+    // required .legacy_pb.Source.SourceTypes sourceType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->sourcetype());
 
@@ -509,22 +509,22 @@ size_t Source::ByteSizeLong() const {
 }
 
 void Source::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Source)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Source)
   GOOGLE_DCHECK_NE(&from, this);
   const Source* source =
       ::google::protobuf::internal::DynamicCastToGenerated<const Source>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Source)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Source)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Source)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Source)
     MergeFrom(*source);
   }
 }
 
 void Source::MergeFrom(const Source& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Source)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Source)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -551,14 +551,14 @@ void Source::MergeFrom(const Source& from) {
 }
 
 void Source::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Source)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Source)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Source::CopyFrom(const Source& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Source)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Source)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -592,11 +592,11 @@ void Source::InternalSwap(Source* other) {
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Source* Arena::CreateMaybeMessage< ::pb::Source >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Source >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Source* Arena::CreateMaybeMessage< ::legacy_pb::Source >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Source >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
diff --git a/v1/cpp/source.pb.h b/v1/cpp/source.pb.h
index 9d90e47..11318f6 100644
--- a/v1/cpp/source.pb.h
+++ b/v1/cpp/source.pb.h
@@ -8,12 +8,12 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -46,17 +46,17 @@ struct TableStruct {
 };
 void AddDescriptors();
 }  // namespace protobuf_source_2eproto
-namespace pb {
+namespace legacy_pb {
 class Source;
 class SourceDefaultTypeInternal;
 extern SourceDefaultTypeInternal _Source_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Source* Arena::CreateMaybeMessage<::pb::Source>(Arena*);
+template<> ::legacy_pb::Source* Arena::CreateMaybeMessage<::legacy_pb::Source>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Source_Version {
   Source_Version_UNKNOWN_VERSION = 0,
@@ -98,7 +98,7 @@ inline bool Source_SourceTypes_Parse(
 }
 // ===================================================================
 
-class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Source) */ {
+class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Source) */ {
  public:
   Source();
   virtual ~Source();
@@ -274,21 +274,21 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   ::std::string* release_contenttype();
   void set_allocated_contenttype(::std::string* contenttype);
 
-  // required .pb.Source.Version version = 1;
+  // required .legacy_pb.Source.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Source_Version version() const;
-  void set_version(::pb::Source_Version value);
+  ::legacy_pb::Source_Version version() const;
+  void set_version(::legacy_pb::Source_Version value);
 
-  // required .pb.Source.SourceTypes sourceType = 2;
+  // required .legacy_pb.Source.SourceTypes sourceType = 2;
   bool has_sourcetype() const;
   void clear_sourcetype();
   static const int kSourceTypeFieldNumber = 2;
-  ::pb::Source_SourceTypes sourcetype() const;
-  void set_sourcetype(::pb::Source_SourceTypes value);
+  ::legacy_pb::Source_SourceTypes sourcetype() const;
+  void set_sourcetype(::legacy_pb::Source_SourceTypes value);
 
-  // @@protoc_insertion_point(class_scope:pb.Source)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Source)
  private:
   void set_has_version();
   void clear_has_version();
@@ -322,7 +322,7 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 #endif  // __GNUC__
 // Source
 
-// required .pb.Source.Version version = 1;
+// required .legacy_pb.Source.Version version = 1;
 inline bool Source::has_version() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -336,18 +336,18 @@ inline void Source::clear_version() {
   version_ = 0;
   clear_has_version();
 }
-inline ::pb::Source_Version Source::version() const {
-  // @@protoc_insertion_point(field_get:pb.Source.version)
-  return static_cast< ::pb::Source_Version >(version_);
+inline ::legacy_pb::Source_Version Source::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.version)
+  return static_cast< ::legacy_pb::Source_Version >(version_);
 }
-inline void Source::set_version(::pb::Source_Version value) {
-  assert(::pb::Source_Version_IsValid(value));
+inline void Source::set_version(::legacy_pb::Source_Version value) {
+  assert(::legacy_pb::Source_Version_IsValid(value));
   set_has_version();
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Source.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.version)
 }
 
-// required .pb.Source.SourceTypes sourceType = 2;
+// required .legacy_pb.Source.SourceTypes sourceType = 2;
 inline bool Source::has_sourcetype() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -361,15 +361,15 @@ inline void Source::clear_sourcetype() {
   sourcetype_ = 0;
   clear_has_sourcetype();
 }
-inline ::pb::Source_SourceTypes Source::sourcetype() const {
-  // @@protoc_insertion_point(field_get:pb.Source.sourceType)
-  return static_cast< ::pb::Source_SourceTypes >(sourcetype_);
+inline ::legacy_pb::Source_SourceTypes Source::sourcetype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.sourceType)
+  return static_cast< ::legacy_pb::Source_SourceTypes >(sourcetype_);
 }
-inline void Source::set_sourcetype(::pb::Source_SourceTypes value) {
-  assert(::pb::Source_SourceTypes_IsValid(value));
+inline void Source::set_sourcetype(::legacy_pb::Source_SourceTypes value) {
+  assert(::legacy_pb::Source_SourceTypes_IsValid(value));
   set_has_sourcetype();
   sourcetype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Source.sourceType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.sourceType)
 }
 
 // required bytes source = 3;
@@ -387,41 +387,41 @@ inline void Source::clear_source() {
   clear_has_source();
 }
 inline const ::std::string& Source::source() const {
-  // @@protoc_insertion_point(field_get:pb.Source.source)
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.source)
   return source_.GetNoArena();
 }
 inline void Source::set_source(const ::std::string& value) {
   set_has_source();
   source_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Source.source)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.source)
 }
 #if LANG_CXX11
 inline void Source::set_source(::std::string&& value) {
   set_has_source();
   source_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Source.source)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Source.source)
 }
 #endif
 inline void Source::set_source(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_source();
   source_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Source.source)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Source.source)
 }
 inline void Source::set_source(const void* value, size_t size) {
   set_has_source();
   source_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Source.source)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Source.source)
 }
 inline ::std::string* Source::mutable_source() {
   set_has_source();
-  // @@protoc_insertion_point(field_mutable:pb.Source.source)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Source.source)
   return source_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Source::release_source() {
-  // @@protoc_insertion_point(field_release:pb.Source.source)
+  // @@protoc_insertion_point(field_release:legacy_pb.Source.source)
   if (!has_source()) {
     return NULL;
   }
@@ -435,7 +435,7 @@ inline void Source::set_allocated_source(::std::string* source) {
     clear_has_source();
   }
   source_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source);
-  // @@protoc_insertion_point(field_set_allocated:pb.Source.source)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Source.source)
 }
 
 // required string contentType = 4;
@@ -453,41 +453,41 @@ inline void Source::clear_contenttype() {
   clear_has_contenttype();
 }
 inline const ::std::string& Source::contenttype() const {
-  // @@protoc_insertion_point(field_get:pb.Source.contentType)
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.contentType)
   return contenttype_.GetNoArena();
 }
 inline void Source::set_contenttype(const ::std::string& value) {
   set_has_contenttype();
   contenttype_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.contentType)
 }
 #if LANG_CXX11
 inline void Source::set_contenttype(::std::string&& value) {
   set_has_contenttype();
   contenttype_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Source.contentType)
 }
 #endif
 inline void Source::set_contenttype(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_contenttype();
   contenttype_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Source.contentType)
 }
 inline void Source::set_contenttype(const char* value, size_t size) {
   set_has_contenttype();
   contenttype_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Source.contentType)
 }
 inline ::std::string* Source::mutable_contenttype() {
   set_has_contenttype();
-  // @@protoc_insertion_point(field_mutable:pb.Source.contentType)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Source.contentType)
   return contenttype_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Source::release_contenttype() {
-  // @@protoc_insertion_point(field_release:pb.Source.contentType)
+  // @@protoc_insertion_point(field_release:legacy_pb.Source.contentType)
   if (!has_contenttype()) {
     return NULL;
   }
@@ -501,7 +501,7 @@ inline void Source::set_allocated_contenttype(::std::string* contenttype) {
     clear_has_contenttype();
   }
   contenttype_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), contenttype);
-  // @@protoc_insertion_point(field_set_allocated:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Source.contentType)
 }
 
 #ifdef __GNUC__
@@ -510,20 +510,20 @@ inline void Source::set_allocated_contenttype(::std::string* contenttype) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Source_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Source_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Source_Version>() {
-  return ::pb::Source_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Source_Version>() {
+  return ::legacy_pb::Source_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Source_SourceTypes> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Source_SourceTypes> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Source_SourceTypes>() {
-  return ::pb::Source_SourceTypes_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Source_SourceTypes>() {
+  return ::legacy_pb::Source_SourceTypes_descriptor();
 }
 
 }  // namespace protobuf
diff --git a/v1/cpp/stream.pb.cc b/v1/cpp/stream.pb.cc
index 5c3a28e..1bc3b06 100644
--- a/v1/cpp/stream.pb.cc
+++ b/v1/cpp/stream.pb.cc
@@ -25,23 +25,23 @@ extern PROTOBUF_INTERNAL_EXPORT_protobuf_metadata_2eproto ::google::protobuf::in
 namespace protobuf_source_2eproto {
 extern PROTOBUF_INTERNAL_EXPORT_protobuf_source_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Source;
 }  // namespace protobuf_source_2eproto
-namespace pb {
+namespace legacy_pb {
 class StreamDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Stream>
       _instance;
 } _Stream_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace protobuf_stream_2eproto {
 static void InitDefaultsStream() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Stream_default_instance_;
-    new (ptr) ::pb::Stream();
+    void* ptr = &::legacy_pb::_Stream_default_instance_;
+    new (ptr) ::legacy_pb::Stream();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Stream::InitAsDefaultInstance();
+  ::legacy_pb::Stream::InitAsDefaultInstance();
 }
 
 ::google::protobuf::internal::SCCInfo<2> scc_info_Stream =
@@ -57,24 +57,24 @@ void InitDefaults() {
 const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
 
 const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, metadata_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, source_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, version_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, source_),
   2,
   0,
   1,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 8, sizeof(::pb::Stream)},
+  { 0, 8, sizeof(::legacy_pb::Stream)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Stream_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Stream_default_instance_),
 };
 
 void protobuf_AssignDescriptors() {
@@ -98,14 +98,15 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\014stream.proto\022\002pb\032\016metadata.proto\032\014sour"
-      "ce.proto\"\225\001\n\006Stream\022#\n\007version\030\001 \002(\0162\022.p"
-      "b.Stream.Version\022\036\n\010metadata\030\002 \002(\0132\014.pb."
-      "Metadata\022\032\n\006source\030\003 \002(\0132\n.pb.Source\"*\n\007"
-      "Version\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001"
+      "\n\014stream.proto\022\tlegacy_pb\032\016metadata.prot"
+      "o\032\014source.proto\"\252\001\n\006Stream\022*\n\007version\030\001 "
+      "\002(\0162\031.legacy_pb.Stream.Version\022%\n\010metada"
+      "ta\030\002 \002(\0132\023.legacy_pb.Metadata\022!\n\006source\030"
+      "\003 \002(\0132\021.legacy_pb.Source\"*\n\007Version\022\023\n\017U"
+      "NKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 200);
+      descriptor, 228);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "stream.proto", &protobuf_RegisterTypes);
   ::protobuf_metadata_2eproto::AddDescriptors();
@@ -123,7 +124,7 @@ struct StaticDescriptorInitializer {
   }
 } static_descriptor_initializer;
 }  // namespace protobuf_stream_2eproto
-namespace pb {
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Stream_Version_descriptor() {
   protobuf_stream_2eproto::protobuf_AssignDescriptorsOnce();
   return protobuf_stream_2eproto::file_level_enum_descriptors[0];
@@ -149,10 +150,10 @@ const int Stream::Version_ARRAYSIZE;
 // ===================================================================
 
 void Stream::InitAsDefaultInstance() {
-  ::pb::_Stream_default_instance_._instance.get_mutable()->metadata_ = const_cast< ::pb::Metadata*>(
-      ::pb::Metadata::internal_default_instance());
-  ::pb::_Stream_default_instance_._instance.get_mutable()->source_ = const_cast< ::pb::Source*>(
-      ::pb::Source::internal_default_instance());
+  ::legacy_pb::_Stream_default_instance_._instance.get_mutable()->metadata_ = const_cast< ::legacy_pb::Metadata*>(
+      ::legacy_pb::Metadata::internal_default_instance());
+  ::legacy_pb::_Stream_default_instance_._instance.get_mutable()->source_ = const_cast< ::legacy_pb::Source*>(
+      ::legacy_pb::Source::internal_default_instance());
 }
 void Stream::clear_metadata() {
   if (metadata_ != NULL) metadata_->Clear();
@@ -173,7 +174,7 @@ Stream::Stream()
   ::google::protobuf::internal::InitSCC(
       &protobuf_stream_2eproto::scc_info_Stream.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Stream)
+  // @@protoc_insertion_point(constructor:legacy_pb.Stream)
 }
 Stream::Stream(const Stream& from)
   : ::google::protobuf::Message(),
@@ -181,17 +182,17 @@ Stream::Stream(const Stream& from)
       _has_bits_(from._has_bits_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   if (from.has_metadata()) {
-    metadata_ = new ::pb::Metadata(*from.metadata_);
+    metadata_ = new ::legacy_pb::Metadata(*from.metadata_);
   } else {
     metadata_ = NULL;
   }
   if (from.has_source()) {
-    source_ = new ::pb::Source(*from.source_);
+    source_ = new ::legacy_pb::Source(*from.source_);
   } else {
     source_ = NULL;
   }
   version_ = from.version_;
-  // @@protoc_insertion_point(copy_constructor:pb.Stream)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Stream)
 }
 
 void Stream::SharedCtor() {
@@ -201,7 +202,7 @@ void Stream::SharedCtor() {
 }
 
 Stream::~Stream() {
-  // @@protoc_insertion_point(destructor:pb.Stream)
+  // @@protoc_insertion_point(destructor:legacy_pb.Stream)
   SharedDtor();
 }
 
@@ -225,7 +226,7 @@ const Stream& Stream::default_instance() {
 
 
 void Stream::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Stream)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Stream)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -250,13 +251,13 @@ bool Stream::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Stream)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Stream)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Stream.Version version = 1;
+      // required .legacy_pb.Stream.Version version = 1;
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
@@ -264,8 +265,8 @@ bool Stream::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Stream_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Stream_Version >(value));
+          if (::legacy_pb::Stream_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Stream_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
                 1, static_cast< ::google::protobuf::uint64>(value));
@@ -276,7 +277,7 @@ bool Stream::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Metadata metadata = 2;
+      // required .legacy_pb.Metadata metadata = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
@@ -288,7 +289,7 @@ bool Stream::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Source source = 3;
+      // required .legacy_pb.Source source = 3;
       case 3: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
@@ -312,34 +313,34 @@ bool Stream::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Stream)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Stream)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Stream)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Stream)
   return false;
 #undef DO_
 }
 
 void Stream::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Stream)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Stream)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Stream.Version version = 1;
+  // required .legacy_pb.Stream.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.Metadata metadata = 2;
+  // required .legacy_pb.Metadata metadata = 2;
   if (cached_has_bits & 0x00000001u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->_internal_metadata(), output);
   }
 
-  // required .pb.Source source = 3;
+  // required .legacy_pb.Source source = 3;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->_internal_source(), output);
@@ -349,31 +350,31 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Stream)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Stream)
 }
 
 ::google::protobuf::uint8* Stream::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Stream)
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Stream)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Stream.Version version = 1;
+  // required .legacy_pb.Stream.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.Metadata metadata = 2;
+  // required .legacy_pb.Metadata metadata = 2;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
         2, this->_internal_metadata(), deterministic, target);
   }
 
-  // required .pb.Source source = 3;
+  // required .legacy_pb.Source source = 3;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
@@ -384,30 +385,30 @@ void Stream::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Stream)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Stream)
   return target;
 }
 
 size_t Stream::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Stream)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Stream)
   size_t total_size = 0;
 
   if (has_metadata()) {
-    // required .pb.Metadata metadata = 2;
+    // required .legacy_pb.Metadata metadata = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *metadata_);
   }
 
   if (has_source()) {
-    // required .pb.Source source = 3;
+    // required .legacy_pb.Source source = 3;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *source_);
   }
 
   if (has_version()) {
-    // required .pb.Stream.Version version = 1;
+    // required .legacy_pb.Stream.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
@@ -415,7 +416,7 @@ size_t Stream::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Stream::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Stream)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Stream)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -424,17 +425,17 @@ size_t Stream::ByteSizeLong() const {
         _internal_metadata_.unknown_fields());
   }
   if (((_has_bits_[0] & 0x00000007) ^ 0x00000007) == 0) {  // All required fields are present.
-    // required .pb.Metadata metadata = 2;
+    // required .legacy_pb.Metadata metadata = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *metadata_);
 
-    // required .pb.Source source = 3;
+    // required .legacy_pb.Source source = 3;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *source_);
 
-    // required .pb.Stream.Version version = 1;
+    // required .legacy_pb.Stream.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
@@ -447,22 +448,22 @@ size_t Stream::ByteSizeLong() const {
 }
 
 void Stream::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Stream)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Stream)
   GOOGLE_DCHECK_NE(&from, this);
   const Stream* source =
       ::google::protobuf::internal::DynamicCastToGenerated<const Stream>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Stream)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Stream)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Stream)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Stream)
     MergeFrom(*source);
   }
 }
 
 void Stream::MergeFrom(const Stream& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Stream)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Stream)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -471,10 +472,10 @@ void Stream::MergeFrom(const Stream& from) {
   cached_has_bits = from._has_bits_[0];
   if (cached_has_bits & 7u) {
     if (cached_has_bits & 0x00000001u) {
-      mutable_metadata()->::pb::Metadata::MergeFrom(from.metadata());
+      mutable_metadata()->::legacy_pb::Metadata::MergeFrom(from.metadata());
     }
     if (cached_has_bits & 0x00000002u) {
-      mutable_source()->::pb::Source::MergeFrom(from.source());
+      mutable_source()->::legacy_pb::Source::MergeFrom(from.source());
     }
     if (cached_has_bits & 0x00000004u) {
       version_ = from.version_;
@@ -484,14 +485,14 @@ void Stream::MergeFrom(const Stream& from) {
 }
 
 void Stream::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Stream)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Stream)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Stream::CopyFrom(const Stream& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Stream)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Stream)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -528,11 +529,11 @@ void Stream::InternalSwap(Stream* other) {
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Stream* Arena::CreateMaybeMessage< ::pb::Stream >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Stream >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Stream* Arena::CreateMaybeMessage< ::legacy_pb::Stream >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Stream >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
diff --git a/v1/cpp/stream.pb.h b/v1/cpp/stream.pb.h
index 9027cb0..87faac9 100644
--- a/v1/cpp/stream.pb.h
+++ b/v1/cpp/stream.pb.h
@@ -8,12 +8,12 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -48,17 +48,17 @@ struct TableStruct {
 };
 void AddDescriptors();
 }  // namespace protobuf_stream_2eproto
-namespace pb {
+namespace legacy_pb {
 class Stream;
 class StreamDefaultTypeInternal;
 extern StreamDefaultTypeInternal _Stream_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Stream* Arena::CreateMaybeMessage<::pb::Stream>(Arena*);
+template<> ::legacy_pb::Stream* Arena::CreateMaybeMessage<::legacy_pb::Stream>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Stream_Version {
   Stream_Version_UNKNOWN_VERSION = 0,
@@ -81,7 +81,7 @@ inline bool Stream_Version_Parse(
 }
 // ===================================================================
 
-class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Stream) */ {
+class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Stream) */ {
  public:
   Stream();
   virtual ~Stream();
@@ -201,38 +201,38 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 
   // accessors -------------------------------------------------------
 
-  // required .pb.Metadata metadata = 2;
+  // required .legacy_pb.Metadata metadata = 2;
   bool has_metadata() const;
   void clear_metadata();
   static const int kMetadataFieldNumber = 2;
   private:
-  const ::pb::Metadata& _internal_metadata() const;
+  const ::legacy_pb::Metadata& _internal_metadata() const;
   public:
-  const ::pb::Metadata& metadata() const;
-  ::pb::Metadata* release_metadata();
-  ::pb::Metadata* mutable_metadata();
-  void set_allocated_metadata(::pb::Metadata* metadata);
+  const ::legacy_pb::Metadata& metadata() const;
+  ::legacy_pb::Metadata* release_metadata();
+  ::legacy_pb::Metadata* mutable_metadata();
+  void set_allocated_metadata(::legacy_pb::Metadata* metadata);
 
-  // required .pb.Source source = 3;
+  // required .legacy_pb.Source source = 3;
   bool has_source() const;
   void clear_source();
   static const int kSourceFieldNumber = 3;
   private:
-  const ::pb::Source& _internal_source() const;
+  const ::legacy_pb::Source& _internal_source() const;
   public:
-  const ::pb::Source& source() const;
-  ::pb::Source* release_source();
-  ::pb::Source* mutable_source();
-  void set_allocated_source(::pb::Source* source);
+  const ::legacy_pb::Source& source() const;
+  ::legacy_pb::Source* release_source();
+  ::legacy_pb::Source* mutable_source();
+  void set_allocated_source(::legacy_pb::Source* source);
 
-  // required .pb.Stream.Version version = 1;
+  // required .legacy_pb.Stream.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Stream_Version version() const;
-  void set_version(::pb::Stream_Version value);
+  ::legacy_pb::Stream_Version version() const;
+  void set_version(::legacy_pb::Stream_Version value);
 
-  // @@protoc_insertion_point(class_scope:pb.Stream)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Stream)
  private:
   void set_has_version();
   void clear_has_version();
@@ -247,8 +247,8 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::HasBits<1> _has_bits_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  ::pb::Metadata* metadata_;
-  ::pb::Source* source_;
+  ::legacy_pb::Metadata* metadata_;
+  ::legacy_pb::Source* source_;
   int version_;
   friend struct ::protobuf_stream_2eproto::TableStruct;
 };
@@ -263,7 +263,7 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 #endif  // __GNUC__
 // Stream
 
-// required .pb.Stream.Version version = 1;
+// required .legacy_pb.Stream.Version version = 1;
 inline bool Stream::has_version() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -277,18 +277,18 @@ inline void Stream::clear_version() {
   version_ = 0;
   clear_has_version();
 }
-inline ::pb::Stream_Version Stream::version() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.version)
-  return static_cast< ::pb::Stream_Version >(version_);
+inline ::legacy_pb::Stream_Version Stream::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Stream.version)
+  return static_cast< ::legacy_pb::Stream_Version >(version_);
 }
-inline void Stream::set_version(::pb::Stream_Version value) {
-  assert(::pb::Stream_Version_IsValid(value));
+inline void Stream::set_version(::legacy_pb::Stream_Version value) {
+  assert(::legacy_pb::Stream_Version_IsValid(value));
   set_has_version();
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Stream.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Stream.version)
 }
 
-// required .pb.Metadata metadata = 2;
+// required .legacy_pb.Metadata metadata = 2;
 inline bool Stream::has_metadata() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -298,32 +298,32 @@ inline void Stream::set_has_metadata() {
 inline void Stream::clear_has_metadata() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline const ::pb::Metadata& Stream::_internal_metadata() const {
+inline const ::legacy_pb::Metadata& Stream::_internal_metadata() const {
   return *metadata_;
 }
-inline const ::pb::Metadata& Stream::metadata() const {
-  const ::pb::Metadata* p = metadata_;
-  // @@protoc_insertion_point(field_get:pb.Stream.metadata)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Metadata*>(
-      &::pb::_Metadata_default_instance_);
+inline const ::legacy_pb::Metadata& Stream::metadata() const {
+  const ::legacy_pb::Metadata* p = metadata_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Stream.metadata)
+  return p != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Metadata*>(
+      &::legacy_pb::_Metadata_default_instance_);
 }
-inline ::pb::Metadata* Stream::release_metadata() {
-  // @@protoc_insertion_point(field_release:pb.Stream.metadata)
+inline ::legacy_pb::Metadata* Stream::release_metadata() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Stream.metadata)
   clear_has_metadata();
-  ::pb::Metadata* temp = metadata_;
+  ::legacy_pb::Metadata* temp = metadata_;
   metadata_ = NULL;
   return temp;
 }
-inline ::pb::Metadata* Stream::mutable_metadata() {
+inline ::legacy_pb::Metadata* Stream::mutable_metadata() {
   set_has_metadata();
   if (metadata_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Metadata>(GetArenaNoVirtual());
+    auto* p = CreateMaybeMessage<::legacy_pb::Metadata>(GetArenaNoVirtual());
     metadata_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Stream.metadata)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Stream.metadata)
   return metadata_;
 }
-inline void Stream::set_allocated_metadata(::pb::Metadata* metadata) {
+inline void Stream::set_allocated_metadata(::legacy_pb::Metadata* metadata) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(metadata_);
@@ -339,10 +339,10 @@ inline void Stream::set_allocated_metadata(::pb::Metadata* metadata) {
     clear_has_metadata();
   }
   metadata_ = metadata;
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.metadata)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Stream.metadata)
 }
 
-// required .pb.Source source = 3;
+// required .legacy_pb.Source source = 3;
 inline bool Stream::has_source() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -352,32 +352,32 @@ inline void Stream::set_has_source() {
 inline void Stream::clear_has_source() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline const ::pb::Source& Stream::_internal_source() const {
+inline const ::legacy_pb::Source& Stream::_internal_source() const {
   return *source_;
 }
-inline const ::pb::Source& Stream::source() const {
-  const ::pb::Source* p = source_;
-  // @@protoc_insertion_point(field_get:pb.Stream.source)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Source*>(
-      &::pb::_Source_default_instance_);
+inline const ::legacy_pb::Source& Stream::source() const {
+  const ::legacy_pb::Source* p = source_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Stream.source)
+  return p != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Source*>(
+      &::legacy_pb::_Source_default_instance_);
 }
-inline ::pb::Source* Stream::release_source() {
-  // @@protoc_insertion_point(field_release:pb.Stream.source)
+inline ::legacy_pb::Source* Stream::release_source() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Stream.source)
   clear_has_source();
-  ::pb::Source* temp = source_;
+  ::legacy_pb::Source* temp = source_;
   source_ = NULL;
   return temp;
 }
-inline ::pb::Source* Stream::mutable_source() {
+inline ::legacy_pb::Source* Stream::mutable_source() {
   set_has_source();
   if (source_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Source>(GetArenaNoVirtual());
+    auto* p = CreateMaybeMessage<::legacy_pb::Source>(GetArenaNoVirtual());
     source_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Stream.source)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Stream.source)
   return source_;
 }
-inline void Stream::set_allocated_source(::pb::Source* source) {
+inline void Stream::set_allocated_source(::legacy_pb::Source* source) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(source_);
@@ -393,7 +393,7 @@ inline void Stream::set_allocated_source(::pb::Source* source) {
     clear_has_source();
   }
   source_ = source;
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.source)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Stream.source)
 }
 
 #ifdef __GNUC__
@@ -402,15 +402,15 @@ inline void Stream::set_allocated_source(::pb::Source* source) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Stream_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Stream_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Stream_Version>() {
-  return ::pb::Stream_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Stream_Version>() {
+  return ::legacy_pb::Stream_Version_descriptor();
 }
 
 }  // namespace protobuf
diff --git a/v1/go/certificate.pb.go b/v1/go/certificate.pb.go
index 9884f89..c721a1f 100644
--- a/v1/go/certificate.pb.go
+++ b/v1/go/certificate.pb.go
@@ -1,28 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: certificate.proto
 
-/*
-Package pb is a generated protocol buffer package.
-
-It is generated from these files:
-	certificate.proto
-	claim.proto
-	fee.proto
-	metadata.proto
-	signature.proto
-	source.proto
-	stream.proto
-
-It has these top-level messages:
-	Certificate
-	Claim
-	Fee
-	Metadata
-	Signature
-	Source
-	Stream
-*/
-package pb
+package legacy_pb
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -77,7 +56,9 @@ func (x *KeyType) UnmarshalJSON(data []byte) error {
 	*x = KeyType(value)
 	return nil
 }
-func (KeyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (KeyType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_certificate_47a4b47e210891c4, []int{0}
+}
 
 type Certificate_Version int32
 
@@ -111,19 +92,42 @@ func (x *Certificate_Version) UnmarshalJSON(data []byte) error {
 	*x = Certificate_Version(value)
 	return nil
 }
-func (Certificate_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
-
-type Certificate struct {
-	Version          *Certificate_Version `protobuf:"varint,1,req,name=version,enum=pb.Certificate_Version" json:"version,omitempty"`
-	KeyType          *KeyType             `protobuf:"varint,2,req,name=keyType,enum=pb.KeyType" json:"keyType,omitempty"`
-	PublicKey        []byte               `protobuf:"bytes,4,req,name=publicKey" json:"publicKey,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
+func (Certificate_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_certificate_47a4b47e210891c4, []int{0, 0}
 }
 
-func (m *Certificate) Reset()                    { *m = Certificate{} }
-func (m *Certificate) String() string            { return proto.CompactTextString(m) }
-func (*Certificate) ProtoMessage()               {}
-func (*Certificate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+type Certificate struct {
+	Version              *Certificate_Version `protobuf:"varint,1,req,name=version,enum=legacy_pb.Certificate_Version" json:"version,omitempty"`
+	KeyType              *KeyType             `protobuf:"varint,2,req,name=keyType,enum=legacy_pb.KeyType" json:"keyType,omitempty"`
+	PublicKey            []byte               `protobuf:"bytes,4,req,name=publicKey" json:"publicKey,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Certificate) Reset()         { *m = Certificate{} }
+func (m *Certificate) String() string { return proto.CompactTextString(m) }
+func (*Certificate) ProtoMessage()    {}
+func (*Certificate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_certificate_47a4b47e210891c4, []int{0}
+}
+func (m *Certificate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Certificate.Unmarshal(m, b)
+}
+func (m *Certificate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Certificate.Marshal(b, m, deterministic)
+}
+func (dst *Certificate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Certificate.Merge(dst, src)
+}
+func (m *Certificate) XXX_Size() int {
+	return xxx_messageInfo_Certificate.Size(m)
+}
+func (m *Certificate) XXX_DiscardUnknown() {
+	xxx_messageInfo_Certificate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Certificate proto.InternalMessageInfo
 
 func (m *Certificate) GetVersion() Certificate_Version {
 	if m != nil && m.Version != nil {
@@ -147,28 +151,29 @@ func (m *Certificate) GetPublicKey() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Certificate)(nil), "pb.Certificate")
-	proto.RegisterEnum("pb.KeyType", KeyType_name, KeyType_value)
-	proto.RegisterEnum("pb.Certificate_Version", Certificate_Version_name, Certificate_Version_value)
+	proto.RegisterType((*Certificate)(nil), "legacy_pb.Certificate")
+	proto.RegisterEnum("legacy_pb.KeyType", KeyType_name, KeyType_value)
+	proto.RegisterEnum("legacy_pb.Certificate_Version", Certificate_Version_name, Certificate_Version_value)
 }
 
-func init() { proto.RegisterFile("certificate.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("certificate.proto", fileDescriptor_certificate_47a4b47e210891c4) }
 
-var fileDescriptor0 = []byte{
-	// 238 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_certificate_47a4b47e210891c4 = []byte{
+	// 245 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4c, 0x4e, 0x2d, 0x2a,
-	0xc9, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a,
-	0x48, 0x52, 0xda, 0xc8, 0xc8, 0xc5, 0xed, 0x8c, 0x90, 0x11, 0x32, 0xe4, 0x62, 0x2f, 0x4b, 0x2d,
-	0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x12, 0xd7, 0x2b, 0x48, 0xd2,
-	0x43, 0x52, 0xa1, 0x17, 0x06, 0x91, 0x0e, 0x82, 0xa9, 0x13, 0x52, 0xe5, 0x62, 0xcf, 0x4e, 0xad,
-	0x0c, 0xa9, 0x2c, 0x48, 0x95, 0x60, 0x02, 0x6b, 0xe1, 0x06, 0x69, 0xf1, 0x86, 0x08, 0x05, 0xc1,
-	0xe4, 0x84, 0x64, 0xb8, 0x38, 0x0b, 0x4a, 0x93, 0x72, 0x32, 0x93, 0xbd, 0x53, 0x2b, 0x25, 0x58,
-	0x14, 0x98, 0x34, 0x78, 0x82, 0x10, 0x02, 0x4a, 0x5a, 0x5c, 0xec, 0x50, 0x83, 0x85, 0x84, 0xb9,
-	0xf8, 0x43, 0xfd, 0xbc, 0xfd, 0xfc, 0xc3, 0xfd, 0xe2, 0xc3, 0x5c, 0x83, 0x82, 0x3d, 0xfd, 0xfd,
-	0x04, 0x18, 0x84, 0xb8, 0xb8, 0xd8, 0xe2, 0x0d, 0xe2, 0x0d, 0xe2, 0x0d, 0x05, 0x18, 0xb5, 0x02,
-	0xb9, 0xd8, 0xa1, 0xa6, 0x0b, 0x49, 0x73, 0x89, 0xc3, 0xd4, 0x06, 0x84, 0x3a, 0xf9, 0x78, 0x3a,
-	0xc7, 0x7b, 0xbb, 0x46, 0xc6, 0x87, 0x44, 0x06, 0xb8, 0x0a, 0x30, 0x08, 0xf1, 0x70, 0x71, 0xf8,
-	0x79, 0x06, 0x87, 0x18, 0x99, 0x9a, 0x15, 0x08, 0x30, 0xc2, 0x78, 0xc6, 0x16, 0x26, 0x05, 0x02,
-	0x4c, 0x42, 0xbc, 0x5c, 0x9c, 0xc1, 0xae, 0xce, 0x01, 0x46, 0xa6, 0x66, 0xd9, 0x86, 0x02, 0xcc,
-	0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xd0, 0xba, 0x16, 0x1e, 0x01, 0x00, 0x00,
+	0xc9, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc,
+	0x49, 0x4d, 0x4f, 0x4c, 0xae, 0x8c, 0x2f, 0x48, 0x52, 0xda, 0xcf, 0xc8, 0xc5, 0xed, 0x8c, 0x50,
+	0x20, 0x64, 0xc1, 0xc5, 0x5e, 0x96, 0x5a, 0x54, 0x9c, 0x99, 0x9f, 0x27, 0xc1, 0xa8, 0xc0, 0xa4,
+	0xc1, 0x67, 0x24, 0xa7, 0x07, 0x57, 0xac, 0x87, 0xa4, 0x50, 0x2f, 0x0c, 0xa2, 0x2a, 0x08, 0xa6,
+	0x5c, 0x48, 0x87, 0x8b, 0x3d, 0x3b, 0xb5, 0x32, 0xa4, 0xb2, 0x20, 0x55, 0x82, 0x09, 0xac, 0x53,
+	0x08, 0x49, 0xa7, 0x37, 0x44, 0x26, 0x08, 0xa6, 0x44, 0x48, 0x86, 0x8b, 0xb3, 0xa0, 0x34, 0x29,
+	0x27, 0x33, 0xd9, 0x3b, 0xb5, 0x52, 0x82, 0x45, 0x81, 0x49, 0x83, 0x27, 0x08, 0x21, 0xa0, 0xa4,
+	0xc5, 0xc5, 0x0e, 0x35, 0x5f, 0x48, 0x98, 0x8b, 0x3f, 0xd4, 0xcf, 0xdb, 0xcf, 0x3f, 0xdc, 0x2f,
+	0x3e, 0xcc, 0x35, 0x28, 0xd8, 0xd3, 0xdf, 0x4f, 0x80, 0x41, 0x88, 0x8b, 0x8b, 0x2d, 0xde, 0x20,
+	0xde, 0x20, 0xde, 0x50, 0x80, 0x51, 0x2b, 0x90, 0x8b, 0x1d, 0x6a, 0xba, 0x90, 0x34, 0x97, 0x38,
+	0x4c, 0x6d, 0x40, 0xa8, 0x93, 0x8f, 0xa7, 0x73, 0xbc, 0xb7, 0x6b, 0x64, 0x7c, 0x48, 0x64, 0x80,
+	0xab, 0x00, 0x83, 0x10, 0x0f, 0x17, 0x87, 0x9f, 0x67, 0x70, 0x88, 0x91, 0xa9, 0x59, 0x81, 0x00,
+	0x23, 0x8c, 0x67, 0x6c, 0x61, 0x52, 0x20, 0xc0, 0x24, 0xc4, 0xcb, 0xc5, 0x19, 0xec, 0xea, 0x1c,
+	0x60, 0x64, 0x6a, 0x96, 0x6d, 0x28, 0xc0, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x95, 0x46,
+	0xe4, 0x33, 0x01, 0x00, 0x00,
 }
diff --git a/v1/go/claim.pb.go b/v1/go/claim.pb.go
deleted file mode 100644
index a85aeea..0000000
--- a/v1/go/claim.pb.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: claim.proto
-
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Claim_Version int32
-
-const (
-	Claim_UNKNOWN_VERSION Claim_Version = 0
-	Claim__0_0_1          Claim_Version = 1
-)
-
-var Claim_Version_name = map[int32]string{
-	0: "UNKNOWN_VERSION",
-	1: "_0_0_1",
-}
-var Claim_Version_value = map[string]int32{
-	"UNKNOWN_VERSION": 0,
-	"_0_0_1":          1,
-}
-
-func (x Claim_Version) Enum() *Claim_Version {
-	p := new(Claim_Version)
-	*p = x
-	return p
-}
-func (x Claim_Version) String() string {
-	return proto.EnumName(Claim_Version_name, int32(x))
-}
-func (x *Claim_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Claim_Version_value, data, "Claim_Version")
-	if err != nil {
-		return err
-	}
-	*x = Claim_Version(value)
-	return nil
-}
-func (Claim_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
-
-type Claim_ClaimType int32
-
-const (
-	Claim_UNKNOWN_CLAIM_TYPE Claim_ClaimType = 0
-	Claim_streamType         Claim_ClaimType = 1
-	Claim_certificateType    Claim_ClaimType = 2
-)
-
-var Claim_ClaimType_name = map[int32]string{
-	0: "UNKNOWN_CLAIM_TYPE",
-	1: "streamType",
-	2: "certificateType",
-}
-var Claim_ClaimType_value = map[string]int32{
-	"UNKNOWN_CLAIM_TYPE": 0,
-	"streamType":         1,
-	"certificateType":    2,
-}
-
-func (x Claim_ClaimType) Enum() *Claim_ClaimType {
-	p := new(Claim_ClaimType)
-	*p = x
-	return p
-}
-func (x Claim_ClaimType) String() string {
-	return proto.EnumName(Claim_ClaimType_name, int32(x))
-}
-func (x *Claim_ClaimType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Claim_ClaimType_value, data, "Claim_ClaimType")
-	if err != nil {
-		return err
-	}
-	*x = Claim_ClaimType(value)
-	return nil
-}
-func (Claim_ClaimType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 1} }
-
-type Claim struct {
-	Version            *Claim_Version   `protobuf:"varint,1,req,name=version,enum=pb.Claim_Version" json:"version,omitempty"`
-	ClaimType          *Claim_ClaimType `protobuf:"varint,2,req,name=claimType,enum=pb.Claim_ClaimType" json:"claimType,omitempty"`
-	Stream             *Stream          `protobuf:"bytes,3,opt,name=stream" json:"stream,omitempty"`
-	Certificate        *Certificate     `protobuf:"bytes,4,opt,name=certificate" json:"certificate,omitempty"`
-	PublisherSignature *Signature       `protobuf:"bytes,5,opt,name=publisherSignature" json:"publisherSignature,omitempty"`
-	XXX_unrecognized   []byte           `json:"-"`
-}
-
-func (m *Claim) Reset()                    { *m = Claim{} }
-func (m *Claim) String() string            { return proto.CompactTextString(m) }
-func (*Claim) ProtoMessage()               {}
-func (*Claim) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *Claim) GetVersion() Claim_Version {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return Claim_UNKNOWN_VERSION
-}
-
-func (m *Claim) GetClaimType() Claim_ClaimType {
-	if m != nil && m.ClaimType != nil {
-		return *m.ClaimType
-	}
-	return Claim_UNKNOWN_CLAIM_TYPE
-}
-
-func (m *Claim) GetStream() *Stream {
-	if m != nil {
-		return m.Stream
-	}
-	return nil
-}
-
-func (m *Claim) GetCertificate() *Certificate {
-	if m != nil {
-		return m.Certificate
-	}
-	return nil
-}
-
-func (m *Claim) GetPublisherSignature() *Signature {
-	if m != nil {
-		return m.PublisherSignature
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Claim)(nil), "pb.Claim")
-	proto.RegisterEnum("pb.Claim_Version", Claim_Version_name, Claim_Version_value)
-	proto.RegisterEnum("pb.Claim_ClaimType", Claim_ClaimType_name, Claim_ClaimType_value)
-}
-
-func init() { proto.RegisterFile("claim.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 283 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0xc1, 0x4a, 0xf3, 0x40,
-	0x14, 0x85, 0x9b, 0xfc, 0x7f, 0x5b, 0x7a, 0xa3, 0x4d, 0x7a, 0x0b, 0x12, 0xba, 0x2a, 0x59, 0x15,
-	0x85, 0xd0, 0x74, 0xef, 0x42, 0x42, 0xc1, 0xa2, 0xa6, 0x32, 0xa9, 0x15, 0x57, 0x21, 0x09, 0xa3,
-	0x0e, 0xd4, 0x26, 0x4c, 0xa6, 0x82, 0xcf, 0xed, 0x0b, 0x48, 0x26, 0x33, 0x26, 0x0b, 0xb7, 0xdf,
-	0xf9, 0xe6, 0xce, 0x39, 0x60, 0xe5, 0x87, 0x94, 0x7d, 0xf8, 0x25, 0x2f, 0x44, 0x81, 0x66, 0x99,
-	0xcd, 0xce, 0x2a, 0xc1, 0x69, 0xaa, 0xc8, 0x6c, 0x92, 0x53, 0x2e, 0xd8, 0x2b, 0xcb, 0x53, 0x41,
-	0x15, 0xb2, 0x2b, 0xf6, 0x76, 0x4c, 0xc5, 0x89, 0x2b, 0xe0, 0x7d, 0x9b, 0xd0, 0x0f, 0xeb, 0x2b,
-	0x78, 0x05, 0xc3, 0x4f, 0xca, 0x2b, 0x56, 0x1c, 0x5d, 0x63, 0x6e, 0x2e, 0xc6, 0xab, 0x89, 0x5f,
-	0x66, 0xbe, 0xcc, 0xfc, 0x7d, 0x13, 0x10, 0x6d, 0x60, 0x00, 0x23, 0xf9, 0xf7, 0xee, 0xab, 0xa4,
-	0xae, 0x29, 0xf5, 0x69, 0xab, 0x87, 0x3a, 0x22, 0xad, 0x85, 0x1e, 0x0c, 0x9a, 0x76, 0xee, 0xbf,
-	0xb9, 0xb1, 0xb0, 0x56, 0x50, 0xfb, 0xb1, 0x24, 0x44, 0x25, 0x18, 0x80, 0xd5, 0xe9, 0xec, 0xfe,
-	0x97, 0xa2, 0x2d, 0x0f, 0xb7, 0x98, 0x74, 0x1d, 0xbc, 0x06, 0x2c, 0x4f, 0xd9, 0x81, 0x55, 0xef,
-	0x94, 0xc7, 0x7a, 0x9c, 0xdb, 0x97, 0x2f, 0xcf, 0xe5, 0x17, 0x1a, 0x92, 0x3f, 0x44, 0xef, 0x12,
-	0x86, 0x6a, 0x1c, 0x4e, 0xc1, 0x7e, 0x8a, 0xee, 0xa2, 0xed, 0x73, 0x94, 0xec, 0xd7, 0x24, 0xde,
-	0x6c, 0x23, 0xa7, 0x87, 0x00, 0x83, 0x64, 0x99, 0x2c, 0x93, 0xc0, 0x31, 0xbc, 0x5b, 0x18, 0xfd,
-	0x2e, 0xc3, 0x0b, 0x40, 0x6d, 0x87, 0xf7, 0x37, 0x9b, 0x87, 0x64, 0xf7, 0xf2, 0xb8, 0x76, 0x7a,
-	0x38, 0x06, 0x68, 0xc6, 0xd4, 0x96, 0x63, 0xd4, 0x57, 0x3b, 0x75, 0x25, 0x34, 0x7f, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0x06, 0xd3, 0xca, 0xd4, 0xb9, 0x01, 0x00, 0x00,
-}
diff --git a/v1/go/fee.pb.go b/v1/go/fee.pb.go
index 41fdb73..7bf785e 100644
--- a/v1/go/fee.pb.go
+++ b/v1/go/fee.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fee.proto
 
-package pb
+package legacy_pb
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 type Fee_Version int32
 
 const (
@@ -44,7 +50,9 @@ func (x *Fee_Version) UnmarshalJSON(data []byte) error {
 	*x = Fee_Version(value)
 	return nil
 }
-func (Fee_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
+func (Fee_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_fee_a80c5fb0f0bc8783, []int{0, 0}
+}
 
 type Fee_Currency int32
 
@@ -84,20 +92,43 @@ func (x *Fee_Currency) UnmarshalJSON(data []byte) error {
 	*x = Fee_Currency(value)
 	return nil
 }
-func (Fee_Currency) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 1} }
-
-type Fee struct {
-	Version          *Fee_Version  `protobuf:"varint,1,req,name=version,enum=pb.Fee_Version" json:"version,omitempty"`
-	Currency         *Fee_Currency `protobuf:"varint,2,req,name=currency,enum=pb.Fee_Currency" json:"currency,omitempty"`
-	Address          []byte        `protobuf:"bytes,3,req,name=address" json:"address,omitempty"`
-	Amount           *float32      `protobuf:"fixed32,4,req,name=amount" json:"amount,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
+func (Fee_Currency) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_fee_a80c5fb0f0bc8783, []int{0, 1}
 }
 
-func (m *Fee) Reset()                    { *m = Fee{} }
-func (m *Fee) String() string            { return proto.CompactTextString(m) }
-func (*Fee) ProtoMessage()               {}
-func (*Fee) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+type Fee struct {
+	Version              *Fee_Version  `protobuf:"varint,1,req,name=version,enum=legacy_pb.Fee_Version" json:"version,omitempty"`
+	Currency             *Fee_Currency `protobuf:"varint,2,req,name=currency,enum=legacy_pb.Fee_Currency" json:"currency,omitempty"`
+	Address              []byte        `protobuf:"bytes,3,req,name=address" json:"address,omitempty"`
+	Amount               *float32      `protobuf:"fixed32,4,req,name=amount" json:"amount,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *Fee) Reset()         { *m = Fee{} }
+func (m *Fee) String() string { return proto.CompactTextString(m) }
+func (*Fee) ProtoMessage()    {}
+func (*Fee) Descriptor() ([]byte, []int) {
+	return fileDescriptor_fee_a80c5fb0f0bc8783, []int{0}
+}
+func (m *Fee) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Fee.Unmarshal(m, b)
+}
+func (m *Fee) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Fee.Marshal(b, m, deterministic)
+}
+func (dst *Fee) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Fee.Merge(dst, src)
+}
+func (m *Fee) XXX_Size() int {
+	return xxx_messageInfo_Fee.Size(m)
+}
+func (m *Fee) XXX_DiscardUnknown() {
+	xxx_messageInfo_Fee.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Fee proto.InternalMessageInfo
 
 func (m *Fee) GetVersion() Fee_Version {
 	if m != nil && m.Version != nil {
@@ -128,27 +159,28 @@ func (m *Fee) GetAmount() float32 {
 }
 
 func init() {
-	proto.RegisterType((*Fee)(nil), "pb.Fee")
-	proto.RegisterEnum("pb.Fee_Version", Fee_Version_name, Fee_Version_value)
-	proto.RegisterEnum("pb.Fee_Currency", Fee_Currency_name, Fee_Currency_value)
+	proto.RegisterType((*Fee)(nil), "legacy_pb.Fee")
+	proto.RegisterEnum("legacy_pb.Fee_Version", Fee_Version_name, Fee_Version_value)
+	proto.RegisterEnum("legacy_pb.Fee_Currency", Fee_Currency_name, Fee_Currency_value)
 }
 
-func init() { proto.RegisterFile("fee.proto", fileDescriptor2) }
+func init() { proto.RegisterFile("fee.proto", fileDescriptor_fee_a80c5fb0f0bc8783) }
 
-var fileDescriptor2 = []byte{
-	// 224 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x8d, 0xcf, 0x4b, 0xc3, 0x30,
-	0x14, 0xc7, 0xd7, 0x54, 0xd6, 0xf9, 0x10, 0xf7, 0x78, 0x8a, 0xe4, 0x58, 0x7a, 0xaa, 0x22, 0x61,
-	0x7a, 0xf5, 0xb6, 0xb8, 0x81, 0x28, 0x19, 0x64, 0x76, 0xe2, 0x29, 0xec, 0xc7, 0x13, 0x3c, 0xd8,
-	0x94, 0x74, 0x13, 0xfc, 0xd3, 0xbd, 0x49, 0xb5, 0xf1, 0xf6, 0xfd, 0xf1, 0x81, 0x0f, 0x1c, 0xbf,
-	0x31, 0xab, 0x26, 0xf8, 0xbd, 0x27, 0xd1, 0x6c, 0x8a, 0xef, 0x04, 0xd2, 0x39, 0x33, 0x5d, 0x42,
-	0xf6, 0xc9, 0xa1, 0x7d, 0xf7, 0xb5, 0x4c, 0x72, 0x51, 0x9e, 0xde, 0x8e, 0x55, 0xb3, 0x51, 0x73,
-	0x66, 0xb5, 0xfa, 0x9b, 0x6d, 0xfc, 0xe9, 0x1a, 0x46, 0xdb, 0x43, 0x08, 0x5c, 0x6f, 0xbf, 0xa4,
-	0xf8, 0x65, 0x31, 0xb2, 0xba, 0xdf, 0xed, 0x3f, 0x41, 0x12, 0xb2, 0xf5, 0x6e, 0x17, 0xb8, 0x6d,
-	0x65, 0x9a, 0x8b, 0xf2, 0xc4, 0xc6, 0x4a, 0x17, 0x30, 0x5c, 0x7f, 0xf8, 0x43, 0xbd, 0x97, 0x47,
-	0xb9, 0x28, 0x85, 0xed, 0x5b, 0x71, 0x05, 0x59, 0xef, 0xa4, 0x33, 0x18, 0x57, 0xe6, 0xd1, 0x2c,
-	0x5e, 0x8c, 0x5b, 0xcd, 0xec, 0xf2, 0x61, 0x61, 0x70, 0x40, 0x00, 0x43, 0x37, 0x71, 0x13, 0x77,
-	0x83, 0x49, 0x71, 0x07, 0xa3, 0xe8, 0xa4, 0x73, 0xc0, 0x08, 0xeb, 0xca, 0xda, 0x99, 0xd1, 0xaf,
-	0x38, 0xa0, 0x0c, 0xd2, 0xa7, 0xa9, 0xc6, 0xa4, 0x0b, 0xd3, 0x67, 0x8d, 0xa2, 0x0b, 0xd5, 0xf2,
-	0x1e, 0xd3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x82, 0x6b, 0xf7, 0x0b, 0x01, 0x00, 0x00,
+var fileDescriptor_fee_a80c5fb0f0bc8783 = []byte{
+	// 234 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x8d, 0xc1, 0x4b, 0xc3, 0x30,
+	0x18, 0xc5, 0xd7, 0x54, 0xd6, 0xed, 0x43, 0x34, 0x7c, 0xca, 0xcc, 0xb1, 0xf4, 0x54, 0x3c, 0x84,
+	0xaa, 0x47, 0x6f, 0x8b, 0x1b, 0x88, 0x92, 0x41, 0x66, 0x27, 0x9e, 0x42, 0xed, 0x3e, 0x45, 0xd0,
+	0x66, 0xa4, 0x9b, 0xb0, 0xbf, 0xc0, 0x7f, 0x5b, 0xa6, 0xcd, 0x0e, 0xbb, 0xbd, 0xc7, 0xfb, 0x3d,
+	0x7e, 0x30, 0x7c, 0x23, 0x92, 0x2b, 0xef, 0xd6, 0x0e, 0x87, 0x9f, 0xf4, 0x5e, 0xd5, 0x5b, 0xbb,
+	0x7a, 0xcd, 0x7e, 0x18, 0xc4, 0x53, 0x22, 0x2c, 0x20, 0xf9, 0x26, 0xdf, 0x7e, 0xb8, 0x46, 0x44,
+	0x29, 0xcb, 0x4f, 0xae, 0x47, 0x72, 0x0f, 0xc9, 0x29, 0x91, 0x5c, 0xfc, 0xaf, 0x26, 0x60, 0x78,
+	0x03, 0x83, 0x7a, 0xe3, 0x3d, 0x35, 0xf5, 0x56, 0xb0, 0xbf, 0xcb, 0xc5, 0xc1, 0x45, 0x75, 0xb3,
+	0xd9, 0x83, 0x28, 0x20, 0xa9, 0x96, 0x4b, 0x4f, 0x6d, 0x2b, 0xe2, 0x94, 0xe5, 0xc7, 0x26, 0x54,
+	0x1c, 0x41, 0xbf, 0xfa, 0x72, 0x9b, 0x66, 0x2d, 0x8e, 0x52, 0x96, 0x33, 0xd3, 0xb5, 0xec, 0x12,
+	0x92, 0x4e, 0x8d, 0x67, 0x70, 0x5a, 0xea, 0x07, 0x3d, 0x7b, 0xd6, 0x76, 0x31, 0x31, 0xf3, 0xfb,
+	0x99, 0xe6, 0x3d, 0x04, 0xe8, 0xdb, 0xc2, 0x16, 0xf6, 0x8a, 0x47, 0xd9, 0x2d, 0x0c, 0x82, 0x13,
+	0xcf, 0x81, 0x07, 0x58, 0x95, 0xc6, 0x4c, 0xb4, 0x7a, 0xe1, 0x3d, 0x4c, 0x20, 0x7e, 0x1c, 0x2b,
+	0x1e, 0xed, 0xc2, 0xf8, 0x49, 0x71, 0xb6, 0x0b, 0xe5, 0xfc, 0x8e, 0xc7, 0xbf, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x4c, 0x11, 0x4f, 0xc8, 0x20, 0x01, 0x00, 0x00,
 }
diff --git a/v1/go/legacy_claim.pb.go b/v1/go/legacy_claim.pb.go
new file mode 100644
index 0000000..31f6cce
--- /dev/null
+++ b/v1/go/legacy_claim.pb.go
@@ -0,0 +1,195 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: legacy_claim.proto
+
+package legacy_pb
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type Claim_Version int32
+
+const (
+	Claim_UNKNOWN_VERSION Claim_Version = 0
+	Claim__0_0_1          Claim_Version = 1
+)
+
+var Claim_Version_name = map[int32]string{
+	0: "UNKNOWN_VERSION",
+	1: "_0_0_1",
+}
+var Claim_Version_value = map[string]int32{
+	"UNKNOWN_VERSION": 0,
+	"_0_0_1":          1,
+}
+
+func (x Claim_Version) Enum() *Claim_Version {
+	p := new(Claim_Version)
+	*p = x
+	return p
+}
+func (x Claim_Version) String() string {
+	return proto.EnumName(Claim_Version_name, int32(x))
+}
+func (x *Claim_Version) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Claim_Version_value, data, "Claim_Version")
+	if err != nil {
+		return err
+	}
+	*x = Claim_Version(value)
+	return nil
+}
+func (Claim_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_legacy_claim_ba06518775556f44, []int{0, 0}
+}
+
+type Claim_ClaimType int32
+
+const (
+	Claim_UNKNOWN_CLAIM_TYPE Claim_ClaimType = 0
+	Claim_streamType         Claim_ClaimType = 1
+	Claim_certificateType    Claim_ClaimType = 2
+)
+
+var Claim_ClaimType_name = map[int32]string{
+	0: "UNKNOWN_CLAIM_TYPE",
+	1: "streamType",
+	2: "certificateType",
+}
+var Claim_ClaimType_value = map[string]int32{
+	"UNKNOWN_CLAIM_TYPE": 0,
+	"streamType":         1,
+	"certificateType":    2,
+}
+
+func (x Claim_ClaimType) Enum() *Claim_ClaimType {
+	p := new(Claim_ClaimType)
+	*p = x
+	return p
+}
+func (x Claim_ClaimType) String() string {
+	return proto.EnumName(Claim_ClaimType_name, int32(x))
+}
+func (x *Claim_ClaimType) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Claim_ClaimType_value, data, "Claim_ClaimType")
+	if err != nil {
+		return err
+	}
+	*x = Claim_ClaimType(value)
+	return nil
+}
+func (Claim_ClaimType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_legacy_claim_ba06518775556f44, []int{0, 1}
+}
+
+type Claim struct {
+	Version              *Claim_Version   `protobuf:"varint,1,req,name=version,enum=legacy_pb.Claim_Version" json:"version,omitempty"`
+	ClaimType            *Claim_ClaimType `protobuf:"varint,2,req,name=claimType,enum=legacy_pb.Claim_ClaimType" json:"claimType,omitempty"`
+	Stream               *Stream          `protobuf:"bytes,3,opt,name=stream" json:"stream,omitempty"`
+	Certificate          *Certificate     `protobuf:"bytes,4,opt,name=certificate" json:"certificate,omitempty"`
+	PublisherSignature   *Signature       `protobuf:"bytes,5,opt,name=publisherSignature" json:"publisherSignature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Claim) Reset()         { *m = Claim{} }
+func (m *Claim) String() string { return proto.CompactTextString(m) }
+func (*Claim) ProtoMessage()    {}
+func (*Claim) Descriptor() ([]byte, []int) {
+	return fileDescriptor_legacy_claim_ba06518775556f44, []int{0}
+}
+func (m *Claim) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Claim.Unmarshal(m, b)
+}
+func (m *Claim) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Claim.Marshal(b, m, deterministic)
+}
+func (dst *Claim) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Claim.Merge(dst, src)
+}
+func (m *Claim) XXX_Size() int {
+	return xxx_messageInfo_Claim.Size(m)
+}
+func (m *Claim) XXX_DiscardUnknown() {
+	xxx_messageInfo_Claim.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Claim proto.InternalMessageInfo
+
+func (m *Claim) GetVersion() Claim_Version {
+	if m != nil && m.Version != nil {
+		return *m.Version
+	}
+	return Claim_UNKNOWN_VERSION
+}
+
+func (m *Claim) GetClaimType() Claim_ClaimType {
+	if m != nil && m.ClaimType != nil {
+		return *m.ClaimType
+	}
+	return Claim_UNKNOWN_CLAIM_TYPE
+}
+
+func (m *Claim) GetStream() *Stream {
+	if m != nil {
+		return m.Stream
+	}
+	return nil
+}
+
+func (m *Claim) GetCertificate() *Certificate {
+	if m != nil {
+		return m.Certificate
+	}
+	return nil
+}
+
+func (m *Claim) GetPublisherSignature() *Signature {
+	if m != nil {
+		return m.PublisherSignature
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Claim)(nil), "legacy_pb.Claim")
+	proto.RegisterEnum("legacy_pb.Claim_Version", Claim_Version_name, Claim_Version_value)
+	proto.RegisterEnum("legacy_pb.Claim_ClaimType", Claim_ClaimType_name, Claim_ClaimType_value)
+}
+
+func init() { proto.RegisterFile("legacy_claim.proto", fileDescriptor_legacy_claim_ba06518775556f44) }
+
+var fileDescriptor_legacy_claim_ba06518775556f44 = []byte{
+	// 293 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0x41, 0x4f, 0xfa, 0x40,
+	0x14, 0xc4, 0x29, 0xfc, 0x81, 0xf0, 0xf8, 0x07, 0xca, 0xd3, 0x90, 0x0d, 0x27, 0xc2, 0x09, 0x3d,
+	0x34, 0xd8, 0x13, 0x57, 0x53, 0x49, 0x24, 0x6a, 0x31, 0x5b, 0xc4, 0x78, 0xda, 0x94, 0x66, 0xc5,
+	0x4d, 0x2a, 0x6d, 0xb6, 0xc5, 0x84, 0x2f, 0xe2, 0xe7, 0x35, 0xdd, 0x6e, 0x61, 0x13, 0xbd, 0xce,
+	0xfc, 0xde, 0xbc, 0x19, 0xc0, 0x98, 0xef, 0xc2, 0xe8, 0xc8, 0xa2, 0x38, 0x14, 0x9f, 0x4e, 0x2a,
+	0x93, 0x3c, 0xc1, 0x8e, 0xd6, 0xd2, 0xed, 0xe8, 0x7f, 0x96, 0x4b, 0x1e, 0x6a, 0x63, 0x34, 0x88,
+	0xb8, 0xcc, 0xc5, 0xbb, 0x88, 0xc2, 0x9c, 0x6b, 0xa9, 0x9f, 0x89, 0xdd, 0x3e, 0xcc, 0x0f, 0x52,
+	0x0b, 0x93, 0xef, 0x06, 0x34, 0xbd, 0x22, 0x0c, 0x5d, 0x68, 0x7f, 0x71, 0x99, 0x89, 0x64, 0x4f,
+	0xac, 0x71, 0x7d, 0xda, 0x73, 0x89, 0x73, 0x0a, 0x76, 0x14, 0xe2, 0x6c, 0x4a, 0x9f, 0x56, 0x20,
+	0xce, 0xa1, 0xa3, 0x9a, 0xac, 0x8f, 0x29, 0x27, 0x75, 0x75, 0x35, 0xfa, 0x75, 0xe5, 0x55, 0x04,
+	0x3d, 0xc3, 0x78, 0x05, 0xad, 0xb2, 0x2b, 0x69, 0x8c, 0xad, 0x69, 0xd7, 0x1d, 0x18, 0x67, 0x81,
+	0x32, 0xa8, 0x06, 0x70, 0x0e, 0x5d, 0x63, 0x08, 0xf9, 0xa7, 0xf8, 0xa1, 0xf9, 0xe6, 0xec, 0x52,
+	0x13, 0xc5, 0x3b, 0xc0, 0xf4, 0xb0, 0x8d, 0x45, 0xf6, 0xc1, 0x65, 0x50, 0x0d, 0x27, 0x4d, 0x15,
+	0x70, 0x69, 0x3e, 0xac, 0x3c, 0xfa, 0x07, 0x3f, 0xb9, 0x86, 0xb6, 0x1e, 0x8e, 0x17, 0xd0, 0x7f,
+	0xf1, 0x1f, 0xfc, 0xd5, 0xab, 0xcf, 0x36, 0x0b, 0x1a, 0x2c, 0x57, 0xbe, 0x5d, 0x43, 0x80, 0x16,
+	0x9b, 0xb1, 0x19, 0xbb, 0xb1, 0xad, 0xc9, 0x3d, 0x74, 0x4e, 0x73, 0x71, 0x08, 0x58, 0xd1, 0xde,
+	0xe3, 0xed, 0xf2, 0x89, 0xad, 0xdf, 0x9e, 0x17, 0x76, 0x0d, 0x7b, 0x00, 0xe5, 0xb4, 0x82, 0xb2,
+	0xad, 0x22, 0xd5, 0x68, 0xad, 0xc4, 0xfa, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xb6, 0x8d,
+	0x7b, 0xea, 0x01, 0x00, 0x00,
+}
diff --git a/v1/go/metadata.pb.go b/v1/go/metadata.pb.go
index cc6c601..b8ad253 100644
--- a/v1/go/metadata.pb.go
+++ b/v1/go/metadata.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: metadata.proto
 
-package pb
+package legacy_pb
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 type Metadata_Version int32
 
 const (
@@ -53,7 +59,9 @@ func (x *Metadata_Version) UnmarshalJSON(data []byte) error {
 	*x = Metadata_Version(value)
 	return nil
 }
-func (Metadata_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+func (Metadata_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_metadata_e82f9da818ea7d21, []int{0, 0}
+}
 
 type Metadata_Language int32
 
@@ -636,27 +644,50 @@ func (x *Metadata_Language) UnmarshalJSON(data []byte) error {
 	*x = Metadata_Language(value)
 	return nil
 }
-func (Metadata_Language) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
-
-type Metadata struct {
-	Version          *Metadata_Version  `protobuf:"varint,1,req,name=version,enum=pb.Metadata_Version" json:"version,omitempty"`
-	Language         *Metadata_Language `protobuf:"varint,2,req,name=language,enum=pb.Metadata_Language" json:"language,omitempty"`
-	Title            *string            `protobuf:"bytes,3,req,name=title" json:"title,omitempty"`
-	Description      *string            `protobuf:"bytes,4,req,name=description" json:"description,omitempty"`
-	Author           *string            `protobuf:"bytes,5,req,name=author" json:"author,omitempty"`
-	License          *string            `protobuf:"bytes,6,req,name=license" json:"license,omitempty"`
-	Nsfw             *bool              `protobuf:"varint,7,req,name=nsfw" json:"nsfw,omitempty"`
-	Fee              *Fee               `protobuf:"bytes,8,opt,name=fee" json:"fee,omitempty"`
-	Thumbnail        *string            `protobuf:"bytes,9,opt,name=thumbnail" json:"thumbnail,omitempty"`
-	Preview          *string            `protobuf:"bytes,10,opt,name=preview" json:"preview,omitempty"`
-	LicenseUrl       *string            `protobuf:"bytes,11,opt,name=licenseUrl" json:"licenseUrl,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
+func (Metadata_Language) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_metadata_e82f9da818ea7d21, []int{0, 1}
 }
 
-func (m *Metadata) Reset()                    { *m = Metadata{} }
-func (m *Metadata) String() string            { return proto.CompactTextString(m) }
-func (*Metadata) ProtoMessage()               {}
-func (*Metadata) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+type Metadata struct {
+	Version              *Metadata_Version  `protobuf:"varint,1,req,name=version,enum=legacy_pb.Metadata_Version" json:"version,omitempty"`
+	Language             *Metadata_Language `protobuf:"varint,2,req,name=language,enum=legacy_pb.Metadata_Language" json:"language,omitempty"`
+	Title                *string            `protobuf:"bytes,3,req,name=title" json:"title,omitempty"`
+	Description          *string            `protobuf:"bytes,4,req,name=description" json:"description,omitempty"`
+	Author               *string            `protobuf:"bytes,5,req,name=author" json:"author,omitempty"`
+	License              *string            `protobuf:"bytes,6,req,name=license" json:"license,omitempty"`
+	Nsfw                 *bool              `protobuf:"varint,7,req,name=nsfw" json:"nsfw,omitempty"`
+	Fee                  *Fee               `protobuf:"bytes,8,opt,name=fee" json:"fee,omitempty"`
+	Thumbnail            *string            `protobuf:"bytes,9,opt,name=thumbnail" json:"thumbnail,omitempty"`
+	Preview              *string            `protobuf:"bytes,10,opt,name=preview" json:"preview,omitempty"`
+	LicenseUrl           *string            `protobuf:"bytes,11,opt,name=licenseUrl" json:"licenseUrl,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Metadata) Reset()         { *m = Metadata{} }
+func (m *Metadata) String() string { return proto.CompactTextString(m) }
+func (*Metadata) ProtoMessage()    {}
+func (*Metadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_metadata_e82f9da818ea7d21, []int{0}
+}
+func (m *Metadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Metadata.Unmarshal(m, b)
+}
+func (m *Metadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Metadata.Marshal(b, m, deterministic)
+}
+func (dst *Metadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metadata.Merge(dst, src)
+}
+func (m *Metadata) XXX_Size() int {
+	return xxx_messageInfo_Metadata.Size(m)
+}
+func (m *Metadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_Metadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Metadata proto.InternalMessageInfo
 
 func (m *Metadata) GetVersion() Metadata_Version {
 	if m != nil && m.Version != nil {
@@ -736,74 +767,74 @@ func (m *Metadata) GetLicenseUrl() string {
 }
 
 func init() {
-	proto.RegisterType((*Metadata)(nil), "pb.Metadata")
-	proto.RegisterEnum("pb.Metadata_Version", Metadata_Version_name, Metadata_Version_value)
-	proto.RegisterEnum("pb.Metadata_Language", Metadata_Language_name, Metadata_Language_value)
+	proto.RegisterType((*Metadata)(nil), "legacy_pb.Metadata")
+	proto.RegisterEnum("legacy_pb.Metadata_Version", Metadata_Version_name, Metadata_Version_value)
+	proto.RegisterEnum("legacy_pb.Metadata_Language", Metadata_Language_name, Metadata_Language_value)
 }
 
-func init() { proto.RegisterFile("metadata.proto", fileDescriptor3) }
+func init() { proto.RegisterFile("metadata.proto", fileDescriptor_metadata_e82f9da818ea7d21) }
 
-var fileDescriptor3 = []byte{
-	// 966 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xe7, 0x7a, 0x1a, 0x47,
-	0x1b, 0xc6, 0x71, 0x83, 0x64, 0x01, 0x2b, 0xbf, 0xf6, 0xfd, 0xae, 0x4b, 0xd6, 0x8e, 0xe3, 0x10,
-	0xa5, 0x91, 0x46, 0x24, 0x39, 0xbd, 0x3b, 0x89, 0xac, 0x38, 0x96, 0x51, 0x82, 0x23, 0x39, 0x9d,
-	0x0c, 0x30, 0x2c, 0x2b, 0x96, 0x5d, 0xb4, 0x0d, 0x43, 0x7a, 0xef, 0xbd, 0x3a, 0xbd, 0xf7, 0xde,
-	0x8f, 0x21, 0x47, 0x95, 0x6b, 0xef, 0x07, 0xc9, 0xce, 0xa7, 0xdf, 0x7f, 0xe6, 0x99, 0x65, 0xb8,
-	0xc6, 0xd8, 0xdc, 0xd5, 0x91, 0x6a, 0xaa, 0x48, 0x95, 0x7b, 0x81, 0x1f, 0xf9, 0x66, 0xb6, 0x57,
-	0xdf, 0x55, 0x68, 0x69, 0x2d, 0xcb, 0xa9, 0x7f, 0xb6, 0x18, 0xf9, 0x43, 0xa3, 0x13, 0x66, 0xd9,
-	0xc8, 0x25, 0x3a, 0x08, 0x1d, 0xdf, 0xb3, 0x32, 0xc5, 0x6c, 0x69, 0xf3, 0xec, 0xb6, 0x72, 0xaf,
-	0x5e, 0x5e, 0x1b, 0x97, 0x97, 0x65, 0x56, 0x5d, 0x3b, 0x64, 0xce, 0x18, 0x79, 0x57, 0x79, 0x76,
-	0xac, 0x6c, 0x6d, 0x65, 0xf9, 0xc1, 0xf6, 0xff, 0x7c, 0xb0, 0x30, 0x1a, 0x56, 0xd7, 0x8f, 0x99,
-	0xdb, 0x8c, 0x8d, 0x91, 0x13, 0xb9, 0xda, 0x1a, 0x2b, 0x66, 0x4b, 0x85, 0xaa, 0x2c, 0xcc, 0xa2,
-	0x31, 0xd9, 0xd4, 0x61, 0x23, 0x70, 0x7a, 0x51, 0x7a, 0xf9, 0x38, 0x67, 0x27, 0x6e, 0x99, 0x3b,
-	0x8c, 0x09, 0x15, 0x47, 0x6d, 0x3f, 0xb0, 0x36, 0x72, 0x38, 0x5a, 0x99, 0x96, 0x91, 0x73, 0x9d,
-	0x86, 0xf6, 0x42, 0x6d, 0x4d, 0x70, 0xb0, 0xb6, 0x34, 0x4d, 0x63, 0xdc, 0x0b, 0x5b, 0x7d, 0x2b,
-	0x57, 0xcc, 0x96, 0xf2, 0x55, 0xb6, 0xb9, 0xd3, 0x18, 0x6b, 0x69, 0x6d, 0xe5, 0x8b, 0x99, 0xd2,
-	0xe4, 0x6c, 0x2e, 0xfd, 0xaf, 0xfb, 0xb5, 0xae, 0xa6, 0x7b, 0xe6, 0x6e, 0xa3, 0x10, 0xb5, 0xe3,
-	0x6e, 0xdd, 0x53, 0x8e, 0x6b, 0x15, 0x8a, 0x99, 0x52, 0xa1, 0x7a, 0x7c, 0x23, 0xbd, 0xa6, 0x17,
-	0xe8, 0xc4, 0xd1, 0x7d, 0xcb, 0xe0, 0x6c, 0x6d, 0x69, 0xee, 0x31, 0x8c, 0xd1, 0x8d, 0x4b, 0x81,
-	0x6b, 0x4d, 0x72, 0x78, 0xc2, 0xce, 0x54, 0xc5, 0xc8, 0x8d, 0xde, 0xcd, 0xdc, 0x6a, 0x6c, 0x59,
-	0xaa, 0x1c, 0xac, 0x2c, 0x1e, 0xa9, 0xd4, 0x96, 0xe7, 0xaa, 0x87, 0x0f, 0x2c, 0x56, 0xb0, 0xc1,
-	0x34, 0x8c, 0x89, 0xda, 0x74, 0x6d, 0xba, 0x36, 0x83, 0xcc, 0x7a, 0xcf, 0x22, 0xbb, 0xde, 0x7b,
-	0x31, 0x36, 0xea, 0x99, 0xda, 0x34, 0xc6, 0xa7, 0x8e, 0x6d, 0x32, 0xf2, 0x0b, 0xc7, 0x5f, 0x13,
-	0x6b, 0xbf, 0xb8, 0xb0, 0xaf, 0x32, 0xbf, 0xb4, 0x6f, 0x7e, 0x0e, 0x1b, 0xcc, 0x09, 0x23, 0xab,
-	0x3d, 0x64, 0x52, 0x95, 0x42, 0x96, 0xd6, 0x31, 0x46, 0x35, 0xc6, 0x69, 0x0b, 0x1b, 0x69, 0x07,
-	0x13, 0xb4, 0x8b, 0x1c, 0xf5, 0x90, 0xa7, 0x01, 0x0a, 0x34, 0x84, 0x41, 0x13, 0x4c, 0xd2, 0x01,
-	0x36, 0xd1, 0x21, 0xfe, 0x97, 0x5a, 0x57, 0xd8, 0x4c, 0x35, 0xb6, 0x50, 0x1b, 0xa0, 0x6d, 0xfc,
-	0x9f, 0x3a, 0x30, 0x69, 0x17, 0x5b, 0xa9, 0x87, 0x6d, 0xd4, 0xc7, 0x76, 0x1a, 0x60, 0x07, 0x0d,
-	0x71, 0x52, 0x6a, 0x43, 0xc1, 0xa2, 0x1a, 0x3b, 0x69, 0x1b, 0xbb, 0xa8, 0x8f, 0x93, 0x69, 0x80,
-	0xdd, 0x34, 0xc4, 0x29, 0x34, 0xc6, 0x1e, 0x9a, 0xe0, 0x54, 0x3a, 0x40, 0x31, 0xb5, 0xa9, 0x70,
-	0x1a, 0xd5, 0x98, 0xa2, 0x09, 0x4e, 0xa7, 0x43, 0x9c, 0xc1, 0xf7, 0xd1, 0x38, 0x93, 0xba, 0x38,
-	0x8b, 0xfa, 0x38, 0x9b, 0x86, 0x28, 0xd1, 0x08, 0xe7, 0xd0, 0x18, 0xe7, 0xa6, 0xb6, 0x14, 0xce,
-	0xa3, 0x2d, 0x9c, 0x4f, 0x1d, 0x5c, 0x40, 0x57, 0x50, 0xa6, 0x3e, 0x2e, 0xa4, 0x01, 0xa6, 0xe9,
-	0x00, 0x33, 0xa9, 0xb6, 0xc2, 0x2c, 0x6d, 0x62, 0x2f, 0x75, 0x71, 0x11, 0xf5, 0x70, 0x31, 0x8d,
-	0x71, 0x09, 0x4d, 0x70, 0x69, 0x6a, 0x5b, 0xe1, 0x32, 0xaa, 0x71, 0x39, 0x75, 0x70, 0x05, 0xf5,
-	0x71, 0x25, 0x0d, 0x70, 0x15, 0x8d, 0x70, 0x35, 0x8d, 0x71, 0x0d, 0x1d, 0xe0, 0x5a, 0x3a, 0xc4,
-	0x75, 0xa9, 0x8e, 0xc2, 0x3e, 0xda, 0xc4, 0xf5, 0x54, 0xe3, 0x06, 0x6a, 0xe3, 0x46, 0xea, 0x60,
-	0x8e, 0x76, 0xb0, 0x9f, 0xfa, 0x98, 0xa7, 0x21, 0x6e, 0xa2, 0x11, 0x0e, 0xd0, 0x18, 0x37, 0xa7,
-	0xae, 0x28, 0x1c, 0xa4, 0x09, 0x16, 0x52, 0x3b, 0x0a, 0x87, 0xa8, 0x8d, 0x0a, 0x75, 0xb0, 0x48,
-	0x57, 0x70, 0x0b, 0xed, 0xe0, 0x56, 0xea, 0xa2, 0x4a, 0xbb, 0x38, 0x4c, 0x3d, 0xdc, 0x46, 0x7d,
-	0x2c, 0xd1, 0x00, 0xcb, 0x34, 0xc4, 0x11, 0x1a, 0xe3, 0x76, 0x9a, 0xe0, 0x0e, 0xda, 0xc7, 0x9d,
-	0x74, 0x80, 0xbb, 0x52, 0x5d, 0x85, 0xbb, 0x69, 0x1d, 0xf7, 0x50, 0x1b, 0xf7, 0x52, 0x07, 0x35,
-	0xea, 0xe1, 0x3e, 0xea, 0x43, 0xd1, 0x08, 0x75, 0x1a, 0xa3, 0x41, 0x13, 0x34, 0x53, 0xbb, 0x36,
-	0x34, 0x6d, 0xa3, 0x45, 0x1d, 0xd8, 0xb4, 0x83, 0x36, 0x75, 0xe1, 0x50, 0x0f, 0x2b, 0x34, 0x40,
-	0x87, 0x86, 0x70, 0x69, 0x84, 0x2e, 0x1d, 0xc0, 0x4b, 0xf5, 0x14, 0x7c, 0x5a, 0x47, 0x8f, 0x36,
-	0xb1, 0x4a, 0x35, 0x02, 0x6a, 0x23, 0xa4, 0x2e, 0x22, 0xea, 0x21, 0xa6, 0x3e, 0x12, 0x1a, 0xa0,
-	0x4f, 0x13, 0x1c, 0xa5, 0x03, 0x0c, 0x52, 0xfd, 0x06, 0x86, 0x74, 0x05, 0xf7, 0xd3, 0x2e, 0x1e,
-	0xa0, 0x01, 0x1e, 0xa4, 0x21, 0x1e, 0x4a, 0xed, 0x29, 0x3c, 0x6c, 0xe6, 0x8c, 0x6c, 0xcf, 0xc1,
-	0x23, 0x19, 0x86, 0x8b, 0x47, 0x25, 0x42, 0x3c, 0x26, 0x11, 0xe1, 0x71, 0xc6, 0x6a, 0x8c, 0x27,
-	0x18, 0x41, 0x17, 0x4f, 0x4a, 0x78, 0x78, 0x4a, 0xc2, 0xc7, 0xd3, 0x12, 0x31, 0x9e, 0x91, 0xe8,
-	0xe3, 0x59, 0x46, 0xa8, 0xf0, 0x9c, 0x44, 0x03, 0xcf, 0x4b, 0x34, 0xf1, 0x82, 0x84, 0xc6, 0x8b,
-	0x12, 0x36, 0x5e, 0x92, 0x70, 0xf0, 0xb2, 0x44, 0x07, 0xaf, 0x48, 0xb8, 0x78, 0x55, 0xa2, 0x8b,
-	0xd7, 0x24, 0x3c, 0xbc, 0x2e, 0xe1, 0xe3, 0x0d, 0x89, 0x55, 0xbc, 0x29, 0x11, 0xe0, 0x2d, 0x89,
-	0x10, 0x6f, 0x4b, 0x44, 0x78, 0x47, 0x22, 0xc6, 0x31, 0x89, 0x04, 0xef, 0x4a, 0xf4, 0xf1, 0x1e,
-	0x23, 0x52, 0x78, 0x5f, 0x42, 0xe3, 0x03, 0x09, 0x1b, 0x1f, 0x4a, 0xb4, 0xf1, 0x91, 0x84, 0x83,
-	0x8f, 0x25, 0x3a, 0xf8, 0x44, 0xc2, 0xc5, 0xa7, 0x12, 0x1e, 0x3e, 0x93, 0xf0, 0xf1, 0xb9, 0x44,
-	0x80, 0x2f, 0x24, 0x42, 0x7c, 0x29, 0x11, 0xe1, 0x2b, 0x89, 0x3e, 0xbe, 0x96, 0x18, 0xe0, 0x1b,
-	0x46, 0x6c, 0xe3, 0x5b, 0x89, 0x0e, 0xbe, 0x93, 0x08, 0xf0, 0xbd, 0xc4, 0x10, 0x3f, 0x30, 0x12,
-	0x8d, 0x1f, 0x25, 0x1c, 0xfc, 0x24, 0xe1, 0xe3, 0x67, 0x46, 0x5f, 0xe1, 0x17, 0x09, 0x1f, 0xbf,
-	0x32, 0x8e, 0xb6, 0xf1, 0x1b, 0x63, 0xe0, 0xe0, 0x77, 0x09, 0x1f, 0x7f, 0x30, 0x86, 0x0a, 0x7f,
-	0x4a, 0xb4, 0xf1, 0x97, 0x44, 0x8c, 0xbf, 0x33, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x66,
-	0xd9, 0x2b, 0xec, 0x07, 0x00, 0x00,
+var fileDescriptor_metadata_e82f9da818ea7d21 = []byte{
+	// 975 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0xd0, 0x67, 0x7b, 0xdb, 0x54,
+	0x18, 0xc6, 0xf1, 0xda, 0x49, 0x63, 0x5b, 0x29, 0xe9, 0x8d, 0x5a, 0x8a, 0x68, 0x4b, 0x31, 0x61,
+	0x99, 0x15, 0xd2, 0x94, 0x42, 0xd9, 0x14, 0x48, 0x43, 0x69, 0xea, 0x80, 0x4b, 0x52, 0xb6, 0x39,
+	0xb6, 0x8f, 0x65, 0xc5, 0xb2, 0xe4, 0x68, 0xb9, 0x36, 0x7b, 0xef, 0x3d, 0xcb, 0xde, 0x7b, 0xef,
+	0x6f, 0xc3, 0x57, 0xe1, 0xd2, 0xfd, 0x38, 0x69, 0x5e, 0xf0, 0xea, 0xf7, 0x3f, 0xe7, 0x79, 0x64,
+	0xeb, 0x92, 0x31, 0xd1, 0xd1, 0x91, 0x6a, 0xa8, 0x48, 0x4d, 0x75, 0x03, 0x3f, 0xf2, 0xcd, 0x82,
+	0xab, 0x6d, 0x55, 0xef, 0x57, 0xbb, 0xb5, 0xed, 0x85, 0xa6, 0xd6, 0x72, 0x3b, 0xf9, 0xef, 0x66,
+	0x23, 0x7f, 0x78, 0xb8, 0x68, 0xee, 0x35, 0x72, 0x89, 0x0e, 0x42, 0xc7, 0xf7, 0xac, 0x4c, 0x31,
+	0x5b, 0x9a, 0x98, 0xd9, 0x31, 0xb5, 0xf6, 0xd0, 0xd4, 0xea, 0xd6, 0xd4, 0x92, 0xac, 0x54, 0x56,
+	0x77, 0xcd, 0x7d, 0x46, 0xde, 0x55, 0x9e, 0x1d, 0x2b, 0x5b, 0x5b, 0x59, 0x3e, 0xb7, 0xf3, 0xff,
+	0x9e, 0x9b, 0x1f, 0xee, 0x54, 0xd6, 0xb6, 0xcd, 0xad, 0xc6, 0xc6, 0xc8, 0x89, 0x5c, 0x6d, 0x8d,
+	0x14, 0xb3, 0xa5, 0x42, 0x45, 0x0e, 0x66, 0xd1, 0x18, 0x6f, 0xe8, 0xb0, 0x1e, 0x38, 0xdd, 0x28,
+	0x7d, 0x95, 0x51, 0xce, 0xd6, 0x5f, 0x99, 0xdb, 0x8c, 0x31, 0x15, 0x47, 0x2d, 0x3f, 0xb0, 0x36,
+	0x72, 0x38, 0x3c, 0x99, 0x96, 0x91, 0x73, 0x9d, 0xba, 0xf6, 0x42, 0x6d, 0x8d, 0x71, 0xb0, 0x7a,
+	0x34, 0x4d, 0x63, 0xd4, 0x0b, 0x9b, 0x3d, 0x2b, 0x57, 0xcc, 0x96, 0xf2, 0x15, 0xb6, 0x59, 0x34,
+	0x46, 0x9a, 0x5a, 0x5b, 0xf9, 0x62, 0xa6, 0x34, 0x3e, 0x33, 0xb1, 0xee, 0x95, 0x0f, 0x68, 0x5d,
+	0x49, 0x47, 0xe6, 0x4e, 0xa3, 0x10, 0xb5, 0xe2, 0x4e, 0xcd, 0x53, 0x8e, 0x6b, 0x15, 0x8a, 0x99,
+	0x52, 0xa1, 0x72, 0xe2, 0x22, 0xfd, 0xb7, 0x6e, 0xa0, 0x13, 0x47, 0xf7, 0x2c, 0x83, 0xb3, 0xd5,
+	0xa3, 0xb9, 0xcb, 0x30, 0x86, 0x7f, 0xbc, 0x18, 0xb8, 0xd6, 0x38, 0x87, 0xeb, 0x6e, 0x26, 0xcb,
+	0x46, 0x6e, 0xf8, 0x15, 0xcd, 0x2d, 0xc6, 0xe6, 0xc5, 0xf2, 0xa1, 0xf2, 0xc2, 0xd1, 0x72, 0x75,
+	0x69, 0xb6, 0x72, 0xe4, 0xe0, 0x42, 0x19, 0x1b, 0x4c, 0xc3, 0x18, 0xab, 0x4e, 0x57, 0xa7, 0xab,
+	0xbb, 0x91, 0x59, 0xeb, 0x19, 0x64, 0xd7, 0x7a, 0x0f, 0x46, 0x86, 0xbd, 0xbb, 0x3a, 0x8d, 0xd1,
+	0xc9, 0xe3, 0x9b, 0x8c, 0xfc, 0xfc, 0x89, 0x8f, 0x8a, 0xd5, 0x5f, 0x9c, 0xdf, 0x5f, 0x9e, 0x5b,
+	0xdc, 0x3f, 0x37, 0x8b, 0x0d, 0xe6, 0x98, 0x91, 0xd5, 0x1e, 0x32, 0xa9, 0x4a, 0x21, 0x4b, 0x6b,
+	0x18, 0xa1, 0x1a, 0xa3, 0xb4, 0x89, 0x8d, 0xb4, 0x8d, 0x31, 0xda, 0x41, 0x8e, 0x7a, 0xc8, 0xd3,
+	0x00, 0x05, 0x1a, 0xc2, 0xa0, 0x09, 0xc6, 0x69, 0x1f, 0x9b, 0xe8, 0x00, 0x27, 0xa5, 0xd6, 0x14,
+	0x26, 0xa8, 0xc6, 0x66, 0x6a, 0x03, 0xb4, 0x85, 0x93, 0xa9, 0x03, 0x93, 0x76, 0xb0, 0x85, 0x7a,
+	0xd8, 0x4a, 0x7d, 0x9c, 0x42, 0x03, 0x6c, 0xa3, 0x21, 0x4e, 0x4d, 0xad, 0x2b, 0x58, 0x54, 0xe3,
+	0x34, 0xda, 0xc2, 0x76, 0xea, 0x63, 0x07, 0x0d, 0xb0, 0x93, 0x86, 0x38, 0x9d, 0xc6, 0xd8, 0x45,
+	0x13, 0x9c, 0x41, 0xfb, 0x28, 0xa6, 0x36, 0x14, 0xce, 0xa4, 0x1a, 0x93, 0x34, 0xc1, 0x59, 0x74,
+	0x80, 0xb3, 0xf9, 0x7d, 0x34, 0xce, 0xa1, 0x2e, 0xce, 0xa5, 0x3e, 0xce, 0xa3, 0x21, 0x4a, 0x34,
+	0xc2, 0xf9, 0x34, 0xc6, 0x05, 0xa9, 0x4d, 0x85, 0x0b, 0x69, 0x13, 0x17, 0x51, 0x07, 0x17, 0xd3,
+	0x65, 0x4c, 0x51, 0x1f, 0x97, 0xd0, 0x00, 0xd3, 0xb4, 0x8f, 0xdd, 0xa9, 0xb6, 0xc2, 0x0c, 0x6d,
+	0x60, 0x0f, 0x75, 0x71, 0x29, 0xf5, 0xb0, 0x97, 0xc6, 0xb8, 0x8c, 0x26, 0xb8, 0x3c, 0xb5, 0xa5,
+	0xb0, 0x8f, 0x6a, 0x5c, 0x41, 0x1d, 0x5c, 0x49, 0x7d, 0x5c, 0x45, 0x03, 0x5c, 0x4d, 0x23, 0x5c,
+	0x43, 0x63, 0x5c, 0x4b, 0xfb, 0xb8, 0x8e, 0x0e, 0x70, 0x7d, 0xaa, 0xa3, 0xb0, 0x9f, 0x36, 0x70,
+	0x03, 0xd5, 0xb8, 0x91, 0xda, 0xb8, 0x89, 0x3a, 0x98, 0xa5, 0x6d, 0x1c, 0xa0, 0x3e, 0xe6, 0x68,
+	0x88, 0x9b, 0x69, 0x84, 0x83, 0x34, 0xc6, 0x2d, 0xa9, 0xcb, 0x0a, 0x87, 0x68, 0x82, 0xf9, 0xd4,
+	0xb6, 0xc2, 0x61, 0x6a, 0xa3, 0x4c, 0x1d, 0x2c, 0xd0, 0x65, 0xdc, 0x4a, 0xdb, 0xb8, 0x8d, 0xba,
+	0xa8, 0xd0, 0x0e, 0x8e, 0x50, 0x0f, 0xb7, 0x53, 0x1f, 0x8b, 0x34, 0xc0, 0x12, 0x0d, 0x71, 0x94,
+	0xc6, 0xb8, 0x83, 0x26, 0xb8, 0x93, 0xf6, 0x70, 0x17, 0xed, 0xe3, 0xee, 0x54, 0x57, 0xe1, 0x1e,
+	0x5a, 0xc3, 0xbd, 0xd4, 0xc6, 0x7d, 0xd4, 0x41, 0x95, 0x7a, 0xb8, 0x9f, 0xfa, 0x50, 0x34, 0x42,
+	0x8d, 0xc6, 0xa8, 0xd3, 0x04, 0x8d, 0xd4, 0x8e, 0x0d, 0x4d, 0x5b, 0x68, 0x52, 0x07, 0x36, 0x6d,
+	0xa3, 0x45, 0x5d, 0x38, 0xd4, 0xc3, 0x32, 0x0d, 0xd0, 0xa6, 0x21, 0x5c, 0x1a, 0xa1, 0x43, 0xfb,
+	0xf0, 0x52, 0x3d, 0x05, 0x9f, 0xd6, 0xd0, 0xa5, 0x0d, 0xac, 0x50, 0x8d, 0x80, 0xda, 0x08, 0xa9,
+	0x8b, 0x88, 0x7a, 0x88, 0xa9, 0x8f, 0x84, 0x06, 0xe8, 0xd1, 0x04, 0xc7, 0x68, 0x1f, 0xfd, 0x54,
+	0xbf, 0x8e, 0x01, 0x5d, 0xc6, 0x03, 0xb4, 0x83, 0x07, 0x69, 0x80, 0x87, 0x68, 0x88, 0x87, 0x53,
+	0xbb, 0x0a, 0x8f, 0x98, 0x39, 0x23, 0xdb, 0x75, 0xf0, 0x68, 0x86, 0xe1, 0xe2, 0x31, 0x89, 0x10,
+	0x8f, 0x4b, 0x44, 0x78, 0x82, 0xb1, 0x12, 0xe3, 0x49, 0x46, 0xd0, 0xc1, 0x53, 0x12, 0x1e, 0x9e,
+	0x96, 0xf0, 0xf1, 0x8c, 0x44, 0x8c, 0x67, 0x25, 0x7a, 0x78, 0x8e, 0x11, 0x2a, 0x3c, 0x2f, 0x51,
+	0xc7, 0x0b, 0x12, 0x0d, 0xbc, 0x28, 0xa1, 0xf1, 0x92, 0x84, 0x8d, 0x97, 0x25, 0x1c, 0xbc, 0x22,
+	0xd1, 0xc6, 0xab, 0x12, 0x2e, 0x5e, 0x93, 0xe8, 0xe0, 0x75, 0x09, 0x0f, 0x6f, 0x48, 0xf8, 0x78,
+	0x53, 0x62, 0x05, 0x6f, 0x49, 0x04, 0x78, 0x5b, 0x22, 0xc4, 0x3b, 0x12, 0x11, 0xde, 0x95, 0x88,
+	0x71, 0x5c, 0x22, 0xc1, 0x7b, 0x12, 0x3d, 0xbc, 0xcf, 0x88, 0x14, 0x3e, 0x90, 0xd0, 0xf8, 0x50,
+	0xc2, 0xc6, 0x47, 0x12, 0x2d, 0x7c, 0x2c, 0xe1, 0xe0, 0x13, 0x89, 0x36, 0x3e, 0x95, 0x70, 0xf1,
+	0x99, 0x84, 0x87, 0xcf, 0x25, 0x7c, 0x7c, 0x21, 0x11, 0xe0, 0x4b, 0x89, 0x10, 0x5f, 0x49, 0x44,
+	0xf8, 0x5a, 0xa2, 0x87, 0x6f, 0x24, 0xfa, 0xf8, 0x96, 0x11, 0xdb, 0xf8, 0x4e, 0xa2, 0x8d, 0xef,
+	0x25, 0x02, 0xfc, 0x20, 0x31, 0xc0, 0x8f, 0x8c, 0x44, 0xe3, 0x27, 0x09, 0x07, 0x3f, 0x4b, 0xf8,
+	0xf8, 0x85, 0xd1, 0x53, 0xf8, 0x55, 0xc2, 0xc7, 0x6f, 0x8c, 0x63, 0x2d, 0xfc, 0xce, 0xe8, 0x3b,
+	0xf8, 0x43, 0xc2, 0xc7, 0x9f, 0x8c, 0x81, 0xc2, 0x5f, 0x12, 0x2d, 0xfc, 0x2d, 0x11, 0xe3, 0x9f,
+	0xcc, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x15, 0x76, 0x2c, 0x08, 0x08, 0x00, 0x00,
 }
diff --git a/v1/go/signature.pb.go b/v1/go/signature.pb.go
index 450c08f..faf4a61 100644
--- a/v1/go/signature.pb.go
+++ b/v1/go/signature.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: signature.proto
 
-package pb
+package legacy_pb
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 type Signature_Version int32
 
 const (
@@ -44,20 +50,43 @@ func (x *Signature_Version) UnmarshalJSON(data []byte) error {
 	*x = Signature_Version(value)
 	return nil
 }
-func (Signature_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{0, 0} }
-
-type Signature struct {
-	Version          *Signature_Version `protobuf:"varint,1,req,name=version,enum=pb.Signature_Version" json:"version,omitempty"`
-	SignatureType    *KeyType           `protobuf:"varint,2,req,name=signatureType,enum=pb.KeyType" json:"signatureType,omitempty"`
-	Signature        []byte             `protobuf:"bytes,3,req,name=signature" json:"signature,omitempty"`
-	CertificateId    []byte             `protobuf:"bytes,4,req,name=certificateId" json:"certificateId,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
+func (Signature_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_signature_db49c854424da426, []int{0, 0}
 }
 
-func (m *Signature) Reset()                    { *m = Signature{} }
-func (m *Signature) String() string            { return proto.CompactTextString(m) }
-func (*Signature) ProtoMessage()               {}
-func (*Signature) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+type Signature struct {
+	Version              *Signature_Version `protobuf:"varint,1,req,name=version,enum=legacy_pb.Signature_Version" json:"version,omitempty"`
+	SignatureType        *KeyType           `protobuf:"varint,2,req,name=signatureType,enum=legacy_pb.KeyType" json:"signatureType,omitempty"`
+	Signature            []byte             `protobuf:"bytes,3,req,name=signature" json:"signature,omitempty"`
+	CertificateId        []byte             `protobuf:"bytes,4,req,name=certificateId" json:"certificateId,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Signature) Reset()         { *m = Signature{} }
+func (m *Signature) String() string { return proto.CompactTextString(m) }
+func (*Signature) ProtoMessage()    {}
+func (*Signature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_signature_db49c854424da426, []int{0}
+}
+func (m *Signature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Signature.Unmarshal(m, b)
+}
+func (m *Signature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Signature.Marshal(b, m, deterministic)
+}
+func (dst *Signature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Signature.Merge(dst, src)
+}
+func (m *Signature) XXX_Size() int {
+	return xxx_messageInfo_Signature.Size(m)
+}
+func (m *Signature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Signature.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Signature proto.InternalMessageInfo
 
 func (m *Signature) GetVersion() Signature_Version {
 	if m != nil && m.Version != nil {
@@ -88,24 +117,25 @@ func (m *Signature) GetCertificateId() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Signature)(nil), "pb.Signature")
-	proto.RegisterEnum("pb.Signature_Version", Signature_Version_name, Signature_Version_value)
+	proto.RegisterType((*Signature)(nil), "legacy_pb.Signature")
+	proto.RegisterEnum("legacy_pb.Signature_Version", Signature_Version_name, Signature_Version_value)
 }
 
-func init() { proto.RegisterFile("signature.proto", fileDescriptor4) }
+func init() { proto.RegisterFile("signature.proto", fileDescriptor_signature_db49c854424da426) }
 
-var fileDescriptor4 = []byte{
-	// 192 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_signature_db49c854424da426 = []byte{
+	// 200 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2f, 0xce, 0x4c, 0xcf,
-	0x4b, 0x2c, 0x29, 0x2d, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x92,
-	0x12, 0x4c, 0x4e, 0x2d, 0x2a, 0xc9, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0x81, 0x0a, 0x2b, 0xdd, 0x67,
-	0xe4, 0xe2, 0x0c, 0x86, 0x29, 0x15, 0xd2, 0xe7, 0x62, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf,
-	0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x12, 0xd5, 0x2b, 0x48, 0xd2, 0x83, 0xcb, 0xeb, 0x85,
-	0x41, 0x24, 0x83, 0x60, 0xaa, 0x84, 0x0c, 0xb9, 0x78, 0xe1, 0x16, 0x85, 0x54, 0x16, 0xa4, 0x4a,
-	0x30, 0x81, 0xb5, 0x71, 0x83, 0xb4, 0x79, 0xa7, 0x56, 0x82, 0x84, 0x82, 0x50, 0x55, 0x08, 0xc9,
-	0x70, 0x71, 0xc2, 0x05, 0x24, 0x98, 0x15, 0x98, 0x34, 0x78, 0x82, 0x10, 0x02, 0x42, 0x2a, 0x5c,
-	0xbc, 0x48, 0x8e, 0xf4, 0x4c, 0x91, 0x60, 0x01, 0xab, 0x40, 0x15, 0x54, 0xd2, 0xe2, 0x62, 0x87,
-	0x3a, 0x45, 0x48, 0x98, 0x8b, 0x3f, 0xd4, 0xcf, 0xdb, 0xcf, 0x3f, 0xdc, 0x2f, 0x3e, 0xcc, 0x35,
-	0x28, 0xd8, 0xd3, 0xdf, 0x4f, 0x80, 0x41, 0x88, 0x8b, 0x8b, 0x2d, 0xde, 0x20, 0xde, 0x20, 0xde,
-	0x50, 0x80, 0x11, 0x10, 0x00, 0x00, 0xff, 0xff, 0x50, 0x35, 0x0d, 0x49, 0x0a, 0x01, 0x00, 0x00,
+	0x4b, 0x2c, 0x29, 0x2d, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc, 0x49, 0x4d,
+	0x4f, 0x4c, 0xae, 0x8c, 0x2f, 0x48, 0x92, 0x12, 0x4c, 0x4e, 0x2d, 0x2a, 0xc9, 0x4c, 0xcb, 0x4c,
+	0x4e, 0x2c, 0x81, 0xca, 0x2a, 0xbd, 0x65, 0xe4, 0xe2, 0x0c, 0x86, 0xe9, 0x10, 0x32, 0xe3, 0x62,
+	0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x92, 0xd1,
+	0x83, 0xeb, 0xd6, 0x83, 0x2b, 0xd3, 0x0b, 0x83, 0xa8, 0x09, 0x82, 0x29, 0x16, 0xb2, 0xe0, 0xe2,
+	0x85, 0x5b, 0x1b, 0x52, 0x59, 0x90, 0x2a, 0xc1, 0x04, 0xd6, 0x2d, 0x84, 0xa4, 0xdb, 0x3b, 0xb5,
+	0x12, 0x24, 0x13, 0x84, 0xaa, 0x50, 0x48, 0x86, 0x8b, 0x13, 0x2e, 0x20, 0xc1, 0xac, 0xc0, 0xa4,
+	0xc1, 0x13, 0x84, 0x10, 0x10, 0x52, 0xe1, 0xe2, 0x45, 0x72, 0xb2, 0x67, 0x8a, 0x04, 0x0b, 0x58,
+	0x05, 0xaa, 0xa0, 0x92, 0x16, 0x17, 0x3b, 0xd4, 0x45, 0x42, 0xc2, 0x5c, 0xfc, 0xa1, 0x7e, 0xde,
+	0x7e, 0xfe, 0xe1, 0x7e, 0xf1, 0x61, 0xae, 0x41, 0xc1, 0x9e, 0xfe, 0x7e, 0x02, 0x0c, 0x42, 0x5c,
+	0x5c, 0x6c, 0xf1, 0x06, 0xf1, 0x06, 0xf1, 0x86, 0x02, 0x8c, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x48, 0xf0, 0x60, 0xdb, 0x1f, 0x01, 0x00, 0x00,
 }
diff --git a/v1/go/source.pb.go b/v1/go/source.pb.go
index 5631462..3701869 100644
--- a/v1/go/source.pb.go
+++ b/v1/go/source.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: source.proto
 
-package pb
+package legacy_pb
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 type Source_Version int32
 
 const (
@@ -44,7 +50,9 @@ func (x *Source_Version) UnmarshalJSON(data []byte) error {
 	*x = Source_Version(value)
 	return nil
 }
-func (Source_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 0} }
+func (Source_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_source_ce8ba9f1af24d4de, []int{0, 0}
+}
 
 type Source_SourceTypes int32
 
@@ -78,20 +86,43 @@ func (x *Source_SourceTypes) UnmarshalJSON(data []byte) error {
 	*x = Source_SourceTypes(value)
 	return nil
 }
-func (Source_SourceTypes) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 1} }
-
-type Source struct {
-	Version          *Source_Version     `protobuf:"varint,1,req,name=version,enum=pb.Source_Version" json:"version,omitempty"`
-	SourceType       *Source_SourceTypes `protobuf:"varint,2,req,name=sourceType,enum=pb.Source_SourceTypes" json:"sourceType,omitempty"`
-	Source           []byte              `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
-	ContentType      *string             `protobuf:"bytes,4,req,name=contentType" json:"contentType,omitempty"`
-	XXX_unrecognized []byte              `json:"-"`
+func (Source_SourceTypes) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_source_ce8ba9f1af24d4de, []int{0, 1}
 }
 
-func (m *Source) Reset()                    { *m = Source{} }
-func (m *Source) String() string            { return proto.CompactTextString(m) }
-func (*Source) ProtoMessage()               {}
-func (*Source) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+type Source struct {
+	Version              *Source_Version     `protobuf:"varint,1,req,name=version,enum=legacy_pb.Source_Version" json:"version,omitempty"`
+	SourceType           *Source_SourceTypes `protobuf:"varint,2,req,name=sourceType,enum=legacy_pb.Source_SourceTypes" json:"sourceType,omitempty"`
+	Source               []byte              `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
+	ContentType          *string             `protobuf:"bytes,4,req,name=contentType" json:"contentType,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *Source) Reset()         { *m = Source{} }
+func (m *Source) String() string { return proto.CompactTextString(m) }
+func (*Source) ProtoMessage()    {}
+func (*Source) Descriptor() ([]byte, []int) {
+	return fileDescriptor_source_ce8ba9f1af24d4de, []int{0}
+}
+func (m *Source) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Source.Unmarshal(m, b)
+}
+func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
+}
+func (dst *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(dst, src)
+}
+func (m *Source) XXX_Size() int {
+	return xxx_messageInfo_Source.Size(m)
+}
+func (m *Source) XXX_DiscardUnknown() {
+	xxx_messageInfo_Source.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Source proto.InternalMessageInfo
 
 func (m *Source) GetVersion() Source_Version {
 	if m != nil && m.Version != nil {
@@ -122,27 +153,28 @@ func (m *Source) GetContentType() string {
 }
 
 func init() {
-	proto.RegisterType((*Source)(nil), "pb.Source")
-	proto.RegisterEnum("pb.Source_Version", Source_Version_name, Source_Version_value)
-	proto.RegisterEnum("pb.Source_SourceTypes", Source_SourceTypes_name, Source_SourceTypes_value)
+	proto.RegisterType((*Source)(nil), "legacy_pb.Source")
+	proto.RegisterEnum("legacy_pb.Source_Version", Source_Version_name, Source_Version_value)
+	proto.RegisterEnum("legacy_pb.Source_SourceTypes", Source_SourceTypes_name, Source_SourceTypes_value)
 }
 
-func init() { proto.RegisterFile("source.proto", fileDescriptor5) }
+func init() { proto.RegisterFile("source.proto", fileDescriptor_source_ce8ba9f1af24d4de) }
 
-var fileDescriptor5 = []byte{
-	// 224 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_source_ce8ba9f1af24d4de = []byte{
+	// 232 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0xce, 0x2f, 0x2d,
-	0x4a, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xea, 0x63, 0xe2,
-	0x62, 0x0b, 0x06, 0x0b, 0x0a, 0xe9, 0x70, 0xb1, 0x97, 0xa5, 0x16, 0x15, 0x67, 0xe6, 0xe7, 0x49,
-	0x30, 0x2a, 0x30, 0x69, 0xf0, 0x19, 0x09, 0xe9, 0x15, 0x24, 0xe9, 0x41, 0x24, 0xf5, 0xc2, 0x20,
-	0x32, 0x41, 0x30, 0x25, 0x42, 0x66, 0x5c, 0x5c, 0x10, 0xc3, 0x42, 0x2a, 0x0b, 0x52, 0x25, 0x98,
-	0xc0, 0x1a, 0xc4, 0x90, 0x34, 0x04, 0xc3, 0x25, 0x8b, 0x83, 0x90, 0x54, 0x0a, 0x89, 0x71, 0xb1,
-	0x41, 0x78, 0x12, 0xcc, 0x0a, 0x4c, 0x1a, 0x3c, 0x41, 0x50, 0x9e, 0x90, 0x02, 0x17, 0x77, 0x72,
-	0x7e, 0x5e, 0x49, 0x6a, 0x5e, 0x09, 0xd8, 0x40, 0x16, 0x05, 0x26, 0x0d, 0xce, 0x20, 0x64, 0x21,
-	0x25, 0x2d, 0x2e, 0x76, 0xa8, 0x2b, 0x84, 0x84, 0xb9, 0xf8, 0x43, 0xfd, 0xbc, 0xfd, 0xfc, 0xc3,
-	0xfd, 0xe2, 0xc3, 0x5c, 0x83, 0x82, 0x3d, 0xfd, 0xfd, 0x04, 0x18, 0x84, 0xb8, 0xb8, 0xd8, 0xe2,
-	0x0d, 0xe2, 0x0d, 0xe2, 0x0d, 0x05, 0x18, 0x95, 0x2c, 0xb8, 0xb8, 0x91, 0x1c, 0x20, 0x24, 0xce,
-	0x25, 0x0c, 0x53, 0x1f, 0xec, 0x1f, 0x1a, 0xe4, 0xec, 0x1a, 0x1f, 0x12, 0x19, 0xe0, 0x2a, 0xc0,
-	0x20, 0x24, 0xc0, 0xc5, 0x93, 0x93, 0x54, 0x54, 0x19, 0x5f, 0x9c, 0x12, 0x9f, 0x91, 0x58, 0x9c,
-	0x21, 0xc0, 0x08, 0x08, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x07, 0x54, 0x9d, 0x23, 0x01, 0x00, 0x00,
+	0x4a, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc, 0x49, 0x4d, 0x4f, 0x4c, 0xae,
+	0x8c, 0x2f, 0x48, 0x52, 0x9a, 0xc3, 0xc4, 0xc5, 0x16, 0x0c, 0x96, 0x13, 0x32, 0xe6, 0x62, 0x2f,
+	0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x92, 0xd4, 0x83,
+	0xab, 0xd3, 0x83, 0xa8, 0xd1, 0x0b, 0x83, 0x28, 0x08, 0x82, 0xa9, 0x14, 0xb2, 0xe5, 0xe2, 0x82,
+	0x18, 0x1d, 0x52, 0x59, 0x90, 0x2a, 0xc1, 0x04, 0xd6, 0x27, 0x8b, 0xa9, 0x2f, 0x18, 0xae, 0xa6,
+	0x38, 0x08, 0x49, 0x83, 0x90, 0x18, 0x17, 0x1b, 0x84, 0x27, 0xc1, 0xac, 0xc0, 0xa4, 0xc1, 0x13,
+	0x04, 0xe5, 0x09, 0x29, 0x70, 0x71, 0x27, 0xe7, 0xe7, 0x95, 0xa4, 0xe6, 0x95, 0x80, 0xcd, 0x65,
+	0x51, 0x60, 0xd2, 0xe0, 0x0c, 0x42, 0x16, 0x52, 0xd2, 0xe2, 0x62, 0x87, 0x3a, 0x46, 0x48, 0x98,
+	0x8b, 0x3f, 0xd4, 0xcf, 0xdb, 0xcf, 0x3f, 0xdc, 0x2f, 0x3e, 0xcc, 0x35, 0x28, 0xd8, 0xd3, 0xdf,
+	0x4f, 0x80, 0x41, 0x88, 0x8b, 0x8b, 0x2d, 0xde, 0x20, 0xde, 0x20, 0xde, 0x50, 0x80, 0x51, 0xc9,
+	0x82, 0x8b, 0x1b, 0xc9, 0x01, 0x42, 0xe2, 0x5c, 0xc2, 0x30, 0xf5, 0xc1, 0xfe, 0xa1, 0x41, 0xce,
+	0xae, 0xf1, 0x21, 0x91, 0x01, 0xae, 0x02, 0x0c, 0x42, 0x02, 0x5c, 0x3c, 0x39, 0x49, 0x45, 0x95,
+	0xf1, 0xc5, 0x29, 0xf1, 0x19, 0x89, 0xc5, 0x19, 0x02, 0x8c, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xf2, 0x96, 0xa2, 0x14, 0x38, 0x01, 0x00, 0x00,
 }
diff --git a/v1/go/stream.pb.go b/v1/go/stream.pb.go
index 40732fa..8fe6c82 100644
--- a/v1/go/stream.pb.go
+++ b/v1/go/stream.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: stream.proto
 
-package pb
+package legacy_pb
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -12,6 +12,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 type Stream_Version int32
 
 const (
@@ -44,19 +50,42 @@ func (x *Stream_Version) UnmarshalJSON(data []byte) error {
 	*x = Stream_Version(value)
 	return nil
 }
-func (Stream_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor6, []int{0, 0} }
-
-type Stream struct {
-	Version          *Stream_Version `protobuf:"varint,1,req,name=version,enum=pb.Stream_Version" json:"version,omitempty"`
-	Metadata         *Metadata       `protobuf:"bytes,2,req,name=metadata" json:"metadata,omitempty"`
-	Source           *Source         `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
+func (Stream_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_stream_f91d9f76e019d7b0, []int{0, 0}
 }
 
-func (m *Stream) Reset()                    { *m = Stream{} }
-func (m *Stream) String() string            { return proto.CompactTextString(m) }
-func (*Stream) ProtoMessage()               {}
-func (*Stream) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+type Stream struct {
+	Version              *Stream_Version `protobuf:"varint,1,req,name=version,enum=legacy_pb.Stream_Version" json:"version,omitempty"`
+	Metadata             *Metadata       `protobuf:"bytes,2,req,name=metadata" json:"metadata,omitempty"`
+	Source               *Source         `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Stream) Reset()         { *m = Stream{} }
+func (m *Stream) String() string { return proto.CompactTextString(m) }
+func (*Stream) ProtoMessage()    {}
+func (*Stream) Descriptor() ([]byte, []int) {
+	return fileDescriptor_stream_f91d9f76e019d7b0, []int{0}
+}
+func (m *Stream) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Stream.Unmarshal(m, b)
+}
+func (m *Stream) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Stream.Marshal(b, m, deterministic)
+}
+func (dst *Stream) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Stream.Merge(dst, src)
+}
+func (m *Stream) XXX_Size() int {
+	return xxx_messageInfo_Stream.Size(m)
+}
+func (m *Stream) XXX_DiscardUnknown() {
+	xxx_messageInfo_Stream.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Stream proto.InternalMessageInfo
 
 func (m *Stream) GetVersion() Stream_Version {
 	if m != nil && m.Version != nil {
@@ -80,24 +109,24 @@ func (m *Stream) GetSource() *Source {
 }
 
 func init() {
-	proto.RegisterType((*Stream)(nil), "pb.Stream")
-	proto.RegisterEnum("pb.Stream_Version", Stream_Version_name, Stream_Version_value)
+	proto.RegisterType((*Stream)(nil), "legacy_pb.Stream")
+	proto.RegisterEnum("legacy_pb.Stream_Version", Stream_Version_name, Stream_Version_value)
 }
 
-func init() { proto.RegisterFile("stream.proto", fileDescriptor6) }
+func init() { proto.RegisterFile("stream.proto", fileDescriptor_stream_f91d9f76e019d7b0) }
 
-var fileDescriptor6 = []byte{
-	// 183 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_stream_f91d9f76e019d7b0 = []byte{
+	// 191 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x2e, 0x29, 0x4a,
-	0x4d, 0xcc, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x92, 0xe2, 0xcb, 0x4d,
-	0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0x84, 0x88, 0x49, 0xf1, 0x14, 0xe7, 0x97, 0x16, 0x25, 0xa7,
-	0x42, 0x78, 0x4a, 0x1b, 0x18, 0xb9, 0xd8, 0x82, 0xc1, 0x5a, 0x84, 0x74, 0xb8, 0xd8, 0xcb, 0x52,
-	0x8b, 0x8a, 0x33, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x98, 0x34, 0xf8, 0x8c, 0x84, 0xf4, 0x0a, 0x92,
-	0xf4, 0x20, 0x92, 0x7a, 0x61, 0x10, 0x99, 0x20, 0x98, 0x12, 0x21, 0x0d, 0x2e, 0x0e, 0x98, 0xc1,
-	0x12, 0x4c, 0x0a, 0x4c, 0x1a, 0xdc, 0x46, 0x3c, 0x20, 0xe5, 0xbe, 0x50, 0xb1, 0x20, 0xb8, 0xac,
-	0x90, 0x12, 0x17, 0x1b, 0xc4, 0x4a, 0x09, 0x66, 0xb0, 0x3a, 0x2e, 0xb0, 0xb1, 0x60, 0x91, 0x20,
-	0xa8, 0x8c, 0x92, 0x16, 0x17, 0x3b, 0xd4, 0x06, 0x21, 0x61, 0x2e, 0xfe, 0x50, 0x3f, 0x6f, 0x3f,
-	0xff, 0x70, 0xbf, 0xf8, 0x30, 0xd7, 0xa0, 0x60, 0x4f, 0x7f, 0x3f, 0x01, 0x06, 0x21, 0x2e, 0x2e,
-	0xb6, 0x78, 0x83, 0x78, 0x83, 0x78, 0x43, 0x01, 0x46, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd8,
-	0x68, 0x9c, 0xe3, 0xe3, 0x00, 0x00, 0x00,
+	0x4d, 0xcc, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc, 0x49, 0x4d, 0x4f, 0x4c, 0xae,
+	0x8c, 0x2f, 0x48, 0x92, 0xe2, 0xcb, 0x4d, 0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0x84, 0x48, 0x49,
+	0xf1, 0x14, 0xe7, 0x97, 0x16, 0x25, 0xa7, 0x42, 0x78, 0x4a, 0x47, 0x19, 0xb9, 0xd8, 0x82, 0xc1,
+	0x3a, 0x85, 0x8c, 0xb9, 0xd8, 0xcb, 0x52, 0x8b, 0x8a, 0x33, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x98,
+	0x34, 0xf8, 0x8c, 0x24, 0xf5, 0xe0, 0xa6, 0xe8, 0x41, 0xd4, 0xe8, 0x85, 0x41, 0x14, 0x04, 0xc1,
+	0x54, 0x0a, 0xe9, 0x73, 0x71, 0xc0, 0xcc, 0x97, 0x60, 0x52, 0x60, 0xd2, 0xe0, 0x36, 0x12, 0x46,
+	0xd2, 0xe5, 0x0b, 0x95, 0x0a, 0x82, 0x2b, 0x12, 0xd2, 0xe4, 0x62, 0x83, 0x38, 0x40, 0x82, 0x19,
+	0xac, 0x5c, 0x10, 0xd9, 0x12, 0xb0, 0x44, 0x10, 0x54, 0x81, 0x92, 0x16, 0x17, 0x3b, 0xd4, 0x3e,
+	0x21, 0x61, 0x2e, 0xfe, 0x50, 0x3f, 0x6f, 0x3f, 0xff, 0x70, 0xbf, 0xf8, 0x30, 0xd7, 0xa0, 0x60,
+	0x4f, 0x7f, 0x3f, 0x01, 0x06, 0x21, 0x2e, 0x2e, 0xb6, 0x78, 0x83, 0x78, 0x83, 0x78, 0x43, 0x01,
+	0x46, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xe9, 0x51, 0x8e, 0xff, 0x00, 0x00, 0x00,
 }
diff --git a/v1/js/certificate_pb.js b/v1/js/certificate_pb.js
index 323dd6e..6a6db40 100644
--- a/v1/js/certificate_pb.js
+++ b/v1/js/certificate_pb.js
@@ -11,9 +11,9 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.pb.Certificate', null, global);
-goog.exportSymbol('proto.pb.Certificate.Version', null, global);
-goog.exportSymbol('proto.pb.KeyType', null, global);
+goog.exportSymbol('proto.legacy_pb.Certificate', null, global);
+goog.exportSymbol('proto.legacy_pb.Certificate.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.KeyType', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -25,12 +25,12 @@ goog.exportSymbol('proto.pb.KeyType', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Certificate = function(opt_data) {
+proto.legacy_pb.Certificate = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Certificate, jspb.Message);
+goog.inherits(proto.legacy_pb.Certificate, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Certificate.displayName = 'proto.pb.Certificate';
+  proto.legacy_pb.Certificate.displayName = 'proto.legacy_pb.Certificate';
 }
 
 
@@ -45,8 +45,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Certificate.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Certificate.toObject(opt_includeInstance, this);
+proto.legacy_pb.Certificate.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Certificate.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,11 +55,11 @@ proto.pb.Certificate.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Certificate} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Certificate} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Certificate.toObject = function(includeInstance, msg) {
+proto.legacy_pb.Certificate.toObject = function(includeInstance, msg) {
   var f, obj = {
     version: jspb.Message.getField(msg, 1),
     keytype: jspb.Message.getField(msg, 2),
@@ -77,23 +77,23 @@ proto.pb.Certificate.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Certificate}
+ * @return {!proto.legacy_pb.Certificate}
  */
-proto.pb.Certificate.deserializeBinary = function(bytes) {
+proto.legacy_pb.Certificate.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Certificate;
-  return proto.pb.Certificate.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Certificate;
+  return proto.legacy_pb.Certificate.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Certificate} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Certificate} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Certificate}
+ * @return {!proto.legacy_pb.Certificate}
  */
-proto.pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -101,11 +101,11 @@ proto.pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Certificate.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Certificate.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.KeyType} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.KeyType} */ (reader.readEnum());
       msg.setKeytype(value);
       break;
     case 4:
@@ -125,9 +125,9 @@ proto.pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Certificate.prototype.serializeBinary = function() {
+proto.legacy_pb.Certificate.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Certificate.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Certificate.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -135,20 +135,20 @@ proto.pb.Certificate.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Certificate} message
+ * @param {!proto.legacy_pb.Certificate} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Certificate.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Certificate.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Certificate.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Certificate.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.KeyType} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -168,27 +168,27 @@ proto.pb.Certificate.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Certificate.Version = {
+proto.legacy_pb.Certificate.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Certificate.Version}
+ * @return {!proto.legacy_pb.Certificate.Version}
  */
-proto.pb.Certificate.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Certificate.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Certificate.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Certificate.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Certificate.Version} value */
-proto.pb.Certificate.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Certificate.Version} value */
+proto.legacy_pb.Certificate.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Certificate.prototype.clearVersion = function() {
+proto.legacy_pb.Certificate.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
@@ -197,27 +197,27 @@ proto.pb.Certificate.prototype.clearVersion = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Certificate.prototype.hasVersion = function() {
+proto.legacy_pb.Certificate.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required KeyType keyType = 2;
- * @return {!proto.pb.KeyType}
+ * @return {!proto.legacy_pb.KeyType}
  */
-proto.pb.Certificate.prototype.getKeytype = function() {
-  return /** @type {!proto.pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Certificate.prototype.getKeytype = function() {
+  return /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.KeyType} value */
-proto.pb.Certificate.prototype.setKeytype = function(value) {
+/** @param {!proto.legacy_pb.KeyType} value */
+proto.legacy_pb.Certificate.prototype.setKeytype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Certificate.prototype.clearKeytype = function() {
+proto.legacy_pb.Certificate.prototype.clearKeytype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
@@ -226,7 +226,7 @@ proto.pb.Certificate.prototype.clearKeytype = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Certificate.prototype.hasKeytype = function() {
+proto.legacy_pb.Certificate.prototype.hasKeytype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -235,7 +235,7 @@ proto.pb.Certificate.prototype.hasKeytype = function() {
  * required bytes publicKey = 4;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Certificate.prototype.getPublickey = function() {
+proto.legacy_pb.Certificate.prototype.getPublickey = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
@@ -245,7 +245,7 @@ proto.pb.Certificate.prototype.getPublickey = function() {
  * This is a type-conversion wrapper around `getPublickey()`
  * @return {string}
  */
-proto.pb.Certificate.prototype.getPublickey_asB64 = function() {
+proto.legacy_pb.Certificate.prototype.getPublickey_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getPublickey()));
 };
@@ -258,19 +258,19 @@ proto.pb.Certificate.prototype.getPublickey_asB64 = function() {
  * This is a type-conversion wrapper around `getPublickey()`
  * @return {!Uint8Array}
  */
-proto.pb.Certificate.prototype.getPublickey_asU8 = function() {
+proto.legacy_pb.Certificate.prototype.getPublickey_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getPublickey()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Certificate.prototype.setPublickey = function(value) {
+proto.legacy_pb.Certificate.prototype.setPublickey = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Certificate.prototype.clearPublickey = function() {
+proto.legacy_pb.Certificate.prototype.clearPublickey = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
@@ -279,7 +279,7 @@ proto.pb.Certificate.prototype.clearPublickey = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Certificate.prototype.hasPublickey = function() {
+proto.legacy_pb.Certificate.prototype.hasPublickey = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
@@ -287,11 +287,11 @@ proto.pb.Certificate.prototype.hasPublickey = function() {
 /**
  * @enum {number}
  */
-proto.pb.KeyType = {
+proto.legacy_pb.KeyType = {
   UNKNOWN_PUBLIC_KEY_TYPE: 0,
   NIST256P: 1,
   NIST384P: 2,
   SECP256K1: 3
 };
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);
diff --git a/v1/js/fee_pb.js b/v1/js/fee_pb.js
index 2772220..ca691e1 100644
--- a/v1/js/fee_pb.js
+++ b/v1/js/fee_pb.js
@@ -11,9 +11,9 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.pb.Fee', null, global);
-goog.exportSymbol('proto.pb.Fee.Currency', null, global);
-goog.exportSymbol('proto.pb.Fee.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.Fee', null, global);
+goog.exportSymbol('proto.legacy_pb.Fee.Currency', null, global);
+goog.exportSymbol('proto.legacy_pb.Fee.Version', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -25,12 +25,12 @@ goog.exportSymbol('proto.pb.Fee.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Fee = function(opt_data) {
+proto.legacy_pb.Fee = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Fee, jspb.Message);
+goog.inherits(proto.legacy_pb.Fee, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Fee.displayName = 'proto.pb.Fee';
+  proto.legacy_pb.Fee.displayName = 'proto.legacy_pb.Fee';
 }
 
 
@@ -45,8 +45,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Fee.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Fee.toObject(opt_includeInstance, this);
+proto.legacy_pb.Fee.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Fee.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,11 +55,11 @@ proto.pb.Fee.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Fee} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Fee} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Fee.toObject = function(includeInstance, msg) {
+proto.legacy_pb.Fee.toObject = function(includeInstance, msg) {
   var f, obj = {
     version: jspb.Message.getField(msg, 1),
     currency: jspb.Message.getField(msg, 2),
@@ -78,23 +78,23 @@ proto.pb.Fee.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Fee}
+ * @return {!proto.legacy_pb.Fee}
  */
-proto.pb.Fee.deserializeBinary = function(bytes) {
+proto.legacy_pb.Fee.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Fee;
-  return proto.pb.Fee.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Fee;
+  return proto.legacy_pb.Fee.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Fee} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Fee} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Fee}
+ * @return {!proto.legacy_pb.Fee}
  */
-proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,11 +102,11 @@ proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Fee.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Fee.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Fee.Currency} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Fee.Currency} */ (reader.readEnum());
       msg.setCurrency(value);
       break;
     case 3:
@@ -130,9 +130,9 @@ proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Fee.prototype.serializeBinary = function() {
+proto.legacy_pb.Fee.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Fee.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Fee.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -140,20 +140,20 @@ proto.pb.Fee.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Fee} message
+ * @param {!proto.legacy_pb.Fee} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Fee.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Fee.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Fee.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Fee.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Fee.Currency} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Fee.Currency} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -180,7 +180,7 @@ proto.pb.Fee.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Fee.Version = {
+proto.legacy_pb.Fee.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
@@ -188,7 +188,7 @@ proto.pb.Fee.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Fee.Currency = {
+proto.legacy_pb.Fee.Currency = {
   UNKNOWN_CURRENCY: 0,
   LBC: 1,
   BTC: 2,
@@ -197,20 +197,20 @@ proto.pb.Fee.Currency = {
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Fee.Version}
+ * @return {!proto.legacy_pb.Fee.Version}
  */
-proto.pb.Fee.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Fee.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Fee.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Fee.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Fee.Version} value */
-proto.pb.Fee.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Fee.Version} value */
+proto.legacy_pb.Fee.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Fee.prototype.clearVersion = function() {
+proto.legacy_pb.Fee.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
@@ -219,27 +219,27 @@ proto.pb.Fee.prototype.clearVersion = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Fee.prototype.hasVersion = function() {
+proto.legacy_pb.Fee.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required Currency currency = 2;
- * @return {!proto.pb.Fee.Currency}
+ * @return {!proto.legacy_pb.Fee.Currency}
  */
-proto.pb.Fee.prototype.getCurrency = function() {
-  return /** @type {!proto.pb.Fee.Currency} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Fee.prototype.getCurrency = function() {
+  return /** @type {!proto.legacy_pb.Fee.Currency} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Fee.Currency} value */
-proto.pb.Fee.prototype.setCurrency = function(value) {
+/** @param {!proto.legacy_pb.Fee.Currency} value */
+proto.legacy_pb.Fee.prototype.setCurrency = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Fee.prototype.clearCurrency = function() {
+proto.legacy_pb.Fee.prototype.clearCurrency = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
@@ -248,7 +248,7 @@ proto.pb.Fee.prototype.clearCurrency = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Fee.prototype.hasCurrency = function() {
+proto.legacy_pb.Fee.prototype.hasCurrency = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -257,7 +257,7 @@ proto.pb.Fee.prototype.hasCurrency = function() {
  * required bytes address = 3;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Fee.prototype.getAddress = function() {
+proto.legacy_pb.Fee.prototype.getAddress = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
@@ -267,7 +267,7 @@ proto.pb.Fee.prototype.getAddress = function() {
  * This is a type-conversion wrapper around `getAddress()`
  * @return {string}
  */
-proto.pb.Fee.prototype.getAddress_asB64 = function() {
+proto.legacy_pb.Fee.prototype.getAddress_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getAddress()));
 };
@@ -280,19 +280,19 @@ proto.pb.Fee.prototype.getAddress_asB64 = function() {
  * This is a type-conversion wrapper around `getAddress()`
  * @return {!Uint8Array}
  */
-proto.pb.Fee.prototype.getAddress_asU8 = function() {
+proto.legacy_pb.Fee.prototype.getAddress_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getAddress()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Fee.prototype.setAddress = function(value) {
+proto.legacy_pb.Fee.prototype.setAddress = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Fee.prototype.clearAddress = function() {
+proto.legacy_pb.Fee.prototype.clearAddress = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
@@ -301,7 +301,7 @@ proto.pb.Fee.prototype.clearAddress = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Fee.prototype.hasAddress = function() {
+proto.legacy_pb.Fee.prototype.hasAddress = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -310,18 +310,18 @@ proto.pb.Fee.prototype.hasAddress = function() {
  * required float amount = 4;
  * @return {number}
  */
-proto.pb.Fee.prototype.getAmount = function() {
+proto.legacy_pb.Fee.prototype.getAmount = function() {
   return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 4, 0.0));
 };
 
 
 /** @param {number} value */
-proto.pb.Fee.prototype.setAmount = function(value) {
+proto.legacy_pb.Fee.prototype.setAmount = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Fee.prototype.clearAmount = function() {
+proto.legacy_pb.Fee.prototype.clearAmount = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
@@ -330,9 +330,9 @@ proto.pb.Fee.prototype.clearAmount = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Fee.prototype.hasAmount = function() {
+proto.legacy_pb.Fee.prototype.hasAmount = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);
diff --git a/v1/js/claim_pb.js b/v1/js/legacy_claim_pb.js
similarity index 62%
rename from v1/js/claim_pb.js
rename to v1/js/legacy_claim_pb.js
index 50c2133..faf8213 100644
--- a/v1/js/claim_pb.js
+++ b/v1/js/legacy_claim_pb.js
@@ -14,9 +14,9 @@ var global = Function('return this')();
 var stream_pb = require('./stream_pb.js');
 var certificate_pb = require('./certificate_pb.js');
 var signature_pb = require('./signature_pb.js');
-goog.exportSymbol('proto.pb.Claim', null, global);
-goog.exportSymbol('proto.pb.Claim.ClaimType', null, global);
-goog.exportSymbol('proto.pb.Claim.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.Claim', null, global);
+goog.exportSymbol('proto.legacy_pb.Claim.ClaimType', null, global);
+goog.exportSymbol('proto.legacy_pb.Claim.Version', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -28,12 +28,12 @@ goog.exportSymbol('proto.pb.Claim.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Claim = function(opt_data) {
+proto.legacy_pb.Claim = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Claim, jspb.Message);
+goog.inherits(proto.legacy_pb.Claim, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Claim.displayName = 'proto.pb.Claim';
+  proto.legacy_pb.Claim.displayName = 'proto.legacy_pb.Claim';
 }
 
 
@@ -48,8 +48,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Claim.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Claim.toObject(opt_includeInstance, this);
+proto.legacy_pb.Claim.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Claim.toObject(opt_includeInstance, this);
 };
 
 
@@ -58,11 +58,11 @@ proto.pb.Claim.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Claim} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Claim} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Claim.toObject = function(includeInstance, msg) {
+proto.legacy_pb.Claim.toObject = function(includeInstance, msg) {
   var f, obj = {
     version: jspb.Message.getField(msg, 1),
     claimtype: jspb.Message.getField(msg, 2),
@@ -82,23 +82,23 @@ proto.pb.Claim.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Claim}
+ * @return {!proto.legacy_pb.Claim}
  */
-proto.pb.Claim.deserializeBinary = function(bytes) {
+proto.legacy_pb.Claim.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Claim;
-  return proto.pb.Claim.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Claim;
+  return proto.legacy_pb.Claim.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Claim} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Claim} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Claim}
+ * @return {!proto.legacy_pb.Claim}
  */
-proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -106,11 +106,11 @@ proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Claim.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Claim.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Claim.ClaimType} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Claim.ClaimType} */ (reader.readEnum());
       msg.setClaimtype(value);
       break;
     case 3:
@@ -141,9 +141,9 @@ proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Claim.prototype.serializeBinary = function() {
+proto.legacy_pb.Claim.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Claim.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Claim.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -151,20 +151,20 @@ proto.pb.Claim.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Claim} message
+ * @param {!proto.legacy_pb.Claim} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Claim.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Claim.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Claim.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Claim.ClaimType} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Claim.ClaimType} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -201,7 +201,7 @@ proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Claim.Version = {
+proto.legacy_pb.Claim.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
@@ -209,7 +209,7 @@ proto.pb.Claim.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Claim.ClaimType = {
+proto.legacy_pb.Claim.ClaimType = {
   UNKNOWN_CLAIM_TYPE: 0,
   STREAMTYPE: 1,
   CERTIFICATETYPE: 2
@@ -217,20 +217,20 @@ proto.pb.Claim.ClaimType = {
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Claim.Version}
+ * @return {!proto.legacy_pb.Claim.Version}
  */
-proto.pb.Claim.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Claim.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Claim.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Claim.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Claim.Version} value */
-proto.pb.Claim.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Claim.Version} value */
+proto.legacy_pb.Claim.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Claim.prototype.clearVersion = function() {
+proto.legacy_pb.Claim.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
@@ -239,27 +239,27 @@ proto.pb.Claim.prototype.clearVersion = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Claim.prototype.hasVersion = function() {
+proto.legacy_pb.Claim.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required ClaimType claimType = 2;
- * @return {!proto.pb.Claim.ClaimType}
+ * @return {!proto.legacy_pb.Claim.ClaimType}
  */
-proto.pb.Claim.prototype.getClaimtype = function() {
-  return /** @type {!proto.pb.Claim.ClaimType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Claim.prototype.getClaimtype = function() {
+  return /** @type {!proto.legacy_pb.Claim.ClaimType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Claim.ClaimType} value */
-proto.pb.Claim.prototype.setClaimtype = function(value) {
+/** @param {!proto.legacy_pb.Claim.ClaimType} value */
+proto.legacy_pb.Claim.prototype.setClaimtype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Claim.prototype.clearClaimtype = function() {
+proto.legacy_pb.Claim.prototype.clearClaimtype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
@@ -268,28 +268,28 @@ proto.pb.Claim.prototype.clearClaimtype = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Claim.prototype.hasClaimtype = function() {
+proto.legacy_pb.Claim.prototype.hasClaimtype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
  * optional Stream stream = 3;
- * @return {?proto.pb.Stream}
+ * @return {?proto.legacy_pb.Stream}
  */
-proto.pb.Claim.prototype.getStream = function() {
-  return /** @type{?proto.pb.Stream} */ (
+proto.legacy_pb.Claim.prototype.getStream = function() {
+  return /** @type{?proto.legacy_pb.Stream} */ (
     jspb.Message.getWrapperField(this, stream_pb.Stream, 3));
 };
 
 
-/** @param {?proto.pb.Stream|undefined} value */
-proto.pb.Claim.prototype.setStream = function(value) {
+/** @param {?proto.legacy_pb.Stream|undefined} value */
+proto.legacy_pb.Claim.prototype.setStream = function(value) {
   jspb.Message.setWrapperField(this, 3, value);
 };
 
 
-proto.pb.Claim.prototype.clearStream = function() {
+proto.legacy_pb.Claim.prototype.clearStream = function() {
   this.setStream(undefined);
 };
 
@@ -298,28 +298,28 @@ proto.pb.Claim.prototype.clearStream = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Claim.prototype.hasStream = function() {
+proto.legacy_pb.Claim.prototype.hasStream = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
 /**
  * optional Certificate certificate = 4;
- * @return {?proto.pb.Certificate}
+ * @return {?proto.legacy_pb.Certificate}
  */
-proto.pb.Claim.prototype.getCertificate = function() {
-  return /** @type{?proto.pb.Certificate} */ (
+proto.legacy_pb.Claim.prototype.getCertificate = function() {
+  return /** @type{?proto.legacy_pb.Certificate} */ (
     jspb.Message.getWrapperField(this, certificate_pb.Certificate, 4));
 };
 
 
-/** @param {?proto.pb.Certificate|undefined} value */
-proto.pb.Claim.prototype.setCertificate = function(value) {
+/** @param {?proto.legacy_pb.Certificate|undefined} value */
+proto.legacy_pb.Claim.prototype.setCertificate = function(value) {
   jspb.Message.setWrapperField(this, 4, value);
 };
 
 
-proto.pb.Claim.prototype.clearCertificate = function() {
+proto.legacy_pb.Claim.prototype.clearCertificate = function() {
   this.setCertificate(undefined);
 };
 
@@ -328,28 +328,28 @@ proto.pb.Claim.prototype.clearCertificate = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Claim.prototype.hasCertificate = function() {
+proto.legacy_pb.Claim.prototype.hasCertificate = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
 /**
  * optional Signature publisherSignature = 5;
- * @return {?proto.pb.Signature}
+ * @return {?proto.legacy_pb.Signature}
  */
-proto.pb.Claim.prototype.getPublishersignature = function() {
-  return /** @type{?proto.pb.Signature} */ (
+proto.legacy_pb.Claim.prototype.getPublishersignature = function() {
+  return /** @type{?proto.legacy_pb.Signature} */ (
     jspb.Message.getWrapperField(this, signature_pb.Signature, 5));
 };
 
 
-/** @param {?proto.pb.Signature|undefined} value */
-proto.pb.Claim.prototype.setPublishersignature = function(value) {
+/** @param {?proto.legacy_pb.Signature|undefined} value */
+proto.legacy_pb.Claim.prototype.setPublishersignature = function(value) {
   jspb.Message.setWrapperField(this, 5, value);
 };
 
 
-proto.pb.Claim.prototype.clearPublishersignature = function() {
+proto.legacy_pb.Claim.prototype.clearPublishersignature = function() {
   this.setPublishersignature(undefined);
 };
 
@@ -358,9 +358,9 @@ proto.pb.Claim.prototype.clearPublishersignature = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Claim.prototype.hasPublishersignature = function() {
+proto.legacy_pb.Claim.prototype.hasPublishersignature = function() {
   return jspb.Message.getField(this, 5) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);
diff --git a/v1/js/metadata_pb.js b/v1/js/metadata_pb.js
index 7bb120a..48aa15a 100644
--- a/v1/js/metadata_pb.js
+++ b/v1/js/metadata_pb.js
@@ -12,9 +12,9 @@ var goog = jspb;
 var global = Function('return this')();
 
 var fee_pb = require('./fee_pb.js');
-goog.exportSymbol('proto.pb.Metadata', null, global);
-goog.exportSymbol('proto.pb.Metadata.Language', null, global);
-goog.exportSymbol('proto.pb.Metadata.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.Metadata', null, global);
+goog.exportSymbol('proto.legacy_pb.Metadata.Language', null, global);
+goog.exportSymbol('proto.legacy_pb.Metadata.Version', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -26,12 +26,12 @@ goog.exportSymbol('proto.pb.Metadata.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Metadata = function(opt_data) {
+proto.legacy_pb.Metadata = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Metadata, jspb.Message);
+goog.inherits(proto.legacy_pb.Metadata, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Metadata.displayName = 'proto.pb.Metadata';
+  proto.legacy_pb.Metadata.displayName = 'proto.legacy_pb.Metadata';
 }
 
 
@@ -46,8 +46,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Metadata.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Metadata.toObject(opt_includeInstance, this);
+proto.legacy_pb.Metadata.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Metadata.toObject(opt_includeInstance, this);
 };
 
 
@@ -56,11 +56,11 @@ proto.pb.Metadata.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Metadata} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Metadata} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Metadata.toObject = function(includeInstance, msg) {
+proto.legacy_pb.Metadata.toObject = function(includeInstance, msg) {
   var f, obj = {
     version: jspb.Message.getField(msg, 1),
     language: jspb.Message.getField(msg, 2),
@@ -86,23 +86,23 @@ proto.pb.Metadata.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Metadata}
+ * @return {!proto.legacy_pb.Metadata}
  */
-proto.pb.Metadata.deserializeBinary = function(bytes) {
+proto.legacy_pb.Metadata.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Metadata;
-  return proto.pb.Metadata.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Metadata;
+  return proto.legacy_pb.Metadata.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Metadata} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Metadata} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Metadata}
+ * @return {!proto.legacy_pb.Metadata}
  */
-proto.pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -110,11 +110,11 @@ proto.pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Metadata.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Metadata.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Metadata.Language} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Metadata.Language} */ (reader.readEnum());
       msg.setLanguage(value);
       break;
     case 3:
@@ -167,9 +167,9 @@ proto.pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Metadata.prototype.serializeBinary = function() {
+proto.legacy_pb.Metadata.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Metadata.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Metadata.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -177,20 +177,20 @@ proto.pb.Metadata.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Metadata} message
+ * @param {!proto.legacy_pb.Metadata} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Metadata.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Metadata.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Metadata.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Metadata.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Metadata.Language} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Metadata.Language} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -267,7 +267,7 @@ proto.pb.Metadata.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Metadata.Version = {
+proto.legacy_pb.Metadata.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1,
   _0_0_2: 2,
@@ -278,7 +278,7 @@ proto.pb.Metadata.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Metadata.Language = {
+proto.legacy_pb.Metadata.Language = {
   UNKNOWN_LANGUAGE: 0,
   EN: 1,
   AA: 2,
@@ -468,20 +468,20 @@ proto.pb.Metadata.Language = {
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Metadata.Version}
+ * @return {!proto.legacy_pb.Metadata.Version}
  */
-proto.pb.Metadata.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Metadata.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Metadata.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Metadata.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Metadata.Version} value */
-proto.pb.Metadata.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Metadata.Version} value */
+proto.legacy_pb.Metadata.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Metadata.prototype.clearVersion = function() {
+proto.legacy_pb.Metadata.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
@@ -490,27 +490,27 @@ proto.pb.Metadata.prototype.clearVersion = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasVersion = function() {
+proto.legacy_pb.Metadata.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required Language language = 2;
- * @return {!proto.pb.Metadata.Language}
+ * @return {!proto.legacy_pb.Metadata.Language}
  */
-proto.pb.Metadata.prototype.getLanguage = function() {
-  return /** @type {!proto.pb.Metadata.Language} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Metadata.prototype.getLanguage = function() {
+  return /** @type {!proto.legacy_pb.Metadata.Language} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Metadata.Language} value */
-proto.pb.Metadata.prototype.setLanguage = function(value) {
+/** @param {!proto.legacy_pb.Metadata.Language} value */
+proto.legacy_pb.Metadata.prototype.setLanguage = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Metadata.prototype.clearLanguage = function() {
+proto.legacy_pb.Metadata.prototype.clearLanguage = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
@@ -519,7 +519,7 @@ proto.pb.Metadata.prototype.clearLanguage = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasLanguage = function() {
+proto.legacy_pb.Metadata.prototype.hasLanguage = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -528,18 +528,18 @@ proto.pb.Metadata.prototype.hasLanguage = function() {
  * required string title = 3;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getTitle = function() {
+proto.legacy_pb.Metadata.prototype.getTitle = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setTitle = function(value) {
+proto.legacy_pb.Metadata.prototype.setTitle = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Metadata.prototype.clearTitle = function() {
+proto.legacy_pb.Metadata.prototype.clearTitle = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
@@ -548,7 +548,7 @@ proto.pb.Metadata.prototype.clearTitle = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasTitle = function() {
+proto.legacy_pb.Metadata.prototype.hasTitle = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -557,18 +557,18 @@ proto.pb.Metadata.prototype.hasTitle = function() {
  * required string description = 4;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getDescription = function() {
+proto.legacy_pb.Metadata.prototype.getDescription = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setDescription = function(value) {
+proto.legacy_pb.Metadata.prototype.setDescription = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Metadata.prototype.clearDescription = function() {
+proto.legacy_pb.Metadata.prototype.clearDescription = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
@@ -577,7 +577,7 @@ proto.pb.Metadata.prototype.clearDescription = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasDescription = function() {
+proto.legacy_pb.Metadata.prototype.hasDescription = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
@@ -586,18 +586,18 @@ proto.pb.Metadata.prototype.hasDescription = function() {
  * required string author = 5;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getAuthor = function() {
+proto.legacy_pb.Metadata.prototype.getAuthor = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setAuthor = function(value) {
+proto.legacy_pb.Metadata.prototype.setAuthor = function(value) {
   jspb.Message.setField(this, 5, value);
 };
 
 
-proto.pb.Metadata.prototype.clearAuthor = function() {
+proto.legacy_pb.Metadata.prototype.clearAuthor = function() {
   jspb.Message.setField(this, 5, undefined);
 };
 
@@ -606,7 +606,7 @@ proto.pb.Metadata.prototype.clearAuthor = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasAuthor = function() {
+proto.legacy_pb.Metadata.prototype.hasAuthor = function() {
   return jspb.Message.getField(this, 5) != null;
 };
 
@@ -615,18 +615,18 @@ proto.pb.Metadata.prototype.hasAuthor = function() {
  * required string license = 6;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getLicense = function() {
+proto.legacy_pb.Metadata.prototype.getLicense = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setLicense = function(value) {
+proto.legacy_pb.Metadata.prototype.setLicense = function(value) {
   jspb.Message.setField(this, 6, value);
 };
 
 
-proto.pb.Metadata.prototype.clearLicense = function() {
+proto.legacy_pb.Metadata.prototype.clearLicense = function() {
   jspb.Message.setField(this, 6, undefined);
 };
 
@@ -635,7 +635,7 @@ proto.pb.Metadata.prototype.clearLicense = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasLicense = function() {
+proto.legacy_pb.Metadata.prototype.hasLicense = function() {
   return jspb.Message.getField(this, 6) != null;
 };
 
@@ -646,18 +646,18 @@ proto.pb.Metadata.prototype.hasLicense = function() {
  * You should avoid comparisons like {@code val === true/false} in those cases.
  * @return {boolean}
  */
-proto.pb.Metadata.prototype.getNsfw = function() {
+proto.legacy_pb.Metadata.prototype.getNsfw = function() {
   return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 7, false));
 };
 
 
 /** @param {boolean} value */
-proto.pb.Metadata.prototype.setNsfw = function(value) {
+proto.legacy_pb.Metadata.prototype.setNsfw = function(value) {
   jspb.Message.setField(this, 7, value);
 };
 
 
-proto.pb.Metadata.prototype.clearNsfw = function() {
+proto.legacy_pb.Metadata.prototype.clearNsfw = function() {
   jspb.Message.setField(this, 7, undefined);
 };
 
@@ -666,28 +666,28 @@ proto.pb.Metadata.prototype.clearNsfw = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasNsfw = function() {
+proto.legacy_pb.Metadata.prototype.hasNsfw = function() {
   return jspb.Message.getField(this, 7) != null;
 };
 
 
 /**
  * optional Fee fee = 8;
- * @return {?proto.pb.Fee}
+ * @return {?proto.legacy_pb.Fee}
  */
-proto.pb.Metadata.prototype.getFee = function() {
-  return /** @type{?proto.pb.Fee} */ (
+proto.legacy_pb.Metadata.prototype.getFee = function() {
+  return /** @type{?proto.legacy_pb.Fee} */ (
     jspb.Message.getWrapperField(this, fee_pb.Fee, 8));
 };
 
 
-/** @param {?proto.pb.Fee|undefined} value */
-proto.pb.Metadata.prototype.setFee = function(value) {
+/** @param {?proto.legacy_pb.Fee|undefined} value */
+proto.legacy_pb.Metadata.prototype.setFee = function(value) {
   jspb.Message.setWrapperField(this, 8, value);
 };
 
 
-proto.pb.Metadata.prototype.clearFee = function() {
+proto.legacy_pb.Metadata.prototype.clearFee = function() {
   this.setFee(undefined);
 };
 
@@ -696,7 +696,7 @@ proto.pb.Metadata.prototype.clearFee = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasFee = function() {
+proto.legacy_pb.Metadata.prototype.hasFee = function() {
   return jspb.Message.getField(this, 8) != null;
 };
 
@@ -705,18 +705,18 @@ proto.pb.Metadata.prototype.hasFee = function() {
  * optional string thumbnail = 9;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getThumbnail = function() {
+proto.legacy_pb.Metadata.prototype.getThumbnail = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setThumbnail = function(value) {
+proto.legacy_pb.Metadata.prototype.setThumbnail = function(value) {
   jspb.Message.setField(this, 9, value);
 };
 
 
-proto.pb.Metadata.prototype.clearThumbnail = function() {
+proto.legacy_pb.Metadata.prototype.clearThumbnail = function() {
   jspb.Message.setField(this, 9, undefined);
 };
 
@@ -725,7 +725,7 @@ proto.pb.Metadata.prototype.clearThumbnail = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasThumbnail = function() {
+proto.legacy_pb.Metadata.prototype.hasThumbnail = function() {
   return jspb.Message.getField(this, 9) != null;
 };
 
@@ -734,18 +734,18 @@ proto.pb.Metadata.prototype.hasThumbnail = function() {
  * optional string preview = 10;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getPreview = function() {
+proto.legacy_pb.Metadata.prototype.getPreview = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setPreview = function(value) {
+proto.legacy_pb.Metadata.prototype.setPreview = function(value) {
   jspb.Message.setField(this, 10, value);
 };
 
 
-proto.pb.Metadata.prototype.clearPreview = function() {
+proto.legacy_pb.Metadata.prototype.clearPreview = function() {
   jspb.Message.setField(this, 10, undefined);
 };
 
@@ -754,7 +754,7 @@ proto.pb.Metadata.prototype.clearPreview = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasPreview = function() {
+proto.legacy_pb.Metadata.prototype.hasPreview = function() {
   return jspb.Message.getField(this, 10) != null;
 };
 
@@ -763,18 +763,18 @@ proto.pb.Metadata.prototype.hasPreview = function() {
  * optional string licenseUrl = 11;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getLicenseurl = function() {
+proto.legacy_pb.Metadata.prototype.getLicenseurl = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setLicenseurl = function(value) {
+proto.legacy_pb.Metadata.prototype.setLicenseurl = function(value) {
   jspb.Message.setField(this, 11, value);
 };
 
 
-proto.pb.Metadata.prototype.clearLicenseurl = function() {
+proto.legacy_pb.Metadata.prototype.clearLicenseurl = function() {
   jspb.Message.setField(this, 11, undefined);
 };
 
@@ -783,9 +783,9 @@ proto.pb.Metadata.prototype.clearLicenseurl = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Metadata.prototype.hasLicenseurl = function() {
+proto.legacy_pb.Metadata.prototype.hasLicenseurl = function() {
   return jspb.Message.getField(this, 11) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);
diff --git a/v1/js/signature_pb.js b/v1/js/signature_pb.js
index ceca47f..cbbcec9 100644
--- a/v1/js/signature_pb.js
+++ b/v1/js/signature_pb.js
@@ -12,8 +12,8 @@ var goog = jspb;
 var global = Function('return this')();
 
 var certificate_pb = require('./certificate_pb.js');
-goog.exportSymbol('proto.pb.Signature', null, global);
-goog.exportSymbol('proto.pb.Signature.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.Signature', null, global);
+goog.exportSymbol('proto.legacy_pb.Signature.Version', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -25,12 +25,12 @@ goog.exportSymbol('proto.pb.Signature.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Signature = function(opt_data) {
+proto.legacy_pb.Signature = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Signature, jspb.Message);
+goog.inherits(proto.legacy_pb.Signature, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Signature.displayName = 'proto.pb.Signature';
+  proto.legacy_pb.Signature.displayName = 'proto.legacy_pb.Signature';
 }
 
 
@@ -45,8 +45,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Signature.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Signature.toObject(opt_includeInstance, this);
+proto.legacy_pb.Signature.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Signature.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,11 +55,11 @@ proto.pb.Signature.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Signature} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Signature} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Signature.toObject = function(includeInstance, msg) {
+proto.legacy_pb.Signature.toObject = function(includeInstance, msg) {
   var f, obj = {
     version: jspb.Message.getField(msg, 1),
     signaturetype: jspb.Message.getField(msg, 2),
@@ -78,23 +78,23 @@ proto.pb.Signature.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Signature}
+ * @return {!proto.legacy_pb.Signature}
  */
-proto.pb.Signature.deserializeBinary = function(bytes) {
+proto.legacy_pb.Signature.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Signature;
-  return proto.pb.Signature.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Signature;
+  return proto.legacy_pb.Signature.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Signature} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Signature} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Signature}
+ * @return {!proto.legacy_pb.Signature}
  */
-proto.pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,11 +102,11 @@ proto.pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Signature.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Signature.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.KeyType} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.KeyType} */ (reader.readEnum());
       msg.setSignaturetype(value);
       break;
     case 3:
@@ -130,9 +130,9 @@ proto.pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Signature.prototype.serializeBinary = function() {
+proto.legacy_pb.Signature.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Signature.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Signature.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -140,20 +140,20 @@ proto.pb.Signature.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Signature} message
+ * @param {!proto.legacy_pb.Signature} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Signature.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Signature.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Signature.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Signature.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.KeyType} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -180,27 +180,27 @@ proto.pb.Signature.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Signature.Version = {
+proto.legacy_pb.Signature.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Signature.Version}
+ * @return {!proto.legacy_pb.Signature.Version}
  */
-proto.pb.Signature.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Signature.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Signature.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Signature.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Signature.Version} value */
-proto.pb.Signature.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Signature.Version} value */
+proto.legacy_pb.Signature.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Signature.prototype.clearVersion = function() {
+proto.legacy_pb.Signature.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
@@ -209,27 +209,27 @@ proto.pb.Signature.prototype.clearVersion = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Signature.prototype.hasVersion = function() {
+proto.legacy_pb.Signature.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required KeyType signatureType = 2;
- * @return {!proto.pb.KeyType}
+ * @return {!proto.legacy_pb.KeyType}
  */
-proto.pb.Signature.prototype.getSignaturetype = function() {
-  return /** @type {!proto.pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Signature.prototype.getSignaturetype = function() {
+  return /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.KeyType} value */
-proto.pb.Signature.prototype.setSignaturetype = function(value) {
+/** @param {!proto.legacy_pb.KeyType} value */
+proto.legacy_pb.Signature.prototype.setSignaturetype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Signature.prototype.clearSignaturetype = function() {
+proto.legacy_pb.Signature.prototype.clearSignaturetype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
@@ -238,7 +238,7 @@ proto.pb.Signature.prototype.clearSignaturetype = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Signature.prototype.hasSignaturetype = function() {
+proto.legacy_pb.Signature.prototype.hasSignaturetype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -247,7 +247,7 @@ proto.pb.Signature.prototype.hasSignaturetype = function() {
  * required bytes signature = 3;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Signature.prototype.getSignature = function() {
+proto.legacy_pb.Signature.prototype.getSignature = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
@@ -257,7 +257,7 @@ proto.pb.Signature.prototype.getSignature = function() {
  * This is a type-conversion wrapper around `getSignature()`
  * @return {string}
  */
-proto.pb.Signature.prototype.getSignature_asB64 = function() {
+proto.legacy_pb.Signature.prototype.getSignature_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getSignature()));
 };
@@ -270,19 +270,19 @@ proto.pb.Signature.prototype.getSignature_asB64 = function() {
  * This is a type-conversion wrapper around `getSignature()`
  * @return {!Uint8Array}
  */
-proto.pb.Signature.prototype.getSignature_asU8 = function() {
+proto.legacy_pb.Signature.prototype.getSignature_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getSignature()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Signature.prototype.setSignature = function(value) {
+proto.legacy_pb.Signature.prototype.setSignature = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Signature.prototype.clearSignature = function() {
+proto.legacy_pb.Signature.prototype.clearSignature = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
@@ -291,7 +291,7 @@ proto.pb.Signature.prototype.clearSignature = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Signature.prototype.hasSignature = function() {
+proto.legacy_pb.Signature.prototype.hasSignature = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -300,7 +300,7 @@ proto.pb.Signature.prototype.hasSignature = function() {
  * required bytes certificateId = 4;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Signature.prototype.getCertificateid = function() {
+proto.legacy_pb.Signature.prototype.getCertificateid = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
@@ -310,7 +310,7 @@ proto.pb.Signature.prototype.getCertificateid = function() {
  * This is a type-conversion wrapper around `getCertificateid()`
  * @return {string}
  */
-proto.pb.Signature.prototype.getCertificateid_asB64 = function() {
+proto.legacy_pb.Signature.prototype.getCertificateid_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getCertificateid()));
 };
@@ -323,19 +323,19 @@ proto.pb.Signature.prototype.getCertificateid_asB64 = function() {
  * This is a type-conversion wrapper around `getCertificateid()`
  * @return {!Uint8Array}
  */
-proto.pb.Signature.prototype.getCertificateid_asU8 = function() {
+proto.legacy_pb.Signature.prototype.getCertificateid_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getCertificateid()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Signature.prototype.setCertificateid = function(value) {
+proto.legacy_pb.Signature.prototype.setCertificateid = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Signature.prototype.clearCertificateid = function() {
+proto.legacy_pb.Signature.prototype.clearCertificateid = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
@@ -344,9 +344,9 @@ proto.pb.Signature.prototype.clearCertificateid = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Signature.prototype.hasCertificateid = function() {
+proto.legacy_pb.Signature.prototype.hasCertificateid = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);
diff --git a/v1/js/source_pb.js b/v1/js/source_pb.js
index 3e3d07d..f27c9cb 100644
--- a/v1/js/source_pb.js
+++ b/v1/js/source_pb.js
@@ -11,9 +11,9 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.pb.Source', null, global);
-goog.exportSymbol('proto.pb.Source.SourceTypes', null, global);
-goog.exportSymbol('proto.pb.Source.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.Source', null, global);
+goog.exportSymbol('proto.legacy_pb.Source.SourceTypes', null, global);
+goog.exportSymbol('proto.legacy_pb.Source.Version', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -25,12 +25,12 @@ goog.exportSymbol('proto.pb.Source.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Source = function(opt_data) {
+proto.legacy_pb.Source = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Source, jspb.Message);
+goog.inherits(proto.legacy_pb.Source, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Source.displayName = 'proto.pb.Source';
+  proto.legacy_pb.Source.displayName = 'proto.legacy_pb.Source';
 }
 
 
@@ -45,8 +45,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Source.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Source.toObject(opt_includeInstance, this);
+proto.legacy_pb.Source.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Source.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,11 +55,11 @@ proto.pb.Source.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Source} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Source} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Source.toObject = function(includeInstance, msg) {
+proto.legacy_pb.Source.toObject = function(includeInstance, msg) {
   var f, obj = {
     version: jspb.Message.getField(msg, 1),
     sourcetype: jspb.Message.getField(msg, 2),
@@ -78,23 +78,23 @@ proto.pb.Source.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Source}
+ * @return {!proto.legacy_pb.Source}
  */
-proto.pb.Source.deserializeBinary = function(bytes) {
+proto.legacy_pb.Source.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Source;
-  return proto.pb.Source.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Source;
+  return proto.legacy_pb.Source.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Source} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Source} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Source}
+ * @return {!proto.legacy_pb.Source}
  */
-proto.pb.Source.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Source.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,11 +102,11 @@ proto.pb.Source.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Source.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Source.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Source.SourceTypes} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Source.SourceTypes} */ (reader.readEnum());
       msg.setSourcetype(value);
       break;
     case 3:
@@ -130,9 +130,9 @@ proto.pb.Source.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Source.prototype.serializeBinary = function() {
+proto.legacy_pb.Source.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Source.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Source.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -140,20 +140,20 @@ proto.pb.Source.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Source} message
+ * @param {!proto.legacy_pb.Source} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Source.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Source.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Source.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Source.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Source.SourceTypes} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Source.SourceTypes} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -180,7 +180,7 @@ proto.pb.Source.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Source.Version = {
+proto.legacy_pb.Source.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
@@ -188,27 +188,27 @@ proto.pb.Source.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Source.SourceTypes = {
+proto.legacy_pb.Source.SourceTypes = {
   UNKNOWN_SOURCE_TYPE: 0,
   LBRY_SD_HASH: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Source.Version}
+ * @return {!proto.legacy_pb.Source.Version}
  */
-proto.pb.Source.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Source.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Source.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Source.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Source.Version} value */
-proto.pb.Source.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Source.Version} value */
+proto.legacy_pb.Source.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Source.prototype.clearVersion = function() {
+proto.legacy_pb.Source.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
@@ -217,27 +217,27 @@ proto.pb.Source.prototype.clearVersion = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Source.prototype.hasVersion = function() {
+proto.legacy_pb.Source.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required SourceTypes sourceType = 2;
- * @return {!proto.pb.Source.SourceTypes}
+ * @return {!proto.legacy_pb.Source.SourceTypes}
  */
-proto.pb.Source.prototype.getSourcetype = function() {
-  return /** @type {!proto.pb.Source.SourceTypes} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Source.prototype.getSourcetype = function() {
+  return /** @type {!proto.legacy_pb.Source.SourceTypes} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Source.SourceTypes} value */
-proto.pb.Source.prototype.setSourcetype = function(value) {
+/** @param {!proto.legacy_pb.Source.SourceTypes} value */
+proto.legacy_pb.Source.prototype.setSourcetype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Source.prototype.clearSourcetype = function() {
+proto.legacy_pb.Source.prototype.clearSourcetype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
@@ -246,7 +246,7 @@ proto.pb.Source.prototype.clearSourcetype = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Source.prototype.hasSourcetype = function() {
+proto.legacy_pb.Source.prototype.hasSourcetype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -255,7 +255,7 @@ proto.pb.Source.prototype.hasSourcetype = function() {
  * required bytes source = 3;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Source.prototype.getSource = function() {
+proto.legacy_pb.Source.prototype.getSource = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
@@ -265,7 +265,7 @@ proto.pb.Source.prototype.getSource = function() {
  * This is a type-conversion wrapper around `getSource()`
  * @return {string}
  */
-proto.pb.Source.prototype.getSource_asB64 = function() {
+proto.legacy_pb.Source.prototype.getSource_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getSource()));
 };
@@ -278,19 +278,19 @@ proto.pb.Source.prototype.getSource_asB64 = function() {
  * This is a type-conversion wrapper around `getSource()`
  * @return {!Uint8Array}
  */
-proto.pb.Source.prototype.getSource_asU8 = function() {
+proto.legacy_pb.Source.prototype.getSource_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getSource()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Source.prototype.setSource = function(value) {
+proto.legacy_pb.Source.prototype.setSource = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Source.prototype.clearSource = function() {
+proto.legacy_pb.Source.prototype.clearSource = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
@@ -299,7 +299,7 @@ proto.pb.Source.prototype.clearSource = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Source.prototype.hasSource = function() {
+proto.legacy_pb.Source.prototype.hasSource = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -308,18 +308,18 @@ proto.pb.Source.prototype.hasSource = function() {
  * required string contentType = 4;
  * @return {string}
  */
-proto.pb.Source.prototype.getContenttype = function() {
+proto.legacy_pb.Source.prototype.getContenttype = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Source.prototype.setContenttype = function(value) {
+proto.legacy_pb.Source.prototype.setContenttype = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Source.prototype.clearContenttype = function() {
+proto.legacy_pb.Source.prototype.clearContenttype = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
@@ -328,9 +328,9 @@ proto.pb.Source.prototype.clearContenttype = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Source.prototype.hasContenttype = function() {
+proto.legacy_pb.Source.prototype.hasContenttype = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);
diff --git a/v1/js/stream_pb.js b/v1/js/stream_pb.js
index f30bac3..76592cd 100644
--- a/v1/js/stream_pb.js
+++ b/v1/js/stream_pb.js
@@ -13,8 +13,8 @@ var global = Function('return this')();
 
 var metadata_pb = require('./metadata_pb.js');
 var source_pb = require('./source_pb.js');
-goog.exportSymbol('proto.pb.Stream', null, global);
-goog.exportSymbol('proto.pb.Stream.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.Stream', null, global);
+goog.exportSymbol('proto.legacy_pb.Stream.Version', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -26,12 +26,12 @@ goog.exportSymbol('proto.pb.Stream.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Stream = function(opt_data) {
+proto.legacy_pb.Stream = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Stream, jspb.Message);
+goog.inherits(proto.legacy_pb.Stream, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Stream.displayName = 'proto.pb.Stream';
+  proto.legacy_pb.Stream.displayName = 'proto.legacy_pb.Stream';
 }
 
 
@@ -46,8 +46,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Stream.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Stream.toObject(opt_includeInstance, this);
+proto.legacy_pb.Stream.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Stream.toObject(opt_includeInstance, this);
 };
 
 
@@ -56,11 +56,11 @@ proto.pb.Stream.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Stream} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Stream} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Stream.toObject = function(includeInstance, msg) {
+proto.legacy_pb.Stream.toObject = function(includeInstance, msg) {
   var f, obj = {
     version: jspb.Message.getField(msg, 1),
     metadata: (f = msg.getMetadata()) && metadata_pb.Metadata.toObject(includeInstance, f),
@@ -78,23 +78,23 @@ proto.pb.Stream.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Stream}
+ * @return {!proto.legacy_pb.Stream}
  */
-proto.pb.Stream.deserializeBinary = function(bytes) {
+proto.legacy_pb.Stream.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Stream;
-  return proto.pb.Stream.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Stream;
+  return proto.legacy_pb.Stream.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Stream} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Stream} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Stream}
+ * @return {!proto.legacy_pb.Stream}
  */
-proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,7 +102,7 @@ proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Stream.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Stream.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
@@ -128,9 +128,9 @@ proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Stream.prototype.serializeBinary = function() {
+proto.legacy_pb.Stream.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Stream.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Stream.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -138,13 +138,13 @@ proto.pb.Stream.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Stream} message
+ * @param {!proto.legacy_pb.Stream} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Stream.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Stream.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Stream.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
@@ -173,27 +173,27 @@ proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Stream.Version = {
+proto.legacy_pb.Stream.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Stream.Version}
+ * @return {!proto.legacy_pb.Stream.Version}
  */
-proto.pb.Stream.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Stream.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Stream.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Stream.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Stream.Version} value */
-proto.pb.Stream.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Stream.Version} value */
+proto.legacy_pb.Stream.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Stream.prototype.clearVersion = function() {
+proto.legacy_pb.Stream.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
@@ -202,28 +202,28 @@ proto.pb.Stream.prototype.clearVersion = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Stream.prototype.hasVersion = function() {
+proto.legacy_pb.Stream.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required Metadata metadata = 2;
- * @return {!proto.pb.Metadata}
+ * @return {!proto.legacy_pb.Metadata}
  */
-proto.pb.Stream.prototype.getMetadata = function() {
-  return /** @type{!proto.pb.Metadata} */ (
+proto.legacy_pb.Stream.prototype.getMetadata = function() {
+  return /** @type{!proto.legacy_pb.Metadata} */ (
     jspb.Message.getWrapperField(this, metadata_pb.Metadata, 2, 1));
 };
 
 
-/** @param {!proto.pb.Metadata} value */
-proto.pb.Stream.prototype.setMetadata = function(value) {
+/** @param {!proto.legacy_pb.Metadata} value */
+proto.legacy_pb.Stream.prototype.setMetadata = function(value) {
   jspb.Message.setWrapperField(this, 2, value);
 };
 
 
-proto.pb.Stream.prototype.clearMetadata = function() {
+proto.legacy_pb.Stream.prototype.clearMetadata = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
@@ -232,28 +232,28 @@ proto.pb.Stream.prototype.clearMetadata = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Stream.prototype.hasMetadata = function() {
+proto.legacy_pb.Stream.prototype.hasMetadata = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
  * required Source source = 3;
- * @return {!proto.pb.Source}
+ * @return {!proto.legacy_pb.Source}
  */
-proto.pb.Stream.prototype.getSource = function() {
-  return /** @type{!proto.pb.Source} */ (
+proto.legacy_pb.Stream.prototype.getSource = function() {
+  return /** @type{!proto.legacy_pb.Source} */ (
     jspb.Message.getWrapperField(this, source_pb.Source, 3, 1));
 };
 
 
-/** @param {!proto.pb.Source} value */
-proto.pb.Stream.prototype.setSource = function(value) {
+/** @param {!proto.legacy_pb.Source} value */
+proto.legacy_pb.Stream.prototype.setSource = function(value) {
   jspb.Message.setWrapperField(this, 3, value);
 };
 
 
-proto.pb.Stream.prototype.clearSource = function() {
+proto.legacy_pb.Stream.prototype.clearSource = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
@@ -262,9 +262,9 @@ proto.pb.Stream.prototype.clearSource = function() {
  * Returns whether this field is set.
  * @return {!boolean}
  */
-proto.pb.Stream.prototype.hasSource = function() {
+proto.legacy_pb.Stream.prototype.hasSource = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);
diff --git a/v1/proto/certificate.proto b/v1/proto/certificate.proto
index 86fcac5..329e8c7 100644
--- a/v1/proto/certificate.proto
+++ b/v1/proto/certificate.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 enum KeyType {
         UNKNOWN_PUBLIC_KEY_TYPE = 0;
diff --git a/v1/proto/fee.proto b/v1/proto/fee.proto
index dedbd8c..b9926e3 100644
--- a/v1/proto/fee.proto
+++ b/v1/proto/fee.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 message Fee {
     enum Version {
diff --git a/v1/proto/claim.proto b/v1/proto/legacy_claim.proto
similarity index 96%
rename from v1/proto/claim.proto
rename to v1/proto/legacy_claim.proto
index ff590f1..5c84ab6 100644
--- a/v1/proto/claim.proto
+++ b/v1/proto/legacy_claim.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "stream.proto";
 import "certificate.proto";
diff --git a/v1/proto/metadata.proto b/v1/proto/metadata.proto
index 618a5f2..90d3130 100644
--- a/v1/proto/metadata.proto
+++ b/v1/proto/metadata.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "fee.proto";
 
diff --git a/v1/proto/signature.proto b/v1/proto/signature.proto
index 9ebfc0b..58d0665 100644
--- a/v1/proto/signature.proto
+++ b/v1/proto/signature.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "certificate.proto";
 
diff --git a/v1/proto/source.proto b/v1/proto/source.proto
index 4d2b1dc..b2b5a03 100644
--- a/v1/proto/source.proto
+++ b/v1/proto/source.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 message Source {
     enum Version {
diff --git a/v1/proto/stream.proto b/v1/proto/stream.proto
index c6c666a..6875871 100644
--- a/v1/proto/stream.proto
+++ b/v1/proto/stream.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "metadata.proto";
 import "source.proto";
diff --git a/v1/python/certificate_pb2.py b/v1/python/certificate_pb2.py
index 1f5cbb8..d42df90 100644
--- a/v1/python/certificate_pb2.py
+++ b/v1/python/certificate_pb2.py
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,38 +17,39 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='certificate.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x11\x63\x65rtificate.proto\x12\x02pb\"\x94\x01\n\x0b\x43\x65rtificate\x12(\n\x07version\x18\x01 \x02(\x0e\x32\x17.pb.Certificate.Version\x12\x1c\n\x07keyType\x18\x02 \x02(\x0e\x32\x0b.pb.KeyType\x12\x11\n\tpublicKey\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01*Q\n\x07KeyType\x12\x1b\n\x17UNKNOWN_PUBLIC_KEY_TYPE\x10\x00\x12\x0c\n\x08NIST256p\x10\x01\x12\x0c\n\x08NIST384p\x10\x02\x12\r\n\tSECP256k1\x10\x03')
+  serialized_options=None,
+  serialized_pb=_b('\n\x11\x63\x65rtificate.proto\x12\tlegacy_pb\"\xa2\x01\n\x0b\x43\x65rtificate\x12/\n\x07version\x18\x01 \x02(\x0e\x32\x1e.legacy_pb.Certificate.Version\x12#\n\x07keyType\x18\x02 \x02(\x0e\x32\x12.legacy_pb.KeyType\x12\x11\n\tpublicKey\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01*Q\n\x07KeyType\x12\x1b\n\x17UNKNOWN_PUBLIC_KEY_TYPE\x10\x00\x12\x0c\n\x08NIST256p\x10\x01\x12\x0c\n\x08NIST384p\x10\x02\x12\r\n\tSECP256k1\x10\x03')
 )
 
 _KEYTYPE = _descriptor.EnumDescriptor(
   name='KeyType',
-  full_name='pb.KeyType',
+  full_name='legacy_pb.KeyType',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_PUBLIC_KEY_TYPE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='NIST256p', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='NIST384p', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='SECP256k1', index=3, number=3,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=176,
-  serialized_end=257,
+  serialized_options=None,
+  serialized_start=197,
+  serialized_end=278,
 )
 _sym_db.RegisterEnumDescriptor(_KEYTYPE)
 
@@ -62,55 +62,55 @@ SECP256k1 = 3
 
 _CERTIFICATE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Certificate.Version',
+  full_name='legacy_pb.Certificate.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=132,
-  serialized_end=174,
+  serialized_options=None,
+  serialized_start=153,
+  serialized_end=195,
 )
 _sym_db.RegisterEnumDescriptor(_CERTIFICATE_VERSION)
 
 
 _CERTIFICATE = _descriptor.Descriptor(
   name='Certificate',
-  full_name='pb.Certificate',
+  full_name='legacy_pb.Certificate',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Certificate.version', index=0,
+      name='version', full_name='legacy_pb.Certificate.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='keyType', full_name='pb.Certificate.keyType', index=1,
+      name='keyType', full_name='legacy_pb.Certificate.keyType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='publicKey', full_name='pb.Certificate.publicKey', index=2,
+      name='publicKey', full_name='legacy_pb.Certificate.publicKey', index=2,
       number=4, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -118,14 +118,14 @@ _CERTIFICATE = _descriptor.Descriptor(
   enum_types=[
     _CERTIFICATE_VERSION,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=26,
-  serialized_end=174,
+  serialized_start=33,
+  serialized_end=195,
 )
 
 _CERTIFICATE.fields_by_name['version'].enum_type = _CERTIFICATE_VERSION
@@ -138,7 +138,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Certificate = _reflection.GeneratedProtocolMessageType('Certificate', (_message.Message,), dict(
   DESCRIPTOR = _CERTIFICATE,
   __module__ = 'certificate_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Certificate)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Certificate)
   ))
 _sym_db.RegisterMessage(Certificate)
 
diff --git a/v1/python/fee_pb2.py b/v1/python/fee_pb2.py
index 0251120..aa43011 100644
--- a/v1/python/fee_pb2.py
+++ b/v1/python/fee_pb2.py
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -17,101 +16,102 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='fee.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\tfee.proto\x12\x02pb\"\xd5\x01\n\x03\x46\x65\x65\x12 \n\x07version\x18\x01 \x02(\x0e\x32\x0f.pb.Fee.Version\x12\"\n\x08\x63urrency\x18\x02 \x02(\x0e\x32\x10.pb.Fee.Currency\x12\x0f\n\x07\x61\x64\x64ress\x18\x03 \x02(\x0c\x12\x0e\n\x06\x61mount\x18\x04 \x02(\x02\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\";\n\x08\x43urrency\x12\x14\n\x10UNKNOWN_CURRENCY\x10\x00\x12\x07\n\x03LBC\x10\x01\x12\x07\n\x03\x42TC\x10\x02\x12\x07\n\x03USD\x10\x03')
+  serialized_options=None,
+  serialized_pb=_b('\n\tfee.proto\x12\tlegacy_pb\"\xe3\x01\n\x03\x46\x65\x65\x12\'\n\x07version\x18\x01 \x02(\x0e\x32\x16.legacy_pb.Fee.Version\x12)\n\x08\x63urrency\x18\x02 \x02(\x0e\x32\x17.legacy_pb.Fee.Currency\x12\x0f\n\x07\x61\x64\x64ress\x18\x03 \x02(\x0c\x12\x0e\n\x06\x61mount\x18\x04 \x02(\x02\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\";\n\x08\x43urrency\x12\x14\n\x10UNKNOWN_CURRENCY\x10\x00\x12\x07\n\x03LBC\x10\x01\x12\x07\n\x03\x42TC\x10\x02\x12\x07\n\x03USD\x10\x03')
 )
 
 
 
 _FEE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Fee.Version',
+  full_name='legacy_pb.Fee.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=128,
-  serialized_end=170,
+  serialized_options=None,
+  serialized_start=149,
+  serialized_end=191,
 )
 _sym_db.RegisterEnumDescriptor(_FEE_VERSION)
 
 _FEE_CURRENCY = _descriptor.EnumDescriptor(
   name='Currency',
-  full_name='pb.Fee.Currency',
+  full_name='legacy_pb.Fee.Currency',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_CURRENCY', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='LBC', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='BTC', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='USD', index=3, number=3,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=172,
-  serialized_end=231,
+  serialized_options=None,
+  serialized_start=193,
+  serialized_end=252,
 )
 _sym_db.RegisterEnumDescriptor(_FEE_CURRENCY)
 
 
 _FEE = _descriptor.Descriptor(
   name='Fee',
-  full_name='pb.Fee',
+  full_name='legacy_pb.Fee',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Fee.version', index=0,
+      name='version', full_name='legacy_pb.Fee.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='currency', full_name='pb.Fee.currency', index=1,
+      name='currency', full_name='legacy_pb.Fee.currency', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='address', full_name='pb.Fee.address', index=2,
+      name='address', full_name='legacy_pb.Fee.address', index=2,
       number=3, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='amount', full_name='pb.Fee.amount', index=3,
+      name='amount', full_name='legacy_pb.Fee.amount', index=3,
       number=4, type=2, cpp_type=6, label=2,
       has_default_value=False, default_value=float(0),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -120,14 +120,14 @@ _FEE = _descriptor.Descriptor(
     _FEE_VERSION,
     _FEE_CURRENCY,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=18,
-  serialized_end=231,
+  serialized_start=25,
+  serialized_end=252,
 )
 
 _FEE.fields_by_name['version'].enum_type = _FEE_VERSION
@@ -140,7 +140,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Fee = _reflection.GeneratedProtocolMessageType('Fee', (_message.Message,), dict(
   DESCRIPTOR = _FEE,
   __module__ = 'fee_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Fee)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Fee)
   ))
 _sym_db.RegisterMessage(Fee)
 
diff --git a/v1/python/claim_pb2.py b/v1/python/legacy_claim_pb2.py
similarity index 65%
rename from v1/python/claim_pb2.py
rename to v1/python/legacy_claim_pb2.py
index a60a61a..0f25985 100644
--- a/v1/python/claim_pb2.py
+++ b/v1/python/legacy_claim_pb2.py
@@ -1,5 +1,5 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: claim.proto
+# source: legacy_claim.proto
 
 import sys
 _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,10 +18,11 @@ import signature_pb2 as signature__pb2
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
-  name='claim.proto',
-  package='pb',
+  name='legacy_claim.proto',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0b\x63laim.proto\x12\x02pb\x1a\x0cstream.proto\x1a\x11\x63\x65rtificate.proto\x1a\x0fsignature.proto\"\xb6\x02\n\x05\x43laim\x12\"\n\x07version\x18\x01 \x02(\x0e\x32\x11.pb.Claim.Version\x12&\n\tclaimType\x18\x02 \x02(\x0e\x32\x13.pb.Claim.ClaimType\x12\x1a\n\x06stream\x18\x03 \x01(\x0b\x32\n.pb.Stream\x12$\n\x0b\x63\x65rtificate\x18\x04 \x01(\x0b\x32\x0f.pb.Certificate\x12)\n\x12publisherSignature\x18\x05 \x01(\x0b\x32\r.pb.Signature\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"H\n\tClaimType\x12\x16\n\x12UNKNOWN_CLAIM_TYPE\x10\x00\x12\x0e\n\nstreamType\x10\x01\x12\x13\n\x0f\x63\x65rtificateType\x10\x02')
+  serialized_options=None,
+  serialized_pb=_b('\n\x12legacy_claim.proto\x12\tlegacy_pb\x1a\x0cstream.proto\x1a\x11\x63\x65rtificate.proto\x1a\x0fsignature.proto\"\xd9\x02\n\x05\x43laim\x12)\n\x07version\x18\x01 \x02(\x0e\x32\x18.legacy_pb.Claim.Version\x12-\n\tclaimType\x18\x02 \x02(\x0e\x32\x1a.legacy_pb.Claim.ClaimType\x12!\n\x06stream\x18\x03 \x01(\x0b\x32\x11.legacy_pb.Stream\x12+\n\x0b\x63\x65rtificate\x18\x04 \x01(\x0b\x32\x16.legacy_pb.Certificate\x12\x30\n\x12publisherSignature\x18\x05 \x01(\x0b\x32\x14.legacy_pb.Signature\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"H\n\tClaimType\x12\x16\n\x12UNKNOWN_CLAIM_TYPE\x10\x00\x12\x0e\n\nstreamType\x10\x01\x12\x13\n\x0f\x63\x65rtificateType\x10\x02')
   ,
   dependencies=[stream__pb2.DESCRIPTOR,certificate__pb2.DESCRIPTOR,signature__pb2.DESCRIPTOR,])
 
@@ -30,95 +30,95 @@ DESCRIPTOR = _descriptor.FileDescriptor(
 
 _CLAIM_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Claim.Version',
+  full_name='legacy_pb.Claim.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=264,
-  serialized_end=306,
+  serialized_options=None,
+  serialized_start=313,
+  serialized_end=355,
 )
 _sym_db.RegisterEnumDescriptor(_CLAIM_VERSION)
 
 _CLAIM_CLAIMTYPE = _descriptor.EnumDescriptor(
   name='ClaimType',
-  full_name='pb.Claim.ClaimType',
+  full_name='legacy_pb.Claim.ClaimType',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_CLAIM_TYPE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='streamType', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='certificateType', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=308,
-  serialized_end=380,
+  serialized_options=None,
+  serialized_start=357,
+  serialized_end=429,
 )
 _sym_db.RegisterEnumDescriptor(_CLAIM_CLAIMTYPE)
 
 
 _CLAIM = _descriptor.Descriptor(
   name='Claim',
-  full_name='pb.Claim',
+  full_name='legacy_pb.Claim',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Claim.version', index=0,
+      name='version', full_name='legacy_pb.Claim.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='claimType', full_name='pb.Claim.claimType', index=1,
+      name='claimType', full_name='legacy_pb.Claim.claimType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='stream', full_name='pb.Claim.stream', index=2,
+      name='stream', full_name='legacy_pb.Claim.stream', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='certificate', full_name='pb.Claim.certificate', index=3,
+      name='certificate', full_name='legacy_pb.Claim.certificate', index=3,
       number=4, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='publisherSignature', full_name='pb.Claim.publisherSignature', index=4,
+      name='publisherSignature', full_name='legacy_pb.Claim.publisherSignature', index=4,
       number=5, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -127,14 +127,14 @@ _CLAIM = _descriptor.Descriptor(
     _CLAIM_VERSION,
     _CLAIM_CLAIMTYPE,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=70,
-  serialized_end=380,
+  serialized_start=84,
+  serialized_end=429,
 )
 
 _CLAIM.fields_by_name['version'].enum_type = _CLAIM_VERSION
@@ -149,8 +149,8 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 Claim = _reflection.GeneratedProtocolMessageType('Claim', (_message.Message,), dict(
   DESCRIPTOR = _CLAIM,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Claim)
+  __module__ = 'legacy_claim_pb2'
+  # @@protoc_insertion_point(class_scope:legacy_pb.Claim)
   ))
 _sym_db.RegisterMessage(Claim)
 
diff --git a/v1/python/metadata_pb2.py b/v1/python/metadata_pb2.py
index 758213d..0562566 100644
--- a/v1/python/metadata_pb2.py
+++ b/v1/python/metadata_pb2.py
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,9 +17,10 @@ import fee_pb2 as fee__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='metadata.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0emetadata.proto\x12\x02pb\x1a\tfee.proto\"\xe7\x0e\n\x08Metadata\x12%\n\x07version\x18\x01 \x02(\x0e\x32\x14.pb.Metadata.Version\x12\'\n\x08language\x18\x02 \x02(\x0e\x32\x15.pb.Metadata.Language\x12\r\n\x05title\x18\x03 \x02(\t\x12\x13\n\x0b\x64\x65scription\x18\x04 \x02(\t\x12\x0e\n\x06\x61uthor\x18\x05 \x02(\t\x12\x0f\n\x07license\x18\x06 \x02(\t\x12\x0c\n\x04nsfw\x18\x07 \x02(\x08\x12\x14\n\x03\x66\x65\x65\x18\x08 \x01(\x0b\x32\x07.pb.Fee\x12\x11\n\tthumbnail\x18\t \x01(\t\x12\x0f\n\x07preview\x18\n \x01(\t\x12\x12\n\nlicenseUrl\x18\x0b \x01(\t\"N\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\x12\n\n\x06_0_0_2\x10\x02\x12\n\n\x06_0_0_3\x10\x03\x12\n\n\x06_0_1_0\x10\x04\"\x99\x0c\n\x08Language\x12\x14\n\x10UNKNOWN_LANGUAGE\x10\x00\x12\x06\n\x02\x65n\x10\x01\x12\x06\n\x02\x61\x61\x10\x02\x12\x06\n\x02\x61\x62\x10\x03\x12\x06\n\x02\x61\x65\x10\x04\x12\x06\n\x02\x61\x66\x10\x05\x12\x06\n\x02\x61k\x10\x06\x12\x06\n\x02\x61m\x10\x07\x12\x06\n\x02\x61n\x10\x08\x12\x06\n\x02\x61r\x10\t\x12\x06\n\x02\x61s\x10\n\x12\x06\n\x02\x61v\x10\x0b\x12\x06\n\x02\x61y\x10\x0c\x12\x06\n\x02\x61z\x10\r\x12\x06\n\x02\x62\x61\x10\x0e\x12\x06\n\x02\x62\x65\x10\x0f\x12\x06\n\x02\x62g\x10\x10\x12\x06\n\x02\x62h\x10\x11\x12\x06\n\x02\x62i\x10\x12\x12\x06\n\x02\x62m\x10\x13\x12\x06\n\x02\x62n\x10\x14\x12\x06\n\x02\x62o\x10\x15\x12\x06\n\x02\x62r\x10\x16\x12\x06\n\x02\x62s\x10\x17\x12\x06\n\x02\x63\x61\x10\x18\x12\x06\n\x02\x63\x65\x10\x19\x12\x06\n\x02\x63h\x10\x1a\x12\x06\n\x02\x63o\x10\x1b\x12\x06\n\x02\x63r\x10\x1c\x12\x06\n\x02\x63s\x10\x1d\x12\x06\n\x02\x63u\x10\x1e\x12\x06\n\x02\x63v\x10\x1f\x12\x06\n\x02\x63y\x10 \x12\x06\n\x02\x64\x61\x10!\x12\x06\n\x02\x64\x65\x10\"\x12\x06\n\x02\x64v\x10#\x12\x06\n\x02\x64z\x10$\x12\x06\n\x02\x65\x65\x10%\x12\x06\n\x02\x65l\x10&\x12\x06\n\x02\x65o\x10\'\x12\x06\n\x02\x65s\x10(\x12\x06\n\x02\x65t\x10)\x12\x06\n\x02\x65u\x10*\x12\x06\n\x02\x66\x61\x10+\x12\x06\n\x02\x66\x66\x10,\x12\x06\n\x02\x66i\x10-\x12\x06\n\x02\x66j\x10.\x12\x06\n\x02\x66o\x10/\x12\x06\n\x02\x66r\x10\x30\x12\x06\n\x02\x66y\x10\x31\x12\x06\n\x02ga\x10\x32\x12\x06\n\x02gd\x10\x33\x12\x06\n\x02gl\x10\x34\x12\x06\n\x02gn\x10\x35\x12\x06\n\x02gu\x10\x36\x12\x06\n\x02gv\x10\x37\x12\x06\n\x02ha\x10\x38\x12\x06\n\x02he\x10\x39\x12\x06\n\x02hi\x10:\x12\x06\n\x02ho\x10;\x12\x06\n\x02hr\x10<\x12\x06\n\x02ht\x10=\x12\x06\n\x02hu\x10>\x12\x06\n\x02hy\x10?\x12\x06\n\x02hz\x10@\x12\x06\n\x02ia\x10\x41\x12\x06\n\x02id\x10\x42\x12\x06\n\x02ie\x10\x43\x12\x06\n\x02ig\x10\x44\x12\x06\n\x02ii\x10\x45\x12\x06\n\x02ik\x10\x46\x12\x06\n\x02io\x10G\x12\x06\n\x02is\x10H\x12\x06\n\x02it\x10I\x12\x06\n\x02iu\x10J\x12\x06\n\x02ja\x10K\x12\x06\n\x02jv\x10L\x12\x06\n\x02ka\x10M\x12\x06\n\x02kg\x10N\x12\x06\n\x02ki\x10O\x12\x06\n\x02kj\x10P\x12\x06\n\x02kk\x10Q\x12\x06\n\x02kl\x10R\x12\x06\n\x02km\x10S\x12\x06\n\x02kn\x10T\x12\x06\n\x02ko\x10U\x12\x06\n\x02kr\x10V\x12\x06\n\x02ks\x10W\x12\x06\n\x02ku\x10X\x12\x06\n\x02kv\x10Y\x12\x06\n\x02kw\x10Z\x12\x06\n\x02ky\x10[\x12\x06\n\x02la\x10\\\x12\x06\n\x02lb\x10]\x12\x06\n\x02lg\x10^\x12\x06\n\x02li\x10_\x12\x06\n\x02ln\x10`\x12\x06\n\x02lo\x10\x61\x12\x06\n\x02lt\x10\x62\x12\x06\n\x02lu\x10\x63\x12\x06\n\x02lv\x10\x64\x12\x06\n\x02mg\x10\x65\x12\x06\n\x02mh\x10\x66\x12\x06\n\x02mi\x10g\x12\x06\n\x02mk\x10h\x12\x06\n\x02ml\x10i\x12\x06\n\x02mn\x10j\x12\x06\n\x02mr\x10k\x12\x06\n\x02ms\x10l\x12\x06\n\x02mt\x10m\x12\x06\n\x02my\x10n\x12\x06\n\x02na\x10o\x12\x06\n\x02nb\x10p\x12\x06\n\x02nd\x10q\x12\x06\n\x02ne\x10r\x12\x06\n\x02ng\x10s\x12\x06\n\x02nl\x10t\x12\x06\n\x02nn\x10u\x12\x06\n\x02no\x10v\x12\x06\n\x02nr\x10w\x12\x06\n\x02nv\x10x\x12\x06\n\x02ny\x10y\x12\x06\n\x02oc\x10z\x12\x06\n\x02oj\x10{\x12\x06\n\x02om\x10|\x12\x06\n\x02or\x10}\x12\x06\n\x02os\x10~\x12\x06\n\x02pa\x10\x7f\x12\x07\n\x02pi\x10\x80\x01\x12\x07\n\x02pl\x10\x81\x01\x12\x07\n\x02ps\x10\x82\x01\x12\x07\n\x02pt\x10\x83\x01\x12\x07\n\x02qu\x10\x84\x01\x12\x07\n\x02rm\x10\x85\x01\x12\x07\n\x02rn\x10\x86\x01\x12\x07\n\x02ro\x10\x87\x01\x12\x07\n\x02ru\x10\x88\x01\x12\x07\n\x02rw\x10\x89\x01\x12\x07\n\x02sa\x10\x8a\x01\x12\x07\n\x02sc\x10\x8b\x01\x12\x07\n\x02sd\x10\x8c\x01\x12\x07\n\x02se\x10\x8d\x01\x12\x07\n\x02sg\x10\x8e\x01\x12\x07\n\x02si\x10\x8f\x01\x12\x07\n\x02sk\x10\x90\x01\x12\x07\n\x02sl\x10\x91\x01\x12\x07\n\x02sm\x10\x92\x01\x12\x07\n\x02sn\x10\x93\x01\x12\x07\n\x02so\x10\x94\x01\x12\x07\n\x02sq\x10\x95\x01\x12\x07\n\x02sr\x10\x96\x01\x12\x07\n\x02ss\x10\x97\x01\x12\x07\n\x02st\x10\x98\x01\x12\x07\n\x02su\x10\x99\x01\x12\x07\n\x02sv\x10\x9a\x01\x12\x07\n\x02sw\x10\x9b\x01\x12\x07\n\x02ta\x10\x9c\x01\x12\x07\n\x02te\x10\x9d\x01\x12\x07\n\x02tg\x10\x9e\x01\x12\x07\n\x02th\x10\x9f\x01\x12\x07\n\x02ti\x10\xa0\x01\x12\x07\n\x02tk\x10\xa1\x01\x12\x07\n\x02tl\x10\xa2\x01\x12\x07\n\x02tn\x10\xa3\x01\x12\x07\n\x02to\x10\xa4\x01\x12\x07\n\x02tr\x10\xa5\x01\x12\x07\n\x02ts\x10\xa6\x01\x12\x07\n\x02tt\x10\xa7\x01\x12\x07\n\x02tw\x10\xa8\x01\x12\x07\n\x02ty\x10\xa9\x01\x12\x07\n\x02ug\x10\xaa\x01\x12\x07\n\x02uk\x10\xab\x01\x12\x07\n\x02ur\x10\xac\x01\x12\x07\n\x02uz\x10\xad\x01\x12\x07\n\x02ve\x10\xae\x01\x12\x07\n\x02vi\x10\xaf\x01\x12\x07\n\x02vo\x10\xb0\x01\x12\x07\n\x02wa\x10\xb1\x01\x12\x07\n\x02wo\x10\xb2\x01\x12\x07\n\x02xh\x10\xb3\x01\x12\x07\n\x02yi\x10\xb4\x01\x12\x07\n\x02yo\x10\xb5\x01\x12\x07\n\x02za\x10\xb6\x01\x12\x07\n\x02zh\x10\xb7\x01\x12\x07\n\x02zu\x10\xb8\x01')
+  serialized_options=None,
+  serialized_pb=_b('\n\x0emetadata.proto\x12\tlegacy_pb\x1a\tfee.proto\"\xfc\x0e\n\x08Metadata\x12,\n\x07version\x18\x01 \x02(\x0e\x32\x1b.legacy_pb.Metadata.Version\x12.\n\x08language\x18\x02 \x02(\x0e\x32\x1c.legacy_pb.Metadata.Language\x12\r\n\x05title\x18\x03 \x02(\t\x12\x13\n\x0b\x64\x65scription\x18\x04 \x02(\t\x12\x0e\n\x06\x61uthor\x18\x05 \x02(\t\x12\x0f\n\x07license\x18\x06 \x02(\t\x12\x0c\n\x04nsfw\x18\x07 \x02(\x08\x12\x1b\n\x03\x66\x65\x65\x18\x08 \x01(\x0b\x32\x0e.legacy_pb.Fee\x12\x11\n\tthumbnail\x18\t \x01(\t\x12\x0f\n\x07preview\x18\n \x01(\t\x12\x12\n\nlicenseUrl\x18\x0b \x01(\t\"N\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\x12\n\n\x06_0_0_2\x10\x02\x12\n\n\x06_0_0_3\x10\x03\x12\n\n\x06_0_1_0\x10\x04\"\x99\x0c\n\x08Language\x12\x14\n\x10UNKNOWN_LANGUAGE\x10\x00\x12\x06\n\x02\x65n\x10\x01\x12\x06\n\x02\x61\x61\x10\x02\x12\x06\n\x02\x61\x62\x10\x03\x12\x06\n\x02\x61\x65\x10\x04\x12\x06\n\x02\x61\x66\x10\x05\x12\x06\n\x02\x61k\x10\x06\x12\x06\n\x02\x61m\x10\x07\x12\x06\n\x02\x61n\x10\x08\x12\x06\n\x02\x61r\x10\t\x12\x06\n\x02\x61s\x10\n\x12\x06\n\x02\x61v\x10\x0b\x12\x06\n\x02\x61y\x10\x0c\x12\x06\n\x02\x61z\x10\r\x12\x06\n\x02\x62\x61\x10\x0e\x12\x06\n\x02\x62\x65\x10\x0f\x12\x06\n\x02\x62g\x10\x10\x12\x06\n\x02\x62h\x10\x11\x12\x06\n\x02\x62i\x10\x12\x12\x06\n\x02\x62m\x10\x13\x12\x06\n\x02\x62n\x10\x14\x12\x06\n\x02\x62o\x10\x15\x12\x06\n\x02\x62r\x10\x16\x12\x06\n\x02\x62s\x10\x17\x12\x06\n\x02\x63\x61\x10\x18\x12\x06\n\x02\x63\x65\x10\x19\x12\x06\n\x02\x63h\x10\x1a\x12\x06\n\x02\x63o\x10\x1b\x12\x06\n\x02\x63r\x10\x1c\x12\x06\n\x02\x63s\x10\x1d\x12\x06\n\x02\x63u\x10\x1e\x12\x06\n\x02\x63v\x10\x1f\x12\x06\n\x02\x63y\x10 \x12\x06\n\x02\x64\x61\x10!\x12\x06\n\x02\x64\x65\x10\"\x12\x06\n\x02\x64v\x10#\x12\x06\n\x02\x64z\x10$\x12\x06\n\x02\x65\x65\x10%\x12\x06\n\x02\x65l\x10&\x12\x06\n\x02\x65o\x10\'\x12\x06\n\x02\x65s\x10(\x12\x06\n\x02\x65t\x10)\x12\x06\n\x02\x65u\x10*\x12\x06\n\x02\x66\x61\x10+\x12\x06\n\x02\x66\x66\x10,\x12\x06\n\x02\x66i\x10-\x12\x06\n\x02\x66j\x10.\x12\x06\n\x02\x66o\x10/\x12\x06\n\x02\x66r\x10\x30\x12\x06\n\x02\x66y\x10\x31\x12\x06\n\x02ga\x10\x32\x12\x06\n\x02gd\x10\x33\x12\x06\n\x02gl\x10\x34\x12\x06\n\x02gn\x10\x35\x12\x06\n\x02gu\x10\x36\x12\x06\n\x02gv\x10\x37\x12\x06\n\x02ha\x10\x38\x12\x06\n\x02he\x10\x39\x12\x06\n\x02hi\x10:\x12\x06\n\x02ho\x10;\x12\x06\n\x02hr\x10<\x12\x06\n\x02ht\x10=\x12\x06\n\x02hu\x10>\x12\x06\n\x02hy\x10?\x12\x06\n\x02hz\x10@\x12\x06\n\x02ia\x10\x41\x12\x06\n\x02id\x10\x42\x12\x06\n\x02ie\x10\x43\x12\x06\n\x02ig\x10\x44\x12\x06\n\x02ii\x10\x45\x12\x06\n\x02ik\x10\x46\x12\x06\n\x02io\x10G\x12\x06\n\x02is\x10H\x12\x06\n\x02it\x10I\x12\x06\n\x02iu\x10J\x12\x06\n\x02ja\x10K\x12\x06\n\x02jv\x10L\x12\x06\n\x02ka\x10M\x12\x06\n\x02kg\x10N\x12\x06\n\x02ki\x10O\x12\x06\n\x02kj\x10P\x12\x06\n\x02kk\x10Q\x12\x06\n\x02kl\x10R\x12\x06\n\x02km\x10S\x12\x06\n\x02kn\x10T\x12\x06\n\x02ko\x10U\x12\x06\n\x02kr\x10V\x12\x06\n\x02ks\x10W\x12\x06\n\x02ku\x10X\x12\x06\n\x02kv\x10Y\x12\x06\n\x02kw\x10Z\x12\x06\n\x02ky\x10[\x12\x06\n\x02la\x10\\\x12\x06\n\x02lb\x10]\x12\x06\n\x02lg\x10^\x12\x06\n\x02li\x10_\x12\x06\n\x02ln\x10`\x12\x06\n\x02lo\x10\x61\x12\x06\n\x02lt\x10\x62\x12\x06\n\x02lu\x10\x63\x12\x06\n\x02lv\x10\x64\x12\x06\n\x02mg\x10\x65\x12\x06\n\x02mh\x10\x66\x12\x06\n\x02mi\x10g\x12\x06\n\x02mk\x10h\x12\x06\n\x02ml\x10i\x12\x06\n\x02mn\x10j\x12\x06\n\x02mr\x10k\x12\x06\n\x02ms\x10l\x12\x06\n\x02mt\x10m\x12\x06\n\x02my\x10n\x12\x06\n\x02na\x10o\x12\x06\n\x02nb\x10p\x12\x06\n\x02nd\x10q\x12\x06\n\x02ne\x10r\x12\x06\n\x02ng\x10s\x12\x06\n\x02nl\x10t\x12\x06\n\x02nn\x10u\x12\x06\n\x02no\x10v\x12\x06\n\x02nr\x10w\x12\x06\n\x02nv\x10x\x12\x06\n\x02ny\x10y\x12\x06\n\x02oc\x10z\x12\x06\n\x02oj\x10{\x12\x06\n\x02om\x10|\x12\x06\n\x02or\x10}\x12\x06\n\x02os\x10~\x12\x06\n\x02pa\x10\x7f\x12\x07\n\x02pi\x10\x80\x01\x12\x07\n\x02pl\x10\x81\x01\x12\x07\n\x02ps\x10\x82\x01\x12\x07\n\x02pt\x10\x83\x01\x12\x07\n\x02qu\x10\x84\x01\x12\x07\n\x02rm\x10\x85\x01\x12\x07\n\x02rn\x10\x86\x01\x12\x07\n\x02ro\x10\x87\x01\x12\x07\n\x02ru\x10\x88\x01\x12\x07\n\x02rw\x10\x89\x01\x12\x07\n\x02sa\x10\x8a\x01\x12\x07\n\x02sc\x10\x8b\x01\x12\x07\n\x02sd\x10\x8c\x01\x12\x07\n\x02se\x10\x8d\x01\x12\x07\n\x02sg\x10\x8e\x01\x12\x07\n\x02si\x10\x8f\x01\x12\x07\n\x02sk\x10\x90\x01\x12\x07\n\x02sl\x10\x91\x01\x12\x07\n\x02sm\x10\x92\x01\x12\x07\n\x02sn\x10\x93\x01\x12\x07\n\x02so\x10\x94\x01\x12\x07\n\x02sq\x10\x95\x01\x12\x07\n\x02sr\x10\x96\x01\x12\x07\n\x02ss\x10\x97\x01\x12\x07\n\x02st\x10\x98\x01\x12\x07\n\x02su\x10\x99\x01\x12\x07\n\x02sv\x10\x9a\x01\x12\x07\n\x02sw\x10\x9b\x01\x12\x07\n\x02ta\x10\x9c\x01\x12\x07\n\x02te\x10\x9d\x01\x12\x07\n\x02tg\x10\x9e\x01\x12\x07\n\x02th\x10\x9f\x01\x12\x07\n\x02ti\x10\xa0\x01\x12\x07\n\x02tk\x10\xa1\x01\x12\x07\n\x02tl\x10\xa2\x01\x12\x07\n\x02tn\x10\xa3\x01\x12\x07\n\x02to\x10\xa4\x01\x12\x07\n\x02tr\x10\xa5\x01\x12\x07\n\x02ts\x10\xa6\x01\x12\x07\n\x02tt\x10\xa7\x01\x12\x07\n\x02tw\x10\xa8\x01\x12\x07\n\x02ty\x10\xa9\x01\x12\x07\n\x02ug\x10\xaa\x01\x12\x07\n\x02uk\x10\xab\x01\x12\x07\n\x02ur\x10\xac\x01\x12\x07\n\x02uz\x10\xad\x01\x12\x07\n\x02ve\x10\xae\x01\x12\x07\n\x02vi\x10\xaf\x01\x12\x07\n\x02vo\x10\xb0\x01\x12\x07\n\x02wa\x10\xb1\x01\x12\x07\n\x02wo\x10\xb2\x01\x12\x07\n\x02xh\x10\xb3\x01\x12\x07\n\x02yi\x10\xb4\x01\x12\x07\n\x02yo\x10\xb5\x01\x12\x07\n\x02za\x10\xb6\x01\x12\x07\n\x02zh\x10\xb7\x01\x12\x07\n\x02zu\x10\xb8\x01')
   ,
   dependencies=[fee__pb2.DESCRIPTOR,])
 
@@ -28,877 +28,877 @@ DESCRIPTOR = _descriptor.FileDescriptor(
 
 _METADATA_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Metadata.Version',
+  full_name='legacy_pb.Metadata.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_2', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_3', index=3, number=3,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_1_0', index=4, number=4,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=287,
-  serialized_end=365,
+  serialized_options=None,
+  serialized_start=315,
+  serialized_end=393,
 )
 _sym_db.RegisterEnumDescriptor(_METADATA_VERSION)
 
 _METADATA_LANGUAGE = _descriptor.EnumDescriptor(
   name='Language',
-  full_name='pb.Metadata.Language',
+  full_name='legacy_pb.Metadata.Language',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_LANGUAGE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='en', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='aa', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ab', index=3, number=3,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ae', index=4, number=4,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='af', index=5, number=5,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ak', index=6, number=6,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='am', index=7, number=7,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='an', index=8, number=8,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ar', index=9, number=9,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='as', index=10, number=10,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='av', index=11, number=11,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ay', index=12, number=12,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='az', index=13, number=13,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ba', index=14, number=14,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='be', index=15, number=15,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='bg', index=16, number=16,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='bh', index=17, number=17,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='bi', index=18, number=18,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='bm', index=19, number=19,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='bn', index=20, number=20,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='bo', index=21, number=21,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='br', index=22, number=22,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='bs', index=23, number=23,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ca', index=24, number=24,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ce', index=25, number=25,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ch', index=26, number=26,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='co', index=27, number=27,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='cr', index=28, number=28,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='cs', index=29, number=29,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='cu', index=30, number=30,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='cv', index=31, number=31,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='cy', index=32, number=32,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='da', index=33, number=33,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='de', index=34, number=34,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='dv', index=35, number=35,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='dz', index=36, number=36,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ee', index=37, number=37,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='el', index=38, number=38,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='eo', index=39, number=39,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='es', index=40, number=40,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='et', index=41, number=41,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='eu', index=42, number=42,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='fa', index=43, number=43,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ff', index=44, number=44,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='fi', index=45, number=45,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='fj', index=46, number=46,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='fo', index=47, number=47,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='fr', index=48, number=48,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='fy', index=49, number=49,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ga', index=50, number=50,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='gd', index=51, number=51,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='gl', index=52, number=52,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='gn', index=53, number=53,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='gu', index=54, number=54,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='gv', index=55, number=55,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ha', index=56, number=56,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='he', index=57, number=57,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='hi', index=58, number=58,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ho', index=59, number=59,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='hr', index=60, number=60,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ht', index=61, number=61,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='hu', index=62, number=62,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='hy', index=63, number=63,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='hz', index=64, number=64,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ia', index=65, number=65,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='id', index=66, number=66,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ie', index=67, number=67,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ig', index=68, number=68,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ii', index=69, number=69,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ik', index=70, number=70,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='io', index=71, number=71,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='is', index=72, number=72,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='it', index=73, number=73,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='iu', index=74, number=74,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ja', index=75, number=75,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='jv', index=76, number=76,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ka', index=77, number=77,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kg', index=78, number=78,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ki', index=79, number=79,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kj', index=80, number=80,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kk', index=81, number=81,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kl', index=82, number=82,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='km', index=83, number=83,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kn', index=84, number=84,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ko', index=85, number=85,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kr', index=86, number=86,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ks', index=87, number=87,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ku', index=88, number=88,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kv', index=89, number=89,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='kw', index=90, number=90,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ky', index=91, number=91,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='la', index=92, number=92,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lb', index=93, number=93,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lg', index=94, number=94,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='li', index=95, number=95,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ln', index=96, number=96,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lo', index=97, number=97,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lt', index=98, number=98,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lu', index=99, number=99,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lv', index=100, number=100,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='mg', index=101, number=101,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='mh', index=102, number=102,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='mi', index=103, number=103,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='mk', index=104, number=104,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ml', index=105, number=105,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='mn', index=106, number=106,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='mr', index=107, number=107,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ms', index=108, number=108,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='mt', index=109, number=109,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='my', index=110, number=110,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='na', index=111, number=111,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='nb', index=112, number=112,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='nd', index=113, number=113,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ne', index=114, number=114,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ng', index=115, number=115,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='nl', index=116, number=116,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='nn', index=117, number=117,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='no', index=118, number=118,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='nr', index=119, number=119,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='nv', index=120, number=120,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ny', index=121, number=121,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='oc', index=122, number=122,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='oj', index=123, number=123,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='om', index=124, number=124,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='or', index=125, number=125,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='os', index=126, number=126,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='pa', index=127, number=127,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='pi', index=128, number=128,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='pl', index=129, number=129,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ps', index=130, number=130,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='pt', index=131, number=131,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='qu', index=132, number=132,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='rm', index=133, number=133,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='rn', index=134, number=134,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ro', index=135, number=135,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ru', index=136, number=136,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='rw', index=137, number=137,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sa', index=138, number=138,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sc', index=139, number=139,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sd', index=140, number=140,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='se', index=141, number=141,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sg', index=142, number=142,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='si', index=143, number=143,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sk', index=144, number=144,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sl', index=145, number=145,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sm', index=146, number=146,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sn', index=147, number=147,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='so', index=148, number=148,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sq', index=149, number=149,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sr', index=150, number=150,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ss', index=151, number=151,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='st', index=152, number=152,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='su', index=153, number=153,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sv', index=154, number=154,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='sw', index=155, number=155,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ta', index=156, number=156,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='te', index=157, number=157,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='tg', index=158, number=158,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='th', index=159, number=159,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ti', index=160, number=160,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='tk', index=161, number=161,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='tl', index=162, number=162,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='tn', index=163, number=163,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='to', index=164, number=164,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='tr', index=165, number=165,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ts', index=166, number=166,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='tt', index=167, number=167,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='tw', index=168, number=168,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ty', index=169, number=169,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ug', index=170, number=170,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='uk', index=171, number=171,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ur', index=172, number=172,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='uz', index=173, number=173,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ve', index=174, number=174,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='vi', index=175, number=175,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='vo', index=176, number=176,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='wa', index=177, number=177,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='wo', index=178, number=178,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='xh', index=179, number=179,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='yi', index=180, number=180,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='yo', index=181, number=181,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='za', index=182, number=182,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='zh', index=183, number=183,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='zu', index=184, number=184,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=368,
-  serialized_end=1929,
+  serialized_options=None,
+  serialized_start=396,
+  serialized_end=1957,
 )
 _sym_db.RegisterEnumDescriptor(_METADATA_LANGUAGE)
 
 
 _METADATA = _descriptor.Descriptor(
   name='Metadata',
-  full_name='pb.Metadata',
+  full_name='legacy_pb.Metadata',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Metadata.version', index=0,
+      name='version', full_name='legacy_pb.Metadata.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='language', full_name='pb.Metadata.language', index=1,
+      name='language', full_name='legacy_pb.Metadata.language', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='title', full_name='pb.Metadata.title', index=2,
+      name='title', full_name='legacy_pb.Metadata.title', index=2,
       number=3, type=9, cpp_type=9, label=2,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='description', full_name='pb.Metadata.description', index=3,
+      name='description', full_name='legacy_pb.Metadata.description', index=3,
       number=4, type=9, cpp_type=9, label=2,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='author', full_name='pb.Metadata.author', index=4,
+      name='author', full_name='legacy_pb.Metadata.author', index=4,
       number=5, type=9, cpp_type=9, label=2,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='license', full_name='pb.Metadata.license', index=5,
+      name='license', full_name='legacy_pb.Metadata.license', index=5,
       number=6, type=9, cpp_type=9, label=2,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='nsfw', full_name='pb.Metadata.nsfw', index=6,
+      name='nsfw', full_name='legacy_pb.Metadata.nsfw', index=6,
       number=7, type=8, cpp_type=7, label=2,
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='fee', full_name='pb.Metadata.fee', index=7,
+      name='fee', full_name='legacy_pb.Metadata.fee', index=7,
       number=8, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='thumbnail', full_name='pb.Metadata.thumbnail', index=8,
+      name='thumbnail', full_name='legacy_pb.Metadata.thumbnail', index=8,
       number=9, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='preview', full_name='pb.Metadata.preview', index=9,
+      name='preview', full_name='legacy_pb.Metadata.preview', index=9,
       number=10, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='licenseUrl', full_name='pb.Metadata.licenseUrl', index=10,
+      name='licenseUrl', full_name='legacy_pb.Metadata.licenseUrl', index=10,
       number=11, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -907,14 +907,14 @@ _METADATA = _descriptor.Descriptor(
     _METADATA_VERSION,
     _METADATA_LANGUAGE,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=34,
-  serialized_end=1929,
+  serialized_start=41,
+  serialized_end=1957,
 )
 
 _METADATA.fields_by_name['version'].enum_type = _METADATA_VERSION
@@ -928,7 +928,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Metadata = _reflection.GeneratedProtocolMessageType('Metadata', (_message.Message,), dict(
   DESCRIPTOR = _METADATA,
   __module__ = 'metadata_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Metadata)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Metadata)
   ))
 _sym_db.RegisterMessage(Metadata)
 
diff --git a/v1/python/signature_pb2.py b/v1/python/signature_pb2.py
index 9189a52..f555cc2 100644
--- a/v1/python/signature_pb2.py
+++ b/v1/python/signature_pb2.py
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,9 +17,10 @@ import certificate_pb2 as certificate__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='signature.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0fsignature.proto\x12\x02pb\x1a\x11\x63\x65rtificate.proto\"\xad\x01\n\tSignature\x12&\n\x07version\x18\x01 \x02(\x0e\x32\x15.pb.Signature.Version\x12\"\n\rsignatureType\x18\x02 \x02(\x0e\x32\x0b.pb.KeyType\x12\x11\n\tsignature\x18\x03 \x02(\x0c\x12\x15\n\rcertificateId\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
+  serialized_options=None,
+  serialized_pb=_b('\n\x0fsignature.proto\x12\tlegacy_pb\x1a\x11\x63\x65rtificate.proto\"\xbb\x01\n\tSignature\x12-\n\x07version\x18\x01 \x02(\x0e\x32\x1c.legacy_pb.Signature.Version\x12)\n\rsignatureType\x18\x02 \x02(\x0e\x32\x12.legacy_pb.KeyType\x12\x11\n\tsignature\x18\x03 \x02(\x0c\x12\x15\n\rcertificateId\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
   ,
   dependencies=[certificate__pb2.DESCRIPTOR,])
 
@@ -28,62 +28,62 @@ DESCRIPTOR = _descriptor.FileDescriptor(
 
 _SIGNATURE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Signature.Version',
+  full_name='legacy_pb.Signature.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=174,
-  serialized_end=216,
+  serialized_options=None,
+  serialized_start=195,
+  serialized_end=237,
 )
 _sym_db.RegisterEnumDescriptor(_SIGNATURE_VERSION)
 
 
 _SIGNATURE = _descriptor.Descriptor(
   name='Signature',
-  full_name='pb.Signature',
+  full_name='legacy_pb.Signature',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Signature.version', index=0,
+      name='version', full_name='legacy_pb.Signature.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='signatureType', full_name='pb.Signature.signatureType', index=1,
+      name='signatureType', full_name='legacy_pb.Signature.signatureType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='signature', full_name='pb.Signature.signature', index=2,
+      name='signature', full_name='legacy_pb.Signature.signature', index=2,
       number=3, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='certificateId', full_name='pb.Signature.certificateId', index=3,
+      name='certificateId', full_name='legacy_pb.Signature.certificateId', index=3,
       number=4, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -91,14 +91,14 @@ _SIGNATURE = _descriptor.Descriptor(
   enum_types=[
     _SIGNATURE_VERSION,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=43,
-  serialized_end=216,
+  serialized_start=50,
+  serialized_end=237,
 )
 
 _SIGNATURE.fields_by_name['version'].enum_type = _SIGNATURE_VERSION
@@ -110,7 +110,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Signature = _reflection.GeneratedProtocolMessageType('Signature', (_message.Message,), dict(
   DESCRIPTOR = _SIGNATURE,
   __module__ = 'signature_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Signature)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Signature)
   ))
 _sym_db.RegisterMessage(Signature)
 
diff --git a/v1/python/source_pb2.py b/v1/python/source_pb2.py
index 2e8384f..7c3bf69 100644
--- a/v1/python/source_pb2.py
+++ b/v1/python/source_pb2.py
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -17,93 +16,94 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='source.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0csource.proto\x12\x02pb\"\xe4\x01\n\x06Source\x12#\n\x07version\x18\x01 \x02(\x0e\x32\x12.pb.Source.Version\x12*\n\nsourceType\x18\x02 \x02(\x0e\x32\x16.pb.Source.SourceTypes\x12\x0e\n\x06source\x18\x03 \x02(\x0c\x12\x13\n\x0b\x63ontentType\x18\x04 \x02(\t\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"8\n\x0bSourceTypes\x12\x17\n\x13UNKNOWN_SOURCE_TYPE\x10\x00\x12\x10\n\x0clbry_sd_hash\x10\x01')
+  serialized_options=None,
+  serialized_pb=_b('\n\x0csource.proto\x12\tlegacy_pb\"\xf2\x01\n\x06Source\x12*\n\x07version\x18\x01 \x02(\x0e\x32\x19.legacy_pb.Source.Version\x12\x31\n\nsourceType\x18\x02 \x02(\x0e\x32\x1d.legacy_pb.Source.SourceTypes\x12\x0e\n\x06source\x18\x03 \x02(\x0c\x12\x13\n\x0b\x63ontentType\x18\x04 \x02(\t\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"8\n\x0bSourceTypes\x12\x17\n\x13UNKNOWN_SOURCE_TYPE\x10\x00\x12\x10\n\x0clbry_sd_hash\x10\x01')
 )
 
 
 
 _SOURCE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Source.Version',
+  full_name='legacy_pb.Source.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=149,
-  serialized_end=191,
+  serialized_options=None,
+  serialized_start=170,
+  serialized_end=212,
 )
 _sym_db.RegisterEnumDescriptor(_SOURCE_VERSION)
 
 _SOURCE_SOURCETYPES = _descriptor.EnumDescriptor(
   name='SourceTypes',
-  full_name='pb.Source.SourceTypes',
+  full_name='legacy_pb.Source.SourceTypes',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_SOURCE_TYPE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lbry_sd_hash', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=193,
-  serialized_end=249,
+  serialized_options=None,
+  serialized_start=214,
+  serialized_end=270,
 )
 _sym_db.RegisterEnumDescriptor(_SOURCE_SOURCETYPES)
 
 
 _SOURCE = _descriptor.Descriptor(
   name='Source',
-  full_name='pb.Source',
+  full_name='legacy_pb.Source',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Source.version', index=0,
+      name='version', full_name='legacy_pb.Source.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='sourceType', full_name='pb.Source.sourceType', index=1,
+      name='sourceType', full_name='legacy_pb.Source.sourceType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='source', full_name='pb.Source.source', index=2,
+      name='source', full_name='legacy_pb.Source.source', index=2,
       number=3, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='contentType', full_name='pb.Source.contentType', index=3,
+      name='contentType', full_name='legacy_pb.Source.contentType', index=3,
       number=4, type=9, cpp_type=9, label=2,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -112,14 +112,14 @@ _SOURCE = _descriptor.Descriptor(
     _SOURCE_VERSION,
     _SOURCE_SOURCETYPES,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=21,
-  serialized_end=249,
+  serialized_start=28,
+  serialized_end=270,
 )
 
 _SOURCE.fields_by_name['version'].enum_type = _SOURCE_VERSION
@@ -132,7 +132,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,), dict(
   DESCRIPTOR = _SOURCE,
   __module__ = 'source_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Source)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Source)
   ))
 _sym_db.RegisterMessage(Source)
 
diff --git a/v1/python/stream_pb2.py b/v1/python/stream_pb2.py
index 3a29306..d154778 100644
--- a/v1/python/stream_pb2.py
+++ b/v1/python/stream_pb2.py
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,9 +18,10 @@ import source_pb2 as source__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='stream.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0cstream.proto\x12\x02pb\x1a\x0emetadata.proto\x1a\x0csource.proto\"\x95\x01\n\x06Stream\x12#\n\x07version\x18\x01 \x02(\x0e\x32\x12.pb.Stream.Version\x12\x1e\n\x08metadata\x18\x02 \x02(\x0b\x32\x0c.pb.Metadata\x12\x1a\n\x06source\x18\x03 \x02(\x0b\x32\n.pb.Source\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
+  serialized_options=None,
+  serialized_pb=_b('\n\x0cstream.proto\x12\tlegacy_pb\x1a\x0emetadata.proto\x1a\x0csource.proto\"\xaa\x01\n\x06Stream\x12*\n\x07version\x18\x01 \x02(\x0e\x32\x19.legacy_pb.Stream.Version\x12%\n\x08metadata\x18\x02 \x02(\x0b\x32\x13.legacy_pb.Metadata\x12!\n\x06source\x18\x03 \x02(\x0b\x32\x11.legacy_pb.Source\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
   ,
   dependencies=[metadata__pb2.DESCRIPTOR,source__pb2.DESCRIPTOR,])
 
@@ -29,55 +29,55 @@ DESCRIPTOR = _descriptor.FileDescriptor(
 
 _STREAM_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Stream.Version',
+  full_name='legacy_pb.Stream.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=158,
-  serialized_end=200,
+  serialized_options=None,
+  serialized_start=186,
+  serialized_end=228,
 )
 _sym_db.RegisterEnumDescriptor(_STREAM_VERSION)
 
 
 _STREAM = _descriptor.Descriptor(
   name='Stream',
-  full_name='pb.Stream',
+  full_name='legacy_pb.Stream',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Stream.version', index=0,
+      name='version', full_name='legacy_pb.Stream.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='metadata', full_name='pb.Stream.metadata', index=1,
+      name='metadata', full_name='legacy_pb.Stream.metadata', index=1,
       number=2, type=11, cpp_type=10, label=2,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='source', full_name='pb.Stream.source', index=2,
+      name='source', full_name='legacy_pb.Stream.source', index=2,
       number=3, type=11, cpp_type=10, label=2,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -85,14 +85,14 @@ _STREAM = _descriptor.Descriptor(
   enum_types=[
     _STREAM_VERSION,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=51,
-  serialized_end=200,
+  serialized_start=58,
+  serialized_end=228,
 )
 
 _STREAM.fields_by_name['version'].enum_type = _STREAM_VERSION
@@ -105,7 +105,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Stream = _reflection.GeneratedProtocolMessageType('Stream', (_message.Message,), dict(
   DESCRIPTOR = _STREAM,
   __module__ = 'stream_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Stream)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Stream)
   ))
 _sym_db.RegisterMessage(Stream)
 
diff --git a/v2/cpp/claim.pb.cc b/v2/cpp/claim.pb.cc
index 2a9ac7a..ec9a2f5 100644
--- a/v2/cpp/claim.pb.cc
+++ b/v2/cpp/claim.pb.cc
@@ -6,48 +6,60 @@
 #include <algorithm>
 
 #include <google/protobuf/stubs/common.h>
+#include <google/protobuf/stubs/port.h>
 #include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
 #include <google/protobuf/wire_format_lite_inl.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
+// This is a temporary google only hack
+#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
+#include "third_party/protobuf/version.h"
+#endif
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
 
-extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Channel_claim_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Fee_claim_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_File_claim_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Video_claim_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_Stream_claim_2eproto;
+namespace protobuf_claim_2eproto {
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Channel;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Fee;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_File;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Video;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_Stream;
+}  // namespace protobuf_claim_2eproto
 namespace pb {
 class ClaimDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Claim> _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Claim>
+      _instance;
 } _Claim_default_instance_;
 class ChannelDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Channel> _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Channel>
+      _instance;
 } _Channel_default_instance_;
 class StreamDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Stream> _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Stream>
+      _instance;
 } _Stream_default_instance_;
 class FeeDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Fee> _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Fee>
+      _instance;
 } _Fee_default_instance_;
 class FileDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<File> _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<File>
+      _instance;
 } _File_default_instance_;
 class VideoDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Video> _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Video>
+      _instance;
 } _Video_default_instance_;
 }  // namespace pb
-static void InitDefaultsClaim_claim_2eproto() {
+namespace protobuf_claim_2eproto {
+static void InitDefaultsClaim() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -58,12 +70,12 @@ static void InitDefaultsClaim_claim_2eproto() {
   ::pb::Claim::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<2> scc_info_Claim_claim_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsClaim_claim_2eproto}, {
-      &scc_info_Stream_claim_2eproto.base,
-      &scc_info_Channel_claim_2eproto.base,}};
+::google::protobuf::internal::SCCInfo<2> scc_info_Claim =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsClaim}, {
+      &protobuf_claim_2eproto::scc_info_Stream.base,
+      &protobuf_claim_2eproto::scc_info_Channel.base,}};
 
-static void InitDefaultsChannel_claim_2eproto() {
+static void InitDefaultsChannel() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -74,10 +86,10 @@ static void InitDefaultsChannel_claim_2eproto() {
   ::pb::Channel::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_Channel_claim_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsChannel_claim_2eproto}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_Channel =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsChannel}, {}};
 
-static void InitDefaultsStream_claim_2eproto() {
+static void InitDefaultsStream() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -88,13 +100,13 @@ static void InitDefaultsStream_claim_2eproto() {
   ::pb::Stream::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<3> scc_info_Stream_claim_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsStream_claim_2eproto}, {
-      &scc_info_File_claim_2eproto.base,
-      &scc_info_Fee_claim_2eproto.base,
-      &scc_info_Video_claim_2eproto.base,}};
+::google::protobuf::internal::SCCInfo<3> scc_info_Stream =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsStream}, {
+      &protobuf_claim_2eproto::scc_info_File.base,
+      &protobuf_claim_2eproto::scc_info_Fee.base,
+      &protobuf_claim_2eproto::scc_info_Video.base,}};
 
-static void InitDefaultsFee_claim_2eproto() {
+static void InitDefaultsFee() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -105,10 +117,10 @@ static void InitDefaultsFee_claim_2eproto() {
   ::pb::Fee::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_Fee_claim_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsFee_claim_2eproto}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_Fee =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsFee}, {}};
 
-static void InitDefaultsFile_claim_2eproto() {
+static void InitDefaultsFile() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -119,10 +131,10 @@ static void InitDefaultsFile_claim_2eproto() {
   ::pb::File::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_File_claim_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsFile_claim_2eproto}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_File =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsFile}, {}};
 
-static void InitDefaultsVideo_claim_2eproto() {
+static void InitDefaultsVideo() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -133,93 +145,93 @@ static void InitDefaultsVideo_claim_2eproto() {
   ::pb::Video::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_Video_claim_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsVideo_claim_2eproto}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_Video =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsVideo}, {}};
 
-void InitDefaults_claim_2eproto() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Claim_claim_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_Channel_claim_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_Stream_claim_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_Fee_claim_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_File_claim_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_Video_claim_2eproto.base);
+void InitDefaults() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Claim.base);
+  ::google::protobuf::internal::InitSCC(&scc_info_Channel.base);
+  ::google::protobuf::internal::InitSCC(&scc_info_Stream.base);
+  ::google::protobuf::internal::InitSCC(&scc_info_Fee.base);
+  ::google::protobuf::internal::InitSCC(&scc_info_File.base);
+  ::google::protobuf::internal::InitSCC(&scc_info_Video.base);
 }
 
-::google::protobuf::Metadata file_level_metadata_claim_2eproto[6];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_claim_2eproto[2];
-constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_claim_2eproto = nullptr;
+::google::protobuf::Metadata file_level_metadata[6];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
 
-const ::google::protobuf::uint32 TableStruct_claim_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Claim, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::pb::Claim, type_),
-  PROTOBUF_FIELD_OFFSET(::pb::Claim, stream_),
-  PROTOBUF_FIELD_OFFSET(::pb::Claim, channel_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, type_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, stream_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, channel_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, public_key_),
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, title_),
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, description_),
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, contact_email_),
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, homepage_url_),
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, thumbnail_url_),
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, cover_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, public_key_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, title_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, description_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, contact_email_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, homepage_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, tags_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, thumbnail_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Channel, cover_url_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, hash_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, language_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, title_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, author_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, description_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, media_type_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, license_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, file_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, fee_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, license_url_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, thumbnail_url_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, duration_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, tags_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, release_time_),
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, video_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, hash_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, language_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, title_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, author_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, description_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, media_type_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, license_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, file_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, fee_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, license_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, thumbnail_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, duration_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, tags_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, release_time_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, video_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Fee, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::pb::Fee, currency_),
-  PROTOBUF_FIELD_OFFSET(::pb::Fee, address_),
-  PROTOBUF_FIELD_OFFSET(::pb::Fee, amount_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, currency_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, address_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, amount_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::File, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::File, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::pb::File, name_),
-  PROTOBUF_FIELD_OFFSET(::pb::File, size_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::File, name_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::File, size_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Video, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Video, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::pb::Video, width_),
-  PROTOBUF_FIELD_OFFSET(::pb::Video, height_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Video, width_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Video, height_),
 };
-static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
   { 0, -1, sizeof(::pb::Claim)},
   { 8, -1, sizeof(::pb::Channel)},
-  { 20, -1, sizeof(::pb::Stream)},
-  { 40, -1, sizeof(::pb::Fee)},
-  { 48, -1, sizeof(::pb::File)},
-  { 55, -1, sizeof(::pb::Video)},
+  { 21, -1, sizeof(::pb::Stream)},
+  { 41, -1, sizeof(::pb::Fee)},
+  { 49, -1, sizeof(::pb::File)},
+  { 56, -1, sizeof(::pb::Video)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -231,53 +243,70 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Video_default_instance_),
 };
 
-::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_claim_2eproto = {
-  {}, AddDescriptors_claim_2eproto, "claim.proto", schemas,
-  file_default_instances, TableStruct_claim_2eproto::offsets,
-  file_level_metadata_claim_2eproto, 6, file_level_enum_descriptors_claim_2eproto, file_level_service_descriptors_claim_2eproto,
-};
-
-const char descriptor_table_protodef_claim_2eproto[] =
-  "\n\013claim.proto\022\002pb\"\200\001\n\005Claim\022\034\n\004type\030\001 \001("
-  "\0162\016.pb.Claim.Type\022\032\n\006stream\030\002 \001(\0132\n.pb.S"
-  "tream\022\034\n\007channel\030\003 \001(\0132\013.pb.Channel\"\037\n\004T"
-  "ype\022\n\n\006STREAM\020\000\022\013\n\007CHANNEL\020\001\"\230\001\n\007Channel"
-  "\022\022\n\npublic_key\030\001 \001(\014\022\r\n\005title\030\002 \001(\t\022\023\n\013d"
-  "escription\030\003 \001(\t\022\025\n\rcontact_email\030\004 \001(\t\022"
-  "\024\n\014homepage_url\030\005 \001(\t\022\025\n\rthumbnail_url\030\020"
-  " \001(\t\022\021\n\tcover_url\030\021 \001(\t\"\253\002\n\006Stream\022\014\n\004ha"
-  "sh\030\001 \001(\014\022\020\n\010language\030\002 \001(\t\022\r\n\005title\030\003 \001("
-  "\t\022\016\n\006author\030\004 \001(\t\022\023\n\013description\030\005 \001(\t\022\022"
-  "\n\nmedia_type\030\006 \001(\t\022\017\n\007license\030\007 \001(\t\022\026\n\004f"
-  "ile\030\010 \001(\0132\010.pb.File\022\024\n\003fee\030\020 \001(\0132\007.pb.Fe"
-  "e\022\023\n\013license_url\030\021 \001(\t\022\025\n\rthumbnail_url\030"
-  "\022 \001(\t\022\020\n\010duration\030\023 \001(\r\022\014\n\004tags\030\024 \003(\t\022\024\n"
-  "\014release_time\030\025 \001(\003\022\030\n\005video\030\026 \001(\0132\t.pb."
-  "Video\"h\n\003Fee\022\"\n\010currency\030\001 \001(\0162\020.pb.Fee."
-  "Currency\022\017\n\007address\030\002 \001(\014\022\016\n\006amount\030\003 \001("
-  "\004\"\034\n\010Currency\022\007\n\003LBC\020\000\022\007\n\003USD\020\001\"\"\n\004File\022"
-  "\014\n\004name\030\001 \001(\t\022\014\n\004size\030\002 \001(\004\"&\n\005Video\022\r\n\005"
-  "width\030\001 \001(\r\022\016\n\006height\030\002 \001(\rb\006proto3"
-  ;
-::google::protobuf::internal::DescriptorTable descriptor_table_claim_2eproto = {
-  false, InitDefaults_claim_2eproto, 
-  descriptor_table_protodef_claim_2eproto,
-  "claim.proto", &assign_descriptors_table_claim_2eproto, 795,
-};
-
-void AddDescriptors_claim_2eproto() {
-  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
-  {
-  };
- ::google::protobuf::internal::AddDescriptors(&descriptor_table_claim_2eproto, deps, 0);
+void protobuf_AssignDescriptors() {
+  AddDescriptors();
+  AssignDescriptors(
+      "claim.proto", schemas, file_default_instances, TableStruct::offsets,
+      file_level_metadata, file_level_enum_descriptors, NULL);
 }
 
-// Force running AddDescriptors() at dynamic initialization time.
-static bool dynamic_init_dummy_claim_2eproto = []() { AddDescriptors_claim_2eproto(); return true; }();
+void protobuf_AssignDescriptorsOnce() {
+  static ::google::protobuf::internal::once_flag once;
+  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
+}
+
+void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
+void protobuf_RegisterTypes(const ::std::string&) {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 6);
+}
+
+void AddDescriptorsImpl() {
+  InitDefaults();
+  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+      "\n\013claim.proto\022\002pb\"\200\001\n\005Claim\022\034\n\004type\030\001 \001("
+      "\0162\016.pb.Claim.Type\022\032\n\006stream\030\002 \001(\0132\n.pb.S"
+      "tream\022\034\n\007channel\030\003 \001(\0132\013.pb.Channel\"\037\n\004T"
+      "ype\022\n\n\006STREAM\020\000\022\013\n\007CHANNEL\020\001\"\246\001\n\007Channel"
+      "\022\022\n\npublic_key\030\001 \001(\014\022\r\n\005title\030\002 \001(\t\022\023\n\013d"
+      "escription\030\003 \001(\t\022\025\n\rcontact_email\030\004 \001(\t\022"
+      "\024\n\014homepage_url\030\005 \001(\t\022\014\n\004tags\030\006 \003(\t\022\025\n\rt"
+      "humbnail_url\030\020 \001(\t\022\021\n\tcover_url\030\021 \001(\t\"\253\002"
+      "\n\006Stream\022\014\n\004hash\030\001 \001(\014\022\020\n\010language\030\002 \001(\t"
+      "\022\r\n\005title\030\003 \001(\t\022\016\n\006author\030\004 \001(\t\022\023\n\013descr"
+      "iption\030\005 \001(\t\022\022\n\nmedia_type\030\006 \001(\t\022\017\n\007lice"
+      "nse\030\007 \001(\t\022\026\n\004file\030\010 \001(\0132\010.pb.File\022\024\n\003fee"
+      "\030\020 \001(\0132\007.pb.Fee\022\023\n\013license_url\030\021 \001(\t\022\025\n\r"
+      "thumbnail_url\030\022 \001(\t\022\020\n\010duration\030\023 \001(\r\022\014\n"
+      "\004tags\030\024 \003(\t\022\024\n\014release_time\030\025 \001(\003\022\030\n\005vid"
+      "eo\030\026 \001(\0132\t.pb.Video\"h\n\003Fee\022\"\n\010currency\030\001"
+      " \001(\0162\020.pb.Fee.Currency\022\017\n\007address\030\002 \001(\014\022"
+      "\016\n\006amount\030\003 \001(\004\"\034\n\010Currency\022\007\n\003LBC\020\000\022\007\n\003"
+      "USD\020\001\"\"\n\004File\022\014\n\004name\030\001 \001(\t\022\014\n\004size\030\002 \001("
+      "\004\"&\n\005Video\022\r\n\005width\030\001 \001(\r\022\016\n\006height\030\002 \001("
+      "\rb\006proto3"
+  };
+  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
+      descriptor, 809);
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
+    "claim.proto", &protobuf_RegisterTypes);
+}
+
+void AddDescriptors() {
+  static ::google::protobuf::internal::once_flag once;
+  ::google::protobuf::internal::call_once(once, AddDescriptorsImpl);
+}
+// Force AddDescriptors() to be called at dynamic initialization time.
+struct StaticDescriptorInitializer {
+  StaticDescriptorInitializer() {
+    AddDescriptors();
+  }
+} static_descriptor_initializer;
+}  // namespace protobuf_claim_2eproto
 namespace pb {
 const ::google::protobuf::EnumDescriptor* Claim_Type_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_claim_2eproto);
-  return file_level_enum_descriptors_claim_2eproto[0];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return protobuf_claim_2eproto::file_level_enum_descriptors[0];
 }
 bool Claim_Type_IsValid(int value) {
   switch (value) {
@@ -297,8 +326,8 @@ const Claim_Type Claim::Type_MAX;
 const int Claim::Type_ARRAYSIZE;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 const ::google::protobuf::EnumDescriptor* Fee_Currency_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_claim_2eproto);
-  return file_level_enum_descriptors_claim_2eproto[1];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return protobuf_claim_2eproto::file_level_enum_descriptors[1];
 }
 bool Fee_Currency_IsValid(int value) {
   switch (value) {
@@ -326,20 +355,6 @@ void Claim::InitAsDefaultInstance() {
   ::pb::_Claim_default_instance_._instance.get_mutable()->channel_ = const_cast< ::pb::Channel*>(
       ::pb::Channel::internal_default_instance());
 }
-class Claim::HasBitSetters {
- public:
-  static const ::pb::Stream& stream(const Claim* msg);
-  static const ::pb::Channel& channel(const Claim* msg);
-};
-
-const ::pb::Stream&
-Claim::HasBitSetters::stream(const Claim* msg) {
-  return *msg->stream_;
-}
-const ::pb::Channel&
-Claim::HasBitSetters::channel(const Claim* msg) {
-  return *msg->channel_;
-}
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Claim::kTypeFieldNumber;
 const int Claim::kStreamFieldNumber;
@@ -347,31 +362,31 @@ const int Claim::kChannelFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Claim::Claim()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
+  ::google::protobuf::internal::InitSCC(
+      &protobuf_claim_2eproto::scc_info_Claim.base);
   SharedCtor();
   // @@protoc_insertion_point(constructor:pb.Claim)
 }
 Claim::Claim(const Claim& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr) {
+      _internal_metadata_(NULL) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   if (from.has_stream()) {
     stream_ = new ::pb::Stream(*from.stream_);
   } else {
-    stream_ = nullptr;
+    stream_ = NULL;
   }
   if (from.has_channel()) {
     channel_ = new ::pb::Channel(*from.channel_);
   } else {
-    channel_ = nullptr;
+    channel_ = NULL;
   }
   type_ = from.type_;
   // @@protoc_insertion_point(copy_constructor:pb.Claim)
 }
 
 void Claim::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_Claim_claim_2eproto.base);
   ::memset(&stream_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&type_) -
       reinterpret_cast<char*>(&stream_)) + sizeof(type_));
@@ -390,8 +405,13 @@ void Claim::SharedDtor() {
 void Claim::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Claim::descriptor() {
+  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
+}
+
 const Claim& Claim::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_Claim_claim_2eproto.base);
+  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_Claim.base);
   return *internal_default_instance();
 }
 
@@ -402,88 +422,21 @@ void Claim::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  if (GetArenaNoVirtual() == nullptr && stream_ != nullptr) {
+  if (GetArenaNoVirtual() == NULL && stream_ != NULL) {
     delete stream_;
   }
-  stream_ = nullptr;
-  if (GetArenaNoVirtual() == nullptr && channel_ != nullptr) {
+  stream_ = NULL;
+  if (GetArenaNoVirtual() == NULL && channel_ != NULL) {
     delete channel_;
   }
-  channel_ = nullptr;
+  channel_ = NULL;
   type_ = 0;
   _internal_metadata_.Clear();
 }
 
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* Claim::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast<Claim*>(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // .pb.Claim.Type type = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
-        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
-        msg->set_type(static_cast<::pb::Claim_Type>(val));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      // .pb.Stream stream = 2;
-      case 2: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        parser_till_end = ::pb::Stream::_InternalParse;
-        object = msg->mutable_stream();
-        if (size > end - ptr) goto len_delim_till_end;
-        ptr += size;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-            {parser_till_end, object}, ptr - size, ptr));
-        break;
-      }
-      // .pb.Channel channel = 3;
-      case 3: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        parser_till_end = ::pb::Channel::_InternalParse;
-        object = msg->mutable_channel();
-        if (size > end - ptr) goto len_delim_till_end;
-        ptr += size;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-            {parser_till_end, object}, ptr - size, ptr));
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Claim::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:pb.Claim)
   for (;;) {
@@ -493,8 +446,9 @@ bool Claim::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // .pb.Claim.Type type = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
-          int value = 0;
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
+          int value;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
@@ -507,7 +461,8 @@ bool Claim::MergePartialFromCodedStream(
 
       // .pb.Stream stream = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_stream()));
         } else {
@@ -518,7 +473,8 @@ bool Claim::MergePartialFromCodedStream(
 
       // .pb.Channel channel = 3;
       case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_channel()));
         } else {
@@ -546,7 +502,6 @@ failure:
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Claim::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -563,24 +518,25 @@ void Claim::SerializeWithCachedSizes(
   // .pb.Stream stream = 2;
   if (this->has_stream()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, HasBitSetters::stream(this), output);
+      2, this->_internal_stream(), output);
   }
 
   // .pb.Channel channel = 3;
   if (this->has_channel()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, HasBitSetters::channel(this), output);
+      3, this->_internal_channel(), output);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
   }
   // @@protoc_insertion_point(serialize_end:pb.Claim)
 }
 
 ::google::protobuf::uint8* Claim::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
   // @@protoc_insertion_point(serialize_to_array_start:pb.Claim)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
@@ -595,19 +551,19 @@ void Claim::SerializeWithCachedSizes(
   if (this->has_stream()) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        2, HasBitSetters::stream(this), target);
+        2, this->_internal_stream(), deterministic, target);
   }
 
   // .pb.Channel channel = 3;
   if (this->has_channel()) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        3, HasBitSetters::channel(this), target);
+        3, this->_internal_channel(), deterministic, target);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
   }
   // @@protoc_insertion_point(serialize_to_array_end:pb.Claim)
   return target;
@@ -617,15 +573,11 @@ size_t Claim::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:pb.Claim)
   size_t total_size = 0;
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
   }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
   // .pb.Stream stream = 2;
   if (this->has_stream()) {
     total_size += 1 +
@@ -655,9 +607,9 @@ void Claim::MergeFrom(const ::google::protobuf::Message& from) {
 // @@protoc_insertion_point(generalized_merge_from_start:pb.Claim)
   GOOGLE_DCHECK_NE(&from, this);
   const Claim* source =
-      ::google::protobuf::DynamicCastToGenerated<Claim>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Claim>(
           &from);
-  if (source == nullptr) {
+  if (source == NULL) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Claim)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -708,15 +660,15 @@ void Claim::Swap(Claim* other) {
 }
 void Claim::InternalSwap(Claim* other) {
   using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
   swap(stream_, other->stream_);
   swap(channel_, other->channel_);
   swap(type_, other->type_);
+  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Claim::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_claim_2eproto);
-  return ::file_level_metadata_claim_2eproto[kIndexInFileMessages];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -724,28 +676,28 @@ void Claim::InternalSwap(Claim* other) {
 
 void Channel::InitAsDefaultInstance() {
 }
-class Channel::HasBitSetters {
- public:
-};
-
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Channel::kPublicKeyFieldNumber;
 const int Channel::kTitleFieldNumber;
 const int Channel::kDescriptionFieldNumber;
 const int Channel::kContactEmailFieldNumber;
 const int Channel::kHomepageUrlFieldNumber;
+const int Channel::kTagsFieldNumber;
 const int Channel::kThumbnailUrlFieldNumber;
 const int Channel::kCoverUrlFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Channel::Channel()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
+  ::google::protobuf::internal::InitSCC(
+      &protobuf_claim_2eproto::scc_info_Channel.base);
   SharedCtor();
   // @@protoc_insertion_point(constructor:pb.Channel)
 }
 Channel::Channel(const Channel& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr) {
+      _internal_metadata_(NULL),
+      tags_(from.tags_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   public_key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (from.public_key().size() > 0) {
@@ -779,8 +731,6 @@ Channel::Channel(const Channel& from)
 }
 
 void Channel::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_Channel_claim_2eproto.base);
   public_key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   title_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   description_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -808,8 +758,13 @@ void Channel::SharedDtor() {
 void Channel::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Channel::descriptor() {
+  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
+}
+
 const Channel& Channel::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_Channel_claim_2eproto.base);
+  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_Channel.base);
   return *internal_default_instance();
 }
 
@@ -820,6 +775,7 @@ void Channel::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
+  tags_.Clear();
   public_key_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   title_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   description_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -830,157 +786,9 @@ void Channel::Clear() {
   _internal_metadata_.Clear();
 }
 
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* Channel::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast<Channel*>(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // bytes public_key = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        object = msg->mutable_public_key();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string title = 2;
-      case 2: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Channel.title");
-        object = msg->mutable_title();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string description = 3;
-      case 3: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Channel.description");
-        object = msg->mutable_description();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string contact_email = 4;
-      case 4: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Channel.contact_email");
-        object = msg->mutable_contact_email();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string homepage_url = 5;
-      case 5: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Channel.homepage_url");
-        object = msg->mutable_homepage_url();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string thumbnail_url = 16;
-      case 16: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 130) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Channel.thumbnail_url");
-        object = msg->mutable_thumbnail_url();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string cover_url = 17;
-      case 17: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 138) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Channel.cover_url");
-        object = msg->mutable_cover_url();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-string_till_end:
-  static_cast<::std::string*>(object)->clear();
-  static_cast<::std::string*>(object)->reserve(size);
-  goto len_delim_till_end;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Channel::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:pb.Channel)
   for (;;) {
@@ -990,7 +798,8 @@ bool Channel::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // bytes public_key = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_public_key()));
         } else {
@@ -1001,7 +810,8 @@ bool Channel::MergePartialFromCodedStream(
 
       // string title = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_title()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1016,7 +826,8 @@ bool Channel::MergePartialFromCodedStream(
 
       // string description = 3;
       case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_description()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1031,7 +842,8 @@ bool Channel::MergePartialFromCodedStream(
 
       // string contact_email = 4;
       case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_contact_email()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1046,7 +858,8 @@ bool Channel::MergePartialFromCodedStream(
 
       // string homepage_url = 5;
       case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_homepage_url()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1059,9 +872,27 @@ bool Channel::MergePartialFromCodedStream(
         break;
       }
 
+      // repeated string tags = 6;
+      case 6: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_tags()));
+          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+            this->tags(this->tags_size() - 1).data(),
+            static_cast<int>(this->tags(this->tags_size() - 1).length()),
+            ::google::protobuf::internal::WireFormatLite::PARSE,
+            "pb.Channel.tags"));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
       // string thumbnail_url = 16;
       case 16: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (130 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(130u /* 130 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_thumbnail_url()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1076,7 +907,8 @@ bool Channel::MergePartialFromCodedStream(
 
       // string cover_url = 17;
       case 17: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (138 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(138u /* 138 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_cover_url()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1108,7 +940,6 @@ failure:
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Channel::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -1162,6 +993,16 @@ void Channel::SerializeWithCachedSizes(
       5, this->homepage_url(), output);
   }
 
+  // repeated string tags = 6;
+  for (int i = 0, n = this->tags_size(); i < n; i++) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->tags(i).data(), static_cast<int>(this->tags(i).length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "pb.Channel.tags");
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      6, this->tags(i), output);
+  }
+
   // string thumbnail_url = 16;
   if (this->thumbnail_url().size() > 0) {
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1182,15 +1023,16 @@ void Channel::SerializeWithCachedSizes(
       17, this->cover_url(), output);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
   }
   // @@protoc_insertion_point(serialize_end:pb.Channel)
 }
 
 ::google::protobuf::uint8* Channel::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
   // @@protoc_insertion_point(serialize_to_array_start:pb.Channel)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
@@ -1246,6 +1088,16 @@ void Channel::SerializeWithCachedSizes(
         5, this->homepage_url(), target);
   }
 
+  // repeated string tags = 6;
+  for (int i = 0, n = this->tags_size(); i < n; i++) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->tags(i).data(), static_cast<int>(this->tags(i).length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "pb.Channel.tags");
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(6, this->tags(i), target);
+  }
+
   // string thumbnail_url = 16;
   if (this->thumbnail_url().size() > 0) {
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1268,9 +1120,9 @@ void Channel::SerializeWithCachedSizes(
         17, this->cover_url(), target);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
   }
   // @@protoc_insertion_point(serialize_to_array_end:pb.Channel)
   return target;
@@ -1280,14 +1132,18 @@ size_t Channel::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:pb.Channel)
   size_t total_size = 0;
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
+  }
+  // repeated string tags = 6;
+  total_size += 1 *
+      ::google::protobuf::internal::FromIntSize(this->tags_size());
+  for (int i = 0, n = this->tags_size(); i < n; i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->tags(i));
   }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
 
   // bytes public_key = 1;
   if (this->public_key().size() > 0) {
@@ -1347,9 +1203,9 @@ void Channel::MergeFrom(const ::google::protobuf::Message& from) {
 // @@protoc_insertion_point(generalized_merge_from_start:pb.Channel)
   GOOGLE_DCHECK_NE(&from, this);
   const Channel* source =
-      ::google::protobuf::DynamicCastToGenerated<Channel>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Channel>(
           &from);
-  if (source == nullptr) {
+  if (source == NULL) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Channel)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -1365,6 +1221,7 @@ void Channel::MergeFrom(const Channel& from) {
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
+  tags_.MergeFrom(from.tags_);
   if (from.public_key().size() > 0) {
 
     public_key_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.public_key_);
@@ -1419,7 +1276,7 @@ void Channel::Swap(Channel* other) {
 }
 void Channel::InternalSwap(Channel* other) {
   using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
+  tags_.InternalSwap(CastToBase(&other->tags_));
   public_key_.Swap(&other->public_key_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   title_.Swap(&other->title_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
@@ -1434,11 +1291,12 @@ void Channel::InternalSwap(Channel* other) {
     GetArenaNoVirtual());
   cover_url_.Swap(&other->cover_url_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
+  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Channel::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_claim_2eproto);
-  return ::file_level_metadata_claim_2eproto[kIndexInFileMessages];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -1452,25 +1310,6 @@ void Stream::InitAsDefaultInstance() {
   ::pb::_Stream_default_instance_._instance.get_mutable()->video_ = const_cast< ::pb::Video*>(
       ::pb::Video::internal_default_instance());
 }
-class Stream::HasBitSetters {
- public:
-  static const ::pb::File& file(const Stream* msg);
-  static const ::pb::Fee& fee(const Stream* msg);
-  static const ::pb::Video& video(const Stream* msg);
-};
-
-const ::pb::File&
-Stream::HasBitSetters::file(const Stream* msg) {
-  return *msg->file_;
-}
-const ::pb::Fee&
-Stream::HasBitSetters::fee(const Stream* msg) {
-  return *msg->fee_;
-}
-const ::pb::Video&
-Stream::HasBitSetters::video(const Stream* msg) {
-  return *msg->video_;
-}
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Stream::kHashFieldNumber;
 const int Stream::kLanguageFieldNumber;
@@ -1490,13 +1329,15 @@ const int Stream::kVideoFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Stream::Stream()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
+  ::google::protobuf::internal::InitSCC(
+      &protobuf_claim_2eproto::scc_info_Stream.base);
   SharedCtor();
   // @@protoc_insertion_point(constructor:pb.Stream)
 }
 Stream::Stream(const Stream& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr),
+      _internal_metadata_(NULL),
       tags_(from.tags_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   hash_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -1538,17 +1379,17 @@ Stream::Stream(const Stream& from)
   if (from.has_file()) {
     file_ = new ::pb::File(*from.file_);
   } else {
-    file_ = nullptr;
+    file_ = NULL;
   }
   if (from.has_fee()) {
     fee_ = new ::pb::Fee(*from.fee_);
   } else {
-    fee_ = nullptr;
+    fee_ = NULL;
   }
   if (from.has_video()) {
     video_ = new ::pb::Video(*from.video_);
   } else {
-    video_ = nullptr;
+    video_ = NULL;
   }
   ::memcpy(&duration_, &from.duration_,
     static_cast<size_t>(reinterpret_cast<char*>(&release_time_) -
@@ -1557,8 +1398,6 @@ Stream::Stream(const Stream& from)
 }
 
 void Stream::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_Stream_claim_2eproto.base);
   hash_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   language_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   title_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -1596,8 +1435,13 @@ void Stream::SharedDtor() {
 void Stream::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Stream::descriptor() {
+  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
+}
+
 const Stream& Stream::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_Stream_claim_2eproto.base);
+  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_Stream.base);
   return *internal_default_instance();
 }
 
@@ -1618,279 +1462,27 @@ void Stream::Clear() {
   license_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   license_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   thumbnail_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (GetArenaNoVirtual() == nullptr && file_ != nullptr) {
+  if (GetArenaNoVirtual() == NULL && file_ != NULL) {
     delete file_;
   }
-  file_ = nullptr;
-  if (GetArenaNoVirtual() == nullptr && fee_ != nullptr) {
+  file_ = NULL;
+  if (GetArenaNoVirtual() == NULL && fee_ != NULL) {
     delete fee_;
   }
-  fee_ = nullptr;
-  if (GetArenaNoVirtual() == nullptr && video_ != nullptr) {
+  fee_ = NULL;
+  if (GetArenaNoVirtual() == NULL && video_ != NULL) {
     delete video_;
   }
-  video_ = nullptr;
+  video_ = NULL;
   ::memset(&duration_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&release_time_) -
       reinterpret_cast<char*>(&duration_)) + sizeof(release_time_));
   _internal_metadata_.Clear();
 }
 
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* Stream::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast<Stream*>(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // bytes hash = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        object = msg->mutable_hash();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string language = 2;
-      case 2: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.language");
-        object = msg->mutable_language();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string title = 3;
-      case 3: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.title");
-        object = msg->mutable_title();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string author = 4;
-      case 4: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.author");
-        object = msg->mutable_author();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string description = 5;
-      case 5: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.description");
-        object = msg->mutable_description();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string media_type = 6;
-      case 6: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.media_type");
-        object = msg->mutable_media_type();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string license = 7;
-      case 7: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 58) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.license");
-        object = msg->mutable_license();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // .pb.File file = 8;
-      case 8: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        parser_till_end = ::pb::File::_InternalParse;
-        object = msg->mutable_file();
-        if (size > end - ptr) goto len_delim_till_end;
-        ptr += size;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-            {parser_till_end, object}, ptr - size, ptr));
-        break;
-      }
-      // .pb.Fee fee = 16;
-      case 16: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 130) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        parser_till_end = ::pb::Fee::_InternalParse;
-        object = msg->mutable_fee();
-        if (size > end - ptr) goto len_delim_till_end;
-        ptr += size;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-            {parser_till_end, object}, ptr - size, ptr));
-        break;
-      }
-      // string license_url = 17;
-      case 17: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 138) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.license_url");
-        object = msg->mutable_license_url();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // string thumbnail_url = 18;
-      case 18: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 146) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.Stream.thumbnail_url");
-        object = msg->mutable_thumbnail_url();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // uint32 duration = 19;
-      case 19: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 152) goto handle_unusual;
-        msg->set_duration(::google::protobuf::internal::ReadVarint(&ptr));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      // repeated string tags = 20;
-      case 20: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 162) goto handle_unusual;
-        do {
-          ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          ctx->extra_parse_data().SetFieldName("pb.Stream.tags");
-          object = msg->add_tags();
-          if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-            parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-            goto string_till_end;
-          }
-          GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-          ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-          ptr += size;
-          if (ptr >= end) break;
-        } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 65535) == 418 && (ptr += 2));
-        break;
-      }
-      // int64 release_time = 21;
-      case 21: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 168) goto handle_unusual;
-        msg->set_release_time(::google::protobuf::internal::ReadVarint(&ptr));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      // .pb.Video video = 22;
-      case 22: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 178) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        parser_till_end = ::pb::Video::_InternalParse;
-        object = msg->mutable_video();
-        if (size > end - ptr) goto len_delim_till_end;
-        ptr += size;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
-            {parser_till_end, object}, ptr - size, ptr));
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-string_till_end:
-  static_cast<::std::string*>(object)->clear();
-  static_cast<::std::string*>(object)->reserve(size);
-  goto len_delim_till_end;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Stream::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:pb.Stream)
   for (;;) {
@@ -1900,7 +1492,8 @@ bool Stream::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // bytes hash = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_hash()));
         } else {
@@ -1911,7 +1504,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string language = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_language()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1926,7 +1520,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string title = 3;
       case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_title()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1941,7 +1536,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string author = 4;
       case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_author()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1956,7 +1552,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string description = 5;
       case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_description()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1971,7 +1568,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string media_type = 6;
       case 6: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_media_type()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -1986,7 +1584,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string license = 7;
       case 7: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (58 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(58u /* 58 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_license()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -2001,7 +1600,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // .pb.File file = 8;
       case 8: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(66u /* 66 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_file()));
         } else {
@@ -2012,7 +1612,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // .pb.Fee fee = 16;
       case 16: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (130 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(130u /* 130 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_fee()));
         } else {
@@ -2023,7 +1624,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string license_url = 17;
       case 17: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (138 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(138u /* 138 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_license_url()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -2038,7 +1640,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // string thumbnail_url = 18;
       case 18: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (146 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(146u /* 146 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_thumbnail_url()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -2053,7 +1656,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // uint32 duration = 19;
       case 19: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (152 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(152u /* 152 & 0xFF */)) {
 
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
@@ -2066,7 +1670,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // repeated string tags = 20;
       case 20: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (162 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(162u /* 162 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->add_tags()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -2082,7 +1687,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // int64 release_time = 21;
       case 21: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (168 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(168u /* 168 & 0xFF */)) {
 
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
@@ -2095,7 +1701,8 @@ bool Stream::MergePartialFromCodedStream(
 
       // .pb.Video video = 22;
       case 22: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (178 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(178u /* 178 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_video()));
         } else {
@@ -2123,7 +1730,6 @@ failure:
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Stream::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -2200,13 +1806,13 @@ void Stream::SerializeWithCachedSizes(
   // .pb.File file = 8;
   if (this->has_file()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, HasBitSetters::file(this), output);
+      8, this->_internal_file(), output);
   }
 
   // .pb.Fee fee = 16;
   if (this->has_fee()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      16, HasBitSetters::fee(this), output);
+      16, this->_internal_fee(), output);
   }
 
   // string license_url = 17;
@@ -2252,18 +1858,19 @@ void Stream::SerializeWithCachedSizes(
   // .pb.Video video = 22;
   if (this->has_video()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      22, HasBitSetters::video(this), output);
+      22, this->_internal_video(), output);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
   }
   // @@protoc_insertion_point(serialize_end:pb.Stream)
 }
 
 ::google::protobuf::uint8* Stream::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
   // @@protoc_insertion_point(serialize_to_array_start:pb.Stream)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
@@ -2345,14 +1952,14 @@ void Stream::SerializeWithCachedSizes(
   if (this->has_file()) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        8, HasBitSetters::file(this), target);
+        8, this->_internal_file(), deterministic, target);
   }
 
   // .pb.Fee fee = 16;
   if (this->has_fee()) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        16, HasBitSetters::fee(this), target);
+        16, this->_internal_fee(), deterministic, target);
   }
 
   // string license_url = 17;
@@ -2401,12 +2008,12 @@ void Stream::SerializeWithCachedSizes(
   if (this->has_video()) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        22, HasBitSetters::video(this), target);
+        22, this->_internal_video(), deterministic, target);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
   }
   // @@protoc_insertion_point(serialize_to_array_end:pb.Stream)
   return target;
@@ -2416,15 +2023,11 @@ size_t Stream::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:pb.Stream)
   size_t total_size = 0;
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
   }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
   // repeated string tags = 20;
   total_size += 2 *
       ::google::protobuf::internal::FromIntSize(this->tags_size());
@@ -2540,9 +2143,9 @@ void Stream::MergeFrom(const ::google::protobuf::Message& from) {
 // @@protoc_insertion_point(generalized_merge_from_start:pb.Stream)
   GOOGLE_DCHECK_NE(&from, this);
   const Stream* source =
-      ::google::protobuf::DynamicCastToGenerated<Stream>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Stream>(
           &from);
-  if (source == nullptr) {
+  if (source == NULL) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Stream)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -2636,7 +2239,6 @@ void Stream::Swap(Stream* other) {
 }
 void Stream::InternalSwap(Stream* other) {
   using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
   tags_.InternalSwap(CastToBase(&other->tags_));
   hash_.Swap(&other->hash_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
@@ -2661,11 +2263,12 @@ void Stream::InternalSwap(Stream* other) {
   swap(video_, other->video_);
   swap(duration_, other->duration_);
   swap(release_time_, other->release_time_);
+  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Stream::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_claim_2eproto);
-  return ::file_level_metadata_claim_2eproto[kIndexInFileMessages];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -2673,10 +2276,6 @@ void Stream::InternalSwap(Stream* other) {
 
 void Fee::InitAsDefaultInstance() {
 }
-class Fee::HasBitSetters {
- public:
-};
-
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Fee::kCurrencyFieldNumber;
 const int Fee::kAddressFieldNumber;
@@ -2684,13 +2283,15 @@ const int Fee::kAmountFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Fee::Fee()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
+  ::google::protobuf::internal::InitSCC(
+      &protobuf_claim_2eproto::scc_info_Fee.base);
   SharedCtor();
   // @@protoc_insertion_point(constructor:pb.Fee)
 }
 Fee::Fee(const Fee& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr) {
+      _internal_metadata_(NULL) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (from.address().size() > 0) {
@@ -2703,8 +2304,6 @@ Fee::Fee(const Fee& from)
 }
 
 void Fee::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_Fee_claim_2eproto.base);
   address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&amount_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&currency_) -
@@ -2723,8 +2322,13 @@ void Fee::SharedDtor() {
 void Fee::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Fee::descriptor() {
+  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
+}
+
 const Fee& Fee::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_Fee_claim_2eproto.base);
+  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_Fee.base);
   return *internal_default_instance();
 }
 
@@ -2742,76 +2346,9 @@ void Fee::Clear() {
   _internal_metadata_.Clear();
 }
 
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* Fee::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast<Fee*>(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // .pb.Fee.Currency currency = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
-        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
-        msg->set_currency(static_cast<::pb::Fee_Currency>(val));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      // bytes address = 2;
-      case 2: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        object = msg->mutable_address();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // uint64 amount = 3;
-      case 3: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual;
-        msg->set_amount(::google::protobuf::internal::ReadVarint(&ptr));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-string_till_end:
-  static_cast<::std::string*>(object)->clear();
-  static_cast<::std::string*>(object)->reserve(size);
-  goto len_delim_till_end;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Fee::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:pb.Fee)
   for (;;) {
@@ -2821,8 +2358,9 @@ bool Fee::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // .pb.Fee.Currency currency = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
-          int value = 0;
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
+          int value;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
@@ -2835,7 +2373,8 @@ bool Fee::MergePartialFromCodedStream(
 
       // bytes address = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_address()));
         } else {
@@ -2846,7 +2385,8 @@ bool Fee::MergePartialFromCodedStream(
 
       // uint64 amount = 3;
       case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(24u /* 24 & 0xFF */)) {
 
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
@@ -2876,7 +2416,6 @@ failure:
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Fee::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -2901,15 +2440,16 @@ void Fee::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->amount(), output);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
   }
   // @@protoc_insertion_point(serialize_end:pb.Fee)
 }
 
 ::google::protobuf::uint8* Fee::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
   // @@protoc_insertion_point(serialize_to_array_start:pb.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
@@ -2932,9 +2472,9 @@ void Fee::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->amount(), target);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
   }
   // @@protoc_insertion_point(serialize_to_array_end:pb.Fee)
   return target;
@@ -2944,15 +2484,11 @@ size_t Fee::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:pb.Fee)
   size_t total_size = 0;
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
   }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
   // bytes address = 2;
   if (this->address().size() > 0) {
     total_size += 1 +
@@ -2982,9 +2518,9 @@ void Fee::MergeFrom(const ::google::protobuf::Message& from) {
 // @@protoc_insertion_point(generalized_merge_from_start:pb.Fee)
   GOOGLE_DCHECK_NE(&from, this);
   const Fee* source =
-      ::google::protobuf::DynamicCastToGenerated<Fee>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Fee>(
           &from);
-  if (source == nullptr) {
+  if (source == NULL) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Fee)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -3036,16 +2572,16 @@ void Fee::Swap(Fee* other) {
 }
 void Fee::InternalSwap(Fee* other) {
   using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
   address_.Swap(&other->address_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   swap(amount_, other->amount_);
   swap(currency_, other->currency_);
+  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Fee::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_claim_2eproto);
-  return ::file_level_metadata_claim_2eproto[kIndexInFileMessages];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -3053,23 +2589,21 @@ void Fee::InternalSwap(Fee* other) {
 
 void File::InitAsDefaultInstance() {
 }
-class File::HasBitSetters {
- public:
-};
-
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int File::kNameFieldNumber;
 const int File::kSizeFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 File::File()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
+  ::google::protobuf::internal::InitSCC(
+      &protobuf_claim_2eproto::scc_info_File.base);
   SharedCtor();
   // @@protoc_insertion_point(constructor:pb.File)
 }
 File::File(const File& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr) {
+      _internal_metadata_(NULL) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (from.name().size() > 0) {
@@ -3080,10 +2614,8 @@ File::File(const File& from)
 }
 
 void File::SharedCtor() {
-  ::google::protobuf::internal::InitSCC(
-      &scc_info_File_claim_2eproto.base);
   name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  size_ = PROTOBUF_ULONGLONG(0);
+  size_ = GOOGLE_ULONGLONG(0);
 }
 
 File::~File() {
@@ -3098,8 +2630,13 @@ void File::SharedDtor() {
 void File::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* File::descriptor() {
+  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
+}
+
 const File& File::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_File_claim_2eproto.base);
+  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_File.base);
   return *internal_default_instance();
 }
 
@@ -3111,73 +2648,13 @@ void File::Clear() {
   (void) cached_has_bits;
 
   name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  size_ = PROTOBUF_ULONGLONG(0);
+  size_ = GOOGLE_ULONGLONG(0);
   _internal_metadata_.Clear();
 }
 
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* File::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast<File*>(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
-        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ctx->extra_parse_data().SetFieldName("pb.File.name");
-        object = msg->mutable_name();
-        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
-          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
-          goto string_till_end;
-        }
-        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
-        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
-        ptr += size;
-        break;
-      }
-      // uint64 size = 2;
-      case 2: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual;
-        msg->set_size(::google::protobuf::internal::ReadVarint(&ptr));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-string_till_end:
-  static_cast<::std::string*>(object)->clear();
-  static_cast<::std::string*>(object)->reserve(size);
-  goto len_delim_till_end;
-len_delim_till_end:
-  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
-                               {parser_till_end, object}, size);
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool File::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:pb.File)
   for (;;) {
@@ -3187,7 +2664,8 @@ bool File::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // string name = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_name()));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
@@ -3202,7 +2680,8 @@ bool File::MergePartialFromCodedStream(
 
       // uint64 size = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
 
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
@@ -3232,7 +2711,6 @@ failure:
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void File::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -3255,15 +2733,16 @@ void File::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->size(), output);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
   }
   // @@protoc_insertion_point(serialize_end:pb.File)
 }
 
 ::google::protobuf::uint8* File::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
   // @@protoc_insertion_point(serialize_to_array_start:pb.File)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
@@ -3284,9 +2763,9 @@ void File::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->size(), target);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
   }
   // @@protoc_insertion_point(serialize_to_array_end:pb.File)
   return target;
@@ -3296,15 +2775,11 @@ size_t File::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:pb.File)
   size_t total_size = 0;
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
   }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
   // string name = 1;
   if (this->name().size() > 0) {
     total_size += 1 +
@@ -3328,9 +2803,9 @@ void File::MergeFrom(const ::google::protobuf::Message& from) {
 // @@protoc_insertion_point(generalized_merge_from_start:pb.File)
   GOOGLE_DCHECK_NE(&from, this);
   const File* source =
-      ::google::protobuf::DynamicCastToGenerated<File>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const File>(
           &from);
-  if (source == nullptr) {
+  if (source == NULL) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.File)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -3379,15 +2854,15 @@ void File::Swap(File* other) {
 }
 void File::InternalSwap(File* other) {
   using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
   name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   swap(size_, other->size_);
+  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata File::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_claim_2eproto);
-  return ::file_level_metadata_claim_2eproto[kIndexInFileMessages];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -3395,23 +2870,21 @@ void File::InternalSwap(File* other) {
 
 void Video::InitAsDefaultInstance() {
 }
-class Video::HasBitSetters {
- public:
-};
-
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Video::kWidthFieldNumber;
 const int Video::kHeightFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Video::Video()
-  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
+  ::google::protobuf::internal::InitSCC(
+      &protobuf_claim_2eproto::scc_info_Video.base);
   SharedCtor();
   // @@protoc_insertion_point(constructor:pb.Video)
 }
 Video::Video(const Video& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(nullptr) {
+      _internal_metadata_(NULL) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::memcpy(&width_, &from.width_,
     static_cast<size_t>(reinterpret_cast<char*>(&height_) -
@@ -3436,8 +2909,13 @@ void Video::SharedDtor() {
 void Video::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Video::descriptor() {
+  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
+}
+
 const Video& Video::default_instance() {
-  ::google::protobuf::internal::InitSCC(&::scc_info_Video_claim_2eproto.base);
+  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_Video.base);
   return *internal_default_instance();
 }
 
@@ -3454,53 +2932,9 @@ void Video::Clear() {
   _internal_metadata_.Clear();
 }
 
-#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-const char* Video::_InternalParse(const char* begin, const char* end, void* object,
-                  ::google::protobuf::internal::ParseContext* ctx) {
-  auto msg = static_cast<Video*>(object);
-  ::google::protobuf::int32 size; (void)size;
-  int depth; (void)depth;
-  ::google::protobuf::uint32 tag;
-  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
-  auto ptr = begin;
-  while (ptr < end) {
-    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    switch (tag >> 3) {
-      // uint32 width = 1;
-      case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
-        msg->set_width(::google::protobuf::internal::ReadVarint(&ptr));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      // uint32 height = 2;
-      case 2: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual;
-        msg->set_height(::google::protobuf::internal::ReadVarint(&ptr));
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        break;
-      }
-      default: {
-      handle_unusual:
-        if ((tag & 7) == 4 || tag == 0) {
-          ctx->EndGroup(tag);
-          return ptr;
-        }
-        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
-          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
-        ptr = res.first;
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        if (res.second) return ptr;
-      }
-    }  // switch
-  }  // while
-  return ptr;
-}
-#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Video::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:pb.Video)
   for (;;) {
@@ -3510,7 +2944,8 @@ bool Video::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // uint32 width = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
 
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
@@ -3523,7 +2958,8 @@ bool Video::MergePartialFromCodedStream(
 
       // uint32 height = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
 
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
@@ -3553,7 +2989,6 @@ failure:
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Video::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -3571,15 +3006,16 @@ void Video::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->height(), output);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), output);
   }
   // @@protoc_insertion_point(serialize_end:pb.Video)
 }
 
 ::google::protobuf::uint8* Video::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
   // @@protoc_insertion_point(serialize_to_array_start:pb.Video)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
@@ -3594,9 +3030,9 @@ void Video::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->height(), target);
   }
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()), target);
   }
   // @@protoc_insertion_point(serialize_to_array_end:pb.Video)
   return target;
@@ -3606,15 +3042,11 @@ size_t Video::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:pb.Video)
   size_t total_size = 0;
 
-  if (_internal_metadata_.have_unknown_fields()) {
+  if ((_internal_metadata_.have_unknown_fields() &&  ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
+        (::google::protobuf::internal::GetProto3PreserveUnknownsDefault()   ? _internal_metadata_.unknown_fields()   : _internal_metadata_.default_instance()));
   }
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
   // uint32 width = 1;
   if (this->width() != 0) {
     total_size += 1 +
@@ -3638,9 +3070,9 @@ void Video::MergeFrom(const ::google::protobuf::Message& from) {
 // @@protoc_insertion_point(generalized_merge_from_start:pb.Video)
   GOOGLE_DCHECK_NE(&from, this);
   const Video* source =
-      ::google::protobuf::DynamicCastToGenerated<Video>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Video>(
           &from);
-  if (source == nullptr) {
+  if (source == NULL) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Video)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -3688,14 +3120,14 @@ void Video::Swap(Video* other) {
 }
 void Video::InternalSwap(Video* other) {
   using std::swap;
-  _internal_metadata_.Swap(&other->_internal_metadata_);
   swap(width_, other->width_);
   swap(height_, other->height_);
+  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Video::GetMetadata() const {
-  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_claim_2eproto);
-  return ::file_level_metadata_claim_2eproto[kIndexInFileMessages];
+  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -3703,26 +3135,25 @@ void Video::InternalSwap(Video* other) {
 }  // namespace pb
 namespace google {
 namespace protobuf {
-template<> PROTOBUF_NOINLINE ::pb::Claim* Arena::CreateMaybeMessage< ::pb::Claim >(Arena* arena) {
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Claim* Arena::CreateMaybeMessage< ::pb::Claim >(Arena* arena) {
   return Arena::CreateInternal< ::pb::Claim >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Channel* Arena::CreateMaybeMessage< ::pb::Channel >(Arena* arena) {
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Channel* Arena::CreateMaybeMessage< ::pb::Channel >(Arena* arena) {
   return Arena::CreateInternal< ::pb::Channel >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Stream* Arena::CreateMaybeMessage< ::pb::Stream >(Arena* arena) {
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Stream* Arena::CreateMaybeMessage< ::pb::Stream >(Arena* arena) {
   return Arena::CreateInternal< ::pb::Stream >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Fee* Arena::CreateMaybeMessage< ::pb::Fee >(Arena* arena) {
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Fee* Arena::CreateMaybeMessage< ::pb::Fee >(Arena* arena) {
   return Arena::CreateInternal< ::pb::Fee >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::File* Arena::CreateMaybeMessage< ::pb::File >(Arena* arena) {
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::File* Arena::CreateMaybeMessage< ::pb::File >(Arena* arena) {
   return Arena::CreateInternal< ::pb::File >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Video* Arena::CreateMaybeMessage< ::pb::Video >(Arena* arena) {
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Video* Arena::CreateMaybeMessage< ::pb::Video >(Arena* arena) {
   return Arena::CreateInternal< ::pb::Video >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
 
 // @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/v2/cpp/claim.pb.h b/v2/cpp/claim.pb.h
index 84346a8..8d9729b 100644
--- a/v2/cpp/claim.pb.h
+++ b/v2/cpp/claim.pb.h
@@ -4,22 +4,21 @@
 #ifndef PROTOBUF_INCLUDED_claim_2eproto
 #define PROTOBUF_INCLUDED_claim_2eproto
 
-#include <limits>
 #include <string>
 
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3007000
+#include <google/protobuf/stubs/common.h>
+
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
+#error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
+#error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
-#include <google/protobuf/port_undef.inc>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
@@ -33,22 +32,20 @@
 #include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_claim_2eproto
+#define PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto 
 
+namespace protobuf_claim_2eproto {
 // Internal implementation detail -- do not use these members.
-struct TableStruct_claim_2eproto {
-  static const ::google::protobuf::internal::ParseTableField entries[]
-    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
-    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
-  static const ::google::protobuf::internal::ParseTable schema[6]
-    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+struct TableStruct {
+  static const ::google::protobuf::internal::ParseTableField entries[];
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
+  static const ::google::protobuf::internal::ParseTable schema[6];
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
 };
-void AddDescriptors_claim_2eproto();
+void AddDescriptors();
+}  // namespace protobuf_claim_2eproto
 namespace pb {
 class Channel;
 class ChannelDefaultTypeInternal;
@@ -84,8 +81,8 @@ namespace pb {
 enum Claim_Type {
   Claim_Type_STREAM = 0,
   Claim_Type_CHANNEL = 1,
-  Claim_Type_Claim_Type_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::min(),
-  Claim_Type_Claim_Type_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::max()
+  Claim_Type_Claim_Type_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
+  Claim_Type_Claim_Type_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
 };
 bool Claim_Type_IsValid(int value);
 const Claim_Type Claim_Type_Type_MIN = Claim_Type_STREAM;
@@ -105,8 +102,8 @@ inline bool Claim_Type_Parse(
 enum Fee_Currency {
   Fee_Currency_LBC = 0,
   Fee_Currency_USD = 1,
-  Fee_Currency_Fee_Currency_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::min(),
-  Fee_Currency_Fee_Currency_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::max()
+  Fee_Currency_Fee_Currency_INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,
+  Fee_Currency_Fee_Currency_INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max
 };
 bool Fee_Currency_IsValid(int value);
 const Fee_Currency Fee_Currency_Currency_MIN = Fee_Currency_LBC;
@@ -125,8 +122,7 @@ inline bool Fee_Currency_Parse(
 }
 // ===================================================================
 
-class Claim final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Claim) */ {
+class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Claim) */ {
  public:
   Claim();
   virtual ~Claim();
@@ -152,9 +148,7 @@ class Claim final :
     return *this;
   }
   #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
+  static const ::google::protobuf::Descriptor* descriptor();
   static const Claim& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -173,7 +167,7 @@ class Claim final :
   // implements Message ----------------------------------------------
 
   inline Claim* New() const final {
-    return CreateMaybeMessage<Claim>(nullptr);
+    return CreateMaybeMessage<Claim>(NULL);
   }
 
   Claim* New(::google::protobuf::Arena* arena) const final {
@@ -183,21 +177,16 @@ class Claim final :
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Claim& from);
   void MergeFrom(const Claim& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
+      bool deterministic, ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -207,10 +196,10 @@ class Claim final :
   void InternalSwap(Claim* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
+    return NULL;
   }
   inline void* MaybeArenaPtr() const {
-    return nullptr;
+    return NULL;
   }
   public:
 
@@ -250,6 +239,9 @@ class Claim final :
   bool has_stream() const;
   void clear_stream();
   static const int kStreamFieldNumber = 2;
+  private:
+  const ::pb::Stream& _internal_stream() const;
+  public:
   const ::pb::Stream& stream() const;
   ::pb::Stream* release_stream();
   ::pb::Stream* mutable_stream();
@@ -259,6 +251,9 @@ class Claim final :
   bool has_channel() const;
   void clear_channel();
   static const int kChannelFieldNumber = 3;
+  private:
+  const ::pb::Channel& _internal_channel() const;
+  public:
   const ::pb::Channel& channel() const;
   ::pb::Channel* release_channel();
   ::pb::Channel* mutable_channel();
@@ -272,19 +267,17 @@ class Claim final :
 
   // @@protoc_insertion_point(class_scope:pb.Claim)
  private:
-  class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::pb::Stream* stream_;
   ::pb::Channel* channel_;
   int type_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_claim_2eproto;
+  friend struct ::protobuf_claim_2eproto::TableStruct;
 };
 // -------------------------------------------------------------------
 
-class Channel final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Channel) */ {
+class Channel : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Channel) */ {
  public:
   Channel();
   virtual ~Channel();
@@ -310,9 +303,7 @@ class Channel final :
     return *this;
   }
   #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
+  static const ::google::protobuf::Descriptor* descriptor();
   static const Channel& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -331,7 +322,7 @@ class Channel final :
   // implements Message ----------------------------------------------
 
   inline Channel* New() const final {
-    return CreateMaybeMessage<Channel>(nullptr);
+    return CreateMaybeMessage<Channel>(NULL);
   }
 
   Channel* New(::google::protobuf::Arena* arena) const final {
@@ -341,21 +332,16 @@ class Channel final :
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Channel& from);
   void MergeFrom(const Channel& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
+      bool deterministic, ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -365,10 +351,10 @@ class Channel final :
   void InternalSwap(Channel* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
+    return NULL;
   }
   inline void* MaybeArenaPtr() const {
-    return nullptr;
+    return NULL;
   }
   public:
 
@@ -378,6 +364,28 @@ class Channel final :
 
   // accessors -------------------------------------------------------
 
+  // repeated string tags = 6;
+  int tags_size() const;
+  void clear_tags();
+  static const int kTagsFieldNumber = 6;
+  const ::std::string& tags(int index) const;
+  ::std::string* mutable_tags(int index);
+  void set_tags(int index, const ::std::string& value);
+  #if LANG_CXX11
+  void set_tags(int index, ::std::string&& value);
+  #endif
+  void set_tags(int index, const char* value);
+  void set_tags(int index, const char* value, size_t size);
+  ::std::string* add_tags();
+  void add_tags(const ::std::string& value);
+  #if LANG_CXX11
+  void add_tags(::std::string&& value);
+  #endif
+  void add_tags(const char* value);
+  void add_tags(const char* value, size_t size);
+  const ::google::protobuf::RepeatedPtrField< ::std::string>& tags() const;
+  ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_tags();
+
   // bytes public_key = 1;
   void clear_public_key();
   static const int kPublicKeyFieldNumber = 1;
@@ -478,9 +486,9 @@ class Channel final :
 
   // @@protoc_insertion_point(class_scope:pb.Channel)
  private:
-  class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> tags_;
   ::google::protobuf::internal::ArenaStringPtr public_key_;
   ::google::protobuf::internal::ArenaStringPtr title_;
   ::google::protobuf::internal::ArenaStringPtr description_;
@@ -489,12 +497,11 @@ class Channel final :
   ::google::protobuf::internal::ArenaStringPtr thumbnail_url_;
   ::google::protobuf::internal::ArenaStringPtr cover_url_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_claim_2eproto;
+  friend struct ::protobuf_claim_2eproto::TableStruct;
 };
 // -------------------------------------------------------------------
 
-class Stream final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Stream) */ {
+class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Stream) */ {
  public:
   Stream();
   virtual ~Stream();
@@ -520,9 +527,7 @@ class Stream final :
     return *this;
   }
   #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
+  static const ::google::protobuf::Descriptor* descriptor();
   static const Stream& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -541,7 +546,7 @@ class Stream final :
   // implements Message ----------------------------------------------
 
   inline Stream* New() const final {
-    return CreateMaybeMessage<Stream>(nullptr);
+    return CreateMaybeMessage<Stream>(NULL);
   }
 
   Stream* New(::google::protobuf::Arena* arena) const final {
@@ -551,21 +556,16 @@ class Stream final :
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Stream& from);
   void MergeFrom(const Stream& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
+      bool deterministic, ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -575,10 +575,10 @@ class Stream final :
   void InternalSwap(Stream* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
+    return NULL;
   }
   inline void* MaybeArenaPtr() const {
-    return nullptr;
+    return NULL;
   }
   public:
 
@@ -607,8 +607,8 @@ class Stream final :
   #endif
   void add_tags(const char* value);
   void add_tags(const char* value, size_t size);
-  const ::google::protobuf::RepeatedPtrField<::std::string>& tags() const;
-  ::google::protobuf::RepeatedPtrField<::std::string>* mutable_tags();
+  const ::google::protobuf::RepeatedPtrField< ::std::string>& tags() const;
+  ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_tags();
 
   // bytes hash = 1;
   void clear_hash();
@@ -740,6 +740,9 @@ class Stream final :
   bool has_file() const;
   void clear_file();
   static const int kFileFieldNumber = 8;
+  private:
+  const ::pb::File& _internal_file() const;
+  public:
   const ::pb::File& file() const;
   ::pb::File* release_file();
   ::pb::File* mutable_file();
@@ -749,6 +752,9 @@ class Stream final :
   bool has_fee() const;
   void clear_fee();
   static const int kFeeFieldNumber = 16;
+  private:
+  const ::pb::Fee& _internal_fee() const;
+  public:
   const ::pb::Fee& fee() const;
   ::pb::Fee* release_fee();
   ::pb::Fee* mutable_fee();
@@ -758,6 +764,9 @@ class Stream final :
   bool has_video() const;
   void clear_video();
   static const int kVideoFieldNumber = 22;
+  private:
+  const ::pb::Video& _internal_video() const;
+  public:
   const ::pb::Video& video() const;
   ::pb::Video* release_video();
   ::pb::Video* mutable_video();
@@ -777,10 +786,9 @@ class Stream final :
 
   // @@protoc_insertion_point(class_scope:pb.Stream)
  private:
-  class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::RepeatedPtrField<::std::string> tags_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> tags_;
   ::google::protobuf::internal::ArenaStringPtr hash_;
   ::google::protobuf::internal::ArenaStringPtr language_;
   ::google::protobuf::internal::ArenaStringPtr title_;
@@ -796,12 +804,11 @@ class Stream final :
   ::google::protobuf::uint32 duration_;
   ::google::protobuf::int64 release_time_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_claim_2eproto;
+  friend struct ::protobuf_claim_2eproto::TableStruct;
 };
 // -------------------------------------------------------------------
 
-class Fee final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Fee) */ {
+class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Fee) */ {
  public:
   Fee();
   virtual ~Fee();
@@ -827,9 +834,7 @@ class Fee final :
     return *this;
   }
   #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
+  static const ::google::protobuf::Descriptor* descriptor();
   static const Fee& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -848,7 +853,7 @@ class Fee final :
   // implements Message ----------------------------------------------
 
   inline Fee* New() const final {
-    return CreateMaybeMessage<Fee>(nullptr);
+    return CreateMaybeMessage<Fee>(NULL);
   }
 
   Fee* New(::google::protobuf::Arena* arena) const final {
@@ -858,21 +863,16 @@ class Fee final :
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Fee& from);
   void MergeFrom(const Fee& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
+      bool deterministic, ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -882,10 +882,10 @@ class Fee final :
   void InternalSwap(Fee* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
+    return NULL;
   }
   inline void* MaybeArenaPtr() const {
-    return nullptr;
+    return NULL;
   }
   public:
 
@@ -949,19 +949,17 @@ class Fee final :
 
   // @@protoc_insertion_point(class_scope:pb.Fee)
  private:
-  class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::ArenaStringPtr address_;
   ::google::protobuf::uint64 amount_;
   int currency_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_claim_2eproto;
+  friend struct ::protobuf_claim_2eproto::TableStruct;
 };
 // -------------------------------------------------------------------
 
-class File final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.File) */ {
+class File : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.File) */ {
  public:
   File();
   virtual ~File();
@@ -987,9 +985,7 @@ class File final :
     return *this;
   }
   #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
+  static const ::google::protobuf::Descriptor* descriptor();
   static const File& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -1008,7 +1004,7 @@ class File final :
   // implements Message ----------------------------------------------
 
   inline File* New() const final {
-    return CreateMaybeMessage<File>(nullptr);
+    return CreateMaybeMessage<File>(NULL);
   }
 
   File* New(::google::protobuf::Arena* arena) const final {
@@ -1018,21 +1014,16 @@ class File final :
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const File& from);
   void MergeFrom(const File& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
+      bool deterministic, ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -1042,10 +1033,10 @@ class File final :
   void InternalSwap(File* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
+    return NULL;
   }
   inline void* MaybeArenaPtr() const {
-    return nullptr;
+    return NULL;
   }
   public:
 
@@ -1077,18 +1068,16 @@ class File final :
 
   // @@protoc_insertion_point(class_scope:pb.File)
  private:
-  class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::ArenaStringPtr name_;
   ::google::protobuf::uint64 size_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_claim_2eproto;
+  friend struct ::protobuf_claim_2eproto::TableStruct;
 };
 // -------------------------------------------------------------------
 
-class Video final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Video) */ {
+class Video : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Video) */ {
  public:
   Video();
   virtual ~Video();
@@ -1114,9 +1103,7 @@ class Video final :
     return *this;
   }
   #endif
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return default_instance().GetDescriptor();
-  }
+  static const ::google::protobuf::Descriptor* descriptor();
   static const Video& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -1135,7 +1122,7 @@ class Video final :
   // implements Message ----------------------------------------------
 
   inline Video* New() const final {
-    return CreateMaybeMessage<Video>(nullptr);
+    return CreateMaybeMessage<Video>(NULL);
   }
 
   Video* New(::google::protobuf::Arena* arena) const final {
@@ -1145,21 +1132,16 @@ class Video final :
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Video& from);
   void MergeFrom(const Video& from);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
-  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
-  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
-  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
-  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      ::google::protobuf::uint8* target) const final;
+      bool deterministic, ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -1169,10 +1151,10 @@ class Video final :
   void InternalSwap(Video* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return nullptr;
+    return NULL;
   }
   inline void* MaybeArenaPtr() const {
-    return nullptr;
+    return NULL;
   }
   public:
 
@@ -1196,13 +1178,12 @@ class Video final :
 
   // @@protoc_insertion_point(class_scope:pb.Video)
  private:
-  class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::uint32 width_;
   ::google::protobuf::uint32 height_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_claim_2eproto;
+  friend struct ::protobuf_claim_2eproto::TableStruct;
 };
 // ===================================================================
 
@@ -1231,30 +1212,33 @@ inline void Claim::set_type(::pb::Claim_Type value) {
 
 // .pb.Stream stream = 2;
 inline bool Claim::has_stream() const {
-  return this != internal_default_instance() && stream_ != nullptr;
+  return this != internal_default_instance() && stream_ != NULL;
 }
 inline void Claim::clear_stream() {
-  if (GetArenaNoVirtual() == nullptr && stream_ != nullptr) {
+  if (GetArenaNoVirtual() == NULL && stream_ != NULL) {
     delete stream_;
   }
-  stream_ = nullptr;
+  stream_ = NULL;
+}
+inline const ::pb::Stream& Claim::_internal_stream() const {
+  return *stream_;
 }
 inline const ::pb::Stream& Claim::stream() const {
   const ::pb::Stream* p = stream_;
   // @@protoc_insertion_point(field_get:pb.Claim.stream)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Stream*>(
+  return p != NULL ? *p : *reinterpret_cast<const ::pb::Stream*>(
       &::pb::_Stream_default_instance_);
 }
 inline ::pb::Stream* Claim::release_stream() {
   // @@protoc_insertion_point(field_release:pb.Claim.stream)
   
   ::pb::Stream* temp = stream_;
-  stream_ = nullptr;
+  stream_ = NULL;
   return temp;
 }
 inline ::pb::Stream* Claim::mutable_stream() {
   
-  if (stream_ == nullptr) {
+  if (stream_ == NULL) {
     auto* p = CreateMaybeMessage<::pb::Stream>(GetArenaNoVirtual());
     stream_ = p;
   }
@@ -1263,11 +1247,11 @@ inline ::pb::Stream* Claim::mutable_stream() {
 }
 inline void Claim::set_allocated_stream(::pb::Stream* stream) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == nullptr) {
+  if (message_arena == NULL) {
     delete stream_;
   }
   if (stream) {
-    ::google::protobuf::Arena* submessage_arena = nullptr;
+    ::google::protobuf::Arena* submessage_arena = NULL;
     if (message_arena != submessage_arena) {
       stream = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, stream, submessage_arena);
@@ -1282,30 +1266,33 @@ inline void Claim::set_allocated_stream(::pb::Stream* stream) {
 
 // .pb.Channel channel = 3;
 inline bool Claim::has_channel() const {
-  return this != internal_default_instance() && channel_ != nullptr;
+  return this != internal_default_instance() && channel_ != NULL;
 }
 inline void Claim::clear_channel() {
-  if (GetArenaNoVirtual() == nullptr && channel_ != nullptr) {
+  if (GetArenaNoVirtual() == NULL && channel_ != NULL) {
     delete channel_;
   }
-  channel_ = nullptr;
+  channel_ = NULL;
+}
+inline const ::pb::Channel& Claim::_internal_channel() const {
+  return *channel_;
 }
 inline const ::pb::Channel& Claim::channel() const {
   const ::pb::Channel* p = channel_;
   // @@protoc_insertion_point(field_get:pb.Claim.channel)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Channel*>(
+  return p != NULL ? *p : *reinterpret_cast<const ::pb::Channel*>(
       &::pb::_Channel_default_instance_);
 }
 inline ::pb::Channel* Claim::release_channel() {
   // @@protoc_insertion_point(field_release:pb.Claim.channel)
   
   ::pb::Channel* temp = channel_;
-  channel_ = nullptr;
+  channel_ = NULL;
   return temp;
 }
 inline ::pb::Channel* Claim::mutable_channel() {
   
-  if (channel_ == nullptr) {
+  if (channel_ == NULL) {
     auto* p = CreateMaybeMessage<::pb::Channel>(GetArenaNoVirtual());
     channel_ = p;
   }
@@ -1314,11 +1301,11 @@ inline ::pb::Channel* Claim::mutable_channel() {
 }
 inline void Claim::set_allocated_channel(::pb::Channel* channel) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == nullptr) {
+  if (message_arena == NULL) {
     delete channel_;
   }
   if (channel) {
-    ::google::protobuf::Arena* submessage_arena = nullptr;
+    ::google::protobuf::Arena* submessage_arena = NULL;
     if (message_arena != submessage_arena) {
       channel = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, channel, submessage_arena);
@@ -1357,7 +1344,7 @@ inline void Channel::set_public_key(::std::string&& value) {
 }
 #endif
 inline void Channel::set_public_key(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   public_key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Channel.public_key)
@@ -1379,7 +1366,7 @@ inline ::std::string* Channel::release_public_key() {
   return public_key_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_public_key(::std::string* public_key) {
-  if (public_key != nullptr) {
+  if (public_key != NULL) {
     
   } else {
     
@@ -1410,7 +1397,7 @@ inline void Channel::set_title(::std::string&& value) {
 }
 #endif
 inline void Channel::set_title(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Channel.title)
@@ -1432,7 +1419,7 @@ inline ::std::string* Channel::release_title() {
   return title_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_title(::std::string* title) {
-  if (title != nullptr) {
+  if (title != NULL) {
     
   } else {
     
@@ -1463,7 +1450,7 @@ inline void Channel::set_description(::std::string&& value) {
 }
 #endif
 inline void Channel::set_description(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Channel.description)
@@ -1485,7 +1472,7 @@ inline ::std::string* Channel::release_description() {
   return description_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_description(::std::string* description) {
-  if (description != nullptr) {
+  if (description != NULL) {
     
   } else {
     
@@ -1516,7 +1503,7 @@ inline void Channel::set_contact_email(::std::string&& value) {
 }
 #endif
 inline void Channel::set_contact_email(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   contact_email_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Channel.contact_email)
@@ -1538,7 +1525,7 @@ inline ::std::string* Channel::release_contact_email() {
   return contact_email_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_contact_email(::std::string* contact_email) {
-  if (contact_email != nullptr) {
+  if (contact_email != NULL) {
     
   } else {
     
@@ -1569,7 +1556,7 @@ inline void Channel::set_homepage_url(::std::string&& value) {
 }
 #endif
 inline void Channel::set_homepage_url(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   homepage_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Channel.homepage_url)
@@ -1591,7 +1578,7 @@ inline ::std::string* Channel::release_homepage_url() {
   return homepage_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_homepage_url(::std::string* homepage_url) {
-  if (homepage_url != nullptr) {
+  if (homepage_url != NULL) {
     
   } else {
     
@@ -1600,6 +1587,75 @@ inline void Channel::set_allocated_homepage_url(::std::string* homepage_url) {
   // @@protoc_insertion_point(field_set_allocated:pb.Channel.homepage_url)
 }
 
+// repeated string tags = 6;
+inline int Channel::tags_size() const {
+  return tags_.size();
+}
+inline void Channel::clear_tags() {
+  tags_.Clear();
+}
+inline const ::std::string& Channel::tags(int index) const {
+  // @@protoc_insertion_point(field_get:pb.Channel.tags)
+  return tags_.Get(index);
+}
+inline ::std::string* Channel::mutable_tags(int index) {
+  // @@protoc_insertion_point(field_mutable:pb.Channel.tags)
+  return tags_.Mutable(index);
+}
+inline void Channel::set_tags(int index, const ::std::string& value) {
+  // @@protoc_insertion_point(field_set:pb.Channel.tags)
+  tags_.Mutable(index)->assign(value);
+}
+#if LANG_CXX11
+inline void Channel::set_tags(int index, ::std::string&& value) {
+  // @@protoc_insertion_point(field_set:pb.Channel.tags)
+  tags_.Mutable(index)->assign(std::move(value));
+}
+#endif
+inline void Channel::set_tags(int index, const char* value) {
+  GOOGLE_DCHECK(value != NULL);
+  tags_.Mutable(index)->assign(value);
+  // @@protoc_insertion_point(field_set_char:pb.Channel.tags)
+}
+inline void Channel::set_tags(int index, const char* value, size_t size) {
+  tags_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:pb.Channel.tags)
+}
+inline ::std::string* Channel::add_tags() {
+  // @@protoc_insertion_point(field_add_mutable:pb.Channel.tags)
+  return tags_.Add();
+}
+inline void Channel::add_tags(const ::std::string& value) {
+  tags_.Add()->assign(value);
+  // @@protoc_insertion_point(field_add:pb.Channel.tags)
+}
+#if LANG_CXX11
+inline void Channel::add_tags(::std::string&& value) {
+  tags_.Add(std::move(value));
+  // @@protoc_insertion_point(field_add:pb.Channel.tags)
+}
+#endif
+inline void Channel::add_tags(const char* value) {
+  GOOGLE_DCHECK(value != NULL);
+  tags_.Add()->assign(value);
+  // @@protoc_insertion_point(field_add_char:pb.Channel.tags)
+}
+inline void Channel::add_tags(const char* value, size_t size) {
+  tags_.Add()->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_add_pointer:pb.Channel.tags)
+}
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+Channel::tags() const {
+  // @@protoc_insertion_point(field_list:pb.Channel.tags)
+  return tags_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+Channel::mutable_tags() {
+  // @@protoc_insertion_point(field_mutable_list:pb.Channel.tags)
+  return &tags_;
+}
+
 // string thumbnail_url = 16;
 inline void Channel::clear_thumbnail_url() {
   thumbnail_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -1622,7 +1678,7 @@ inline void Channel::set_thumbnail_url(::std::string&& value) {
 }
 #endif
 inline void Channel::set_thumbnail_url(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   thumbnail_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Channel.thumbnail_url)
@@ -1644,7 +1700,7 @@ inline ::std::string* Channel::release_thumbnail_url() {
   return thumbnail_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_thumbnail_url(::std::string* thumbnail_url) {
-  if (thumbnail_url != nullptr) {
+  if (thumbnail_url != NULL) {
     
   } else {
     
@@ -1675,7 +1731,7 @@ inline void Channel::set_cover_url(::std::string&& value) {
 }
 #endif
 inline void Channel::set_cover_url(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   cover_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Channel.cover_url)
@@ -1697,7 +1753,7 @@ inline ::std::string* Channel::release_cover_url() {
   return cover_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_cover_url(::std::string* cover_url) {
-  if (cover_url != nullptr) {
+  if (cover_url != NULL) {
     
   } else {
     
@@ -1732,7 +1788,7 @@ inline void Stream::set_hash(::std::string&& value) {
 }
 #endif
 inline void Stream::set_hash(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   hash_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.hash)
@@ -1754,7 +1810,7 @@ inline ::std::string* Stream::release_hash() {
   return hash_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_hash(::std::string* hash) {
-  if (hash != nullptr) {
+  if (hash != NULL) {
     
   } else {
     
@@ -1785,7 +1841,7 @@ inline void Stream::set_language(::std::string&& value) {
 }
 #endif
 inline void Stream::set_language(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   language_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.language)
@@ -1807,7 +1863,7 @@ inline ::std::string* Stream::release_language() {
   return language_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_language(::std::string* language) {
-  if (language != nullptr) {
+  if (language != NULL) {
     
   } else {
     
@@ -1838,7 +1894,7 @@ inline void Stream::set_title(::std::string&& value) {
 }
 #endif
 inline void Stream::set_title(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.title)
@@ -1860,7 +1916,7 @@ inline ::std::string* Stream::release_title() {
   return title_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_title(::std::string* title) {
-  if (title != nullptr) {
+  if (title != NULL) {
     
   } else {
     
@@ -1891,7 +1947,7 @@ inline void Stream::set_author(::std::string&& value) {
 }
 #endif
 inline void Stream::set_author(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.author)
@@ -1913,7 +1969,7 @@ inline ::std::string* Stream::release_author() {
   return author_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_author(::std::string* author) {
-  if (author != nullptr) {
+  if (author != NULL) {
     
   } else {
     
@@ -1944,7 +2000,7 @@ inline void Stream::set_description(::std::string&& value) {
 }
 #endif
 inline void Stream::set_description(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.description)
@@ -1966,7 +2022,7 @@ inline ::std::string* Stream::release_description() {
   return description_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_description(::std::string* description) {
-  if (description != nullptr) {
+  if (description != NULL) {
     
   } else {
     
@@ -1997,7 +2053,7 @@ inline void Stream::set_media_type(::std::string&& value) {
 }
 #endif
 inline void Stream::set_media_type(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   media_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.media_type)
@@ -2019,7 +2075,7 @@ inline ::std::string* Stream::release_media_type() {
   return media_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_media_type(::std::string* media_type) {
-  if (media_type != nullptr) {
+  if (media_type != NULL) {
     
   } else {
     
@@ -2050,7 +2106,7 @@ inline void Stream::set_license(::std::string&& value) {
 }
 #endif
 inline void Stream::set_license(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.license)
@@ -2072,7 +2128,7 @@ inline ::std::string* Stream::release_license() {
   return license_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_license(::std::string* license) {
-  if (license != nullptr) {
+  if (license != NULL) {
     
   } else {
     
@@ -2083,30 +2139,33 @@ inline void Stream::set_allocated_license(::std::string* license) {
 
 // .pb.File file = 8;
 inline bool Stream::has_file() const {
-  return this != internal_default_instance() && file_ != nullptr;
+  return this != internal_default_instance() && file_ != NULL;
 }
 inline void Stream::clear_file() {
-  if (GetArenaNoVirtual() == nullptr && file_ != nullptr) {
+  if (GetArenaNoVirtual() == NULL && file_ != NULL) {
     delete file_;
   }
-  file_ = nullptr;
+  file_ = NULL;
+}
+inline const ::pb::File& Stream::_internal_file() const {
+  return *file_;
 }
 inline const ::pb::File& Stream::file() const {
   const ::pb::File* p = file_;
   // @@protoc_insertion_point(field_get:pb.Stream.file)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::File*>(
+  return p != NULL ? *p : *reinterpret_cast<const ::pb::File*>(
       &::pb::_File_default_instance_);
 }
 inline ::pb::File* Stream::release_file() {
   // @@protoc_insertion_point(field_release:pb.Stream.file)
   
   ::pb::File* temp = file_;
-  file_ = nullptr;
+  file_ = NULL;
   return temp;
 }
 inline ::pb::File* Stream::mutable_file() {
   
-  if (file_ == nullptr) {
+  if (file_ == NULL) {
     auto* p = CreateMaybeMessage<::pb::File>(GetArenaNoVirtual());
     file_ = p;
   }
@@ -2115,11 +2174,11 @@ inline ::pb::File* Stream::mutable_file() {
 }
 inline void Stream::set_allocated_file(::pb::File* file) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == nullptr) {
+  if (message_arena == NULL) {
     delete file_;
   }
   if (file) {
-    ::google::protobuf::Arena* submessage_arena = nullptr;
+    ::google::protobuf::Arena* submessage_arena = NULL;
     if (message_arena != submessage_arena) {
       file = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, file, submessage_arena);
@@ -2134,30 +2193,33 @@ inline void Stream::set_allocated_file(::pb::File* file) {
 
 // .pb.Fee fee = 16;
 inline bool Stream::has_fee() const {
-  return this != internal_default_instance() && fee_ != nullptr;
+  return this != internal_default_instance() && fee_ != NULL;
 }
 inline void Stream::clear_fee() {
-  if (GetArenaNoVirtual() == nullptr && fee_ != nullptr) {
+  if (GetArenaNoVirtual() == NULL && fee_ != NULL) {
     delete fee_;
   }
-  fee_ = nullptr;
+  fee_ = NULL;
+}
+inline const ::pb::Fee& Stream::_internal_fee() const {
+  return *fee_;
 }
 inline const ::pb::Fee& Stream::fee() const {
   const ::pb::Fee* p = fee_;
   // @@protoc_insertion_point(field_get:pb.Stream.fee)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Fee*>(
+  return p != NULL ? *p : *reinterpret_cast<const ::pb::Fee*>(
       &::pb::_Fee_default_instance_);
 }
 inline ::pb::Fee* Stream::release_fee() {
   // @@protoc_insertion_point(field_release:pb.Stream.fee)
   
   ::pb::Fee* temp = fee_;
-  fee_ = nullptr;
+  fee_ = NULL;
   return temp;
 }
 inline ::pb::Fee* Stream::mutable_fee() {
   
-  if (fee_ == nullptr) {
+  if (fee_ == NULL) {
     auto* p = CreateMaybeMessage<::pb::Fee>(GetArenaNoVirtual());
     fee_ = p;
   }
@@ -2166,11 +2228,11 @@ inline ::pb::Fee* Stream::mutable_fee() {
 }
 inline void Stream::set_allocated_fee(::pb::Fee* fee) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == nullptr) {
+  if (message_arena == NULL) {
     delete fee_;
   }
   if (fee) {
-    ::google::protobuf::Arena* submessage_arena = nullptr;
+    ::google::protobuf::Arena* submessage_arena = NULL;
     if (message_arena != submessage_arena) {
       fee = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, fee, submessage_arena);
@@ -2205,7 +2267,7 @@ inline void Stream::set_license_url(::std::string&& value) {
 }
 #endif
 inline void Stream::set_license_url(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   license_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.license_url)
@@ -2227,7 +2289,7 @@ inline ::std::string* Stream::release_license_url() {
   return license_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_license_url(::std::string* license_url) {
-  if (license_url != nullptr) {
+  if (license_url != NULL) {
     
   } else {
     
@@ -2258,7 +2320,7 @@ inline void Stream::set_thumbnail_url(::std::string&& value) {
 }
 #endif
 inline void Stream::set_thumbnail_url(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   thumbnail_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Stream.thumbnail_url)
@@ -2280,7 +2342,7 @@ inline ::std::string* Stream::release_thumbnail_url() {
   return thumbnail_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_thumbnail_url(::std::string* thumbnail_url) {
-  if (thumbnail_url != nullptr) {
+  if (thumbnail_url != NULL) {
     
   } else {
     
@@ -2329,7 +2391,7 @@ inline void Stream::set_tags(int index, ::std::string&& value) {
 }
 #endif
 inline void Stream::set_tags(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   tags_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set_char:pb.Stream.tags)
 }
@@ -2353,7 +2415,7 @@ inline void Stream::add_tags(::std::string&& value) {
 }
 #endif
 inline void Stream::add_tags(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   tags_.Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:pb.Stream.tags)
 }
@@ -2361,12 +2423,12 @@ inline void Stream::add_tags(const char* value, size_t size) {
   tags_.Add()->assign(reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:pb.Stream.tags)
 }
-inline const ::google::protobuf::RepeatedPtrField<::std::string>&
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
 Stream::tags() const {
   // @@protoc_insertion_point(field_list:pb.Stream.tags)
   return tags_;
 }
-inline ::google::protobuf::RepeatedPtrField<::std::string>*
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
 Stream::mutable_tags() {
   // @@protoc_insertion_point(field_mutable_list:pb.Stream.tags)
   return &tags_;
@@ -2374,7 +2436,7 @@ Stream::mutable_tags() {
 
 // int64 release_time = 21;
 inline void Stream::clear_release_time() {
-  release_time_ = PROTOBUF_LONGLONG(0);
+  release_time_ = GOOGLE_LONGLONG(0);
 }
 inline ::google::protobuf::int64 Stream::release_time() const {
   // @@protoc_insertion_point(field_get:pb.Stream.release_time)
@@ -2388,30 +2450,33 @@ inline void Stream::set_release_time(::google::protobuf::int64 value) {
 
 // .pb.Video video = 22;
 inline bool Stream::has_video() const {
-  return this != internal_default_instance() && video_ != nullptr;
+  return this != internal_default_instance() && video_ != NULL;
 }
 inline void Stream::clear_video() {
-  if (GetArenaNoVirtual() == nullptr && video_ != nullptr) {
+  if (GetArenaNoVirtual() == NULL && video_ != NULL) {
     delete video_;
   }
-  video_ = nullptr;
+  video_ = NULL;
+}
+inline const ::pb::Video& Stream::_internal_video() const {
+  return *video_;
 }
 inline const ::pb::Video& Stream::video() const {
   const ::pb::Video* p = video_;
   // @@protoc_insertion_point(field_get:pb.Stream.video)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Video*>(
+  return p != NULL ? *p : *reinterpret_cast<const ::pb::Video*>(
       &::pb::_Video_default_instance_);
 }
 inline ::pb::Video* Stream::release_video() {
   // @@protoc_insertion_point(field_release:pb.Stream.video)
   
   ::pb::Video* temp = video_;
-  video_ = nullptr;
+  video_ = NULL;
   return temp;
 }
 inline ::pb::Video* Stream::mutable_video() {
   
-  if (video_ == nullptr) {
+  if (video_ == NULL) {
     auto* p = CreateMaybeMessage<::pb::Video>(GetArenaNoVirtual());
     video_ = p;
   }
@@ -2420,11 +2485,11 @@ inline ::pb::Video* Stream::mutable_video() {
 }
 inline void Stream::set_allocated_video(::pb::Video* video) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == nullptr) {
+  if (message_arena == NULL) {
     delete video_;
   }
   if (video) {
-    ::google::protobuf::Arena* submessage_arena = nullptr;
+    ::google::protobuf::Arena* submessage_arena = NULL;
     if (message_arena != submessage_arena) {
       video = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, video, submessage_arena);
@@ -2477,7 +2542,7 @@ inline void Fee::set_address(::std::string&& value) {
 }
 #endif
 inline void Fee::set_address(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.Fee.address)
@@ -2499,7 +2564,7 @@ inline ::std::string* Fee::release_address() {
   return address_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Fee::set_allocated_address(::std::string* address) {
-  if (address != nullptr) {
+  if (address != NULL) {
     
   } else {
     
@@ -2510,7 +2575,7 @@ inline void Fee::set_allocated_address(::std::string* address) {
 
 // uint64 amount = 3;
 inline void Fee::clear_amount() {
-  amount_ = PROTOBUF_ULONGLONG(0);
+  amount_ = GOOGLE_ULONGLONG(0);
 }
 inline ::google::protobuf::uint64 Fee::amount() const {
   // @@protoc_insertion_point(field_get:pb.Fee.amount)
@@ -2548,7 +2613,7 @@ inline void File::set_name(::std::string&& value) {
 }
 #endif
 inline void File::set_name(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
+  GOOGLE_DCHECK(value != NULL);
   
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:pb.File.name)
@@ -2570,7 +2635,7 @@ inline ::std::string* File::release_name() {
   return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void File::set_allocated_name(::std::string* name) {
-  if (name != nullptr) {
+  if (name != NULL) {
     
   } else {
     
@@ -2581,7 +2646,7 @@ inline void File::set_allocated_name(::std::string* name) {
 
 // uint64 size = 2;
 inline void File::clear_size() {
-  size_ = PROTOBUF_ULONGLONG(0);
+  size_ = GOOGLE_ULONGLONG(0);
 }
 inline ::google::protobuf::uint64 File::size() const {
   // @@protoc_insertion_point(field_get:pb.File.size)
@@ -2662,5 +2727,4 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::Fee_Currency>() {
 
 // @@protoc_insertion_point(global_scope)
 
-#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_claim_2eproto
diff --git a/v2/go/claim.pb.go b/v2/go/claim.pb.go
index f2b3af8..ea8307b 100644
--- a/v2/go/claim.pb.go
+++ b/v2/go/claim.pb.go
@@ -3,11 +3,9 @@
 
 package pb
 
-import (
-	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
-	math "math"
-)
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -18,7 +16,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Claim_Type int32
 
@@ -31,7 +29,6 @@ var Claim_Type_name = map[int32]string{
 	0: "STREAM",
 	1: "CHANNEL",
 }
-
 var Claim_Type_value = map[string]int32{
 	"STREAM":  0,
 	"CHANNEL": 1,
@@ -40,9 +37,8 @@ var Claim_Type_value = map[string]int32{
 func (x Claim_Type) String() string {
 	return proto.EnumName(Claim_Type_name, int32(x))
 }
-
 func (Claim_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{0, 0}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{0, 0}
 }
 
 type Fee_Currency int32
@@ -56,7 +52,6 @@ var Fee_Currency_name = map[int32]string{
 	0: "LBC",
 	1: "USD",
 }
-
 var Fee_Currency_value = map[string]int32{
 	"LBC": 0,
 	"USD": 1,
@@ -65,9 +60,8 @@ var Fee_Currency_value = map[string]int32{
 func (x Fee_Currency) String() string {
 	return proto.EnumName(Fee_Currency_name, int32(x))
 }
-
 func (Fee_Currency) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{3, 0}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{3, 0}
 }
 
 type Claim struct {
@@ -83,17 +77,16 @@ func (m *Claim) Reset()         { *m = Claim{} }
 func (m *Claim) String() string { return proto.CompactTextString(m) }
 func (*Claim) ProtoMessage()    {}
 func (*Claim) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{0}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{0}
 }
-
 func (m *Claim) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Claim.Unmarshal(m, b)
 }
 func (m *Claim) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Claim.Marshal(b, m, deterministic)
 }
-func (m *Claim) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Claim.Merge(m, src)
+func (dst *Claim) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Claim.Merge(dst, src)
 }
 func (m *Claim) XXX_Size() int {
 	return xxx_messageInfo_Claim.Size(m)
@@ -131,6 +124,7 @@ type Channel struct {
 	Description          string   `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	ContactEmail         string   `protobuf:"bytes,4,opt,name=contact_email,json=contactEmail,proto3" json:"contact_email,omitempty"`
 	HomepageUrl          string   `protobuf:"bytes,5,opt,name=homepage_url,json=homepageUrl,proto3" json:"homepage_url,omitempty"`
+	Tags                 []string `protobuf:"bytes,6,rep,name=tags,proto3" json:"tags,omitempty"`
 	ThumbnailUrl         string   `protobuf:"bytes,16,opt,name=thumbnail_url,json=thumbnailUrl,proto3" json:"thumbnail_url,omitempty"`
 	CoverUrl             string   `protobuf:"bytes,17,opt,name=cover_url,json=coverUrl,proto3" json:"cover_url,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -142,17 +136,16 @@ func (m *Channel) Reset()         { *m = Channel{} }
 func (m *Channel) String() string { return proto.CompactTextString(m) }
 func (*Channel) ProtoMessage()    {}
 func (*Channel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{1}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{1}
 }
-
 func (m *Channel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Channel.Unmarshal(m, b)
 }
 func (m *Channel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Channel.Marshal(b, m, deterministic)
 }
-func (m *Channel) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Channel.Merge(m, src)
+func (dst *Channel) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Channel.Merge(dst, src)
 }
 func (m *Channel) XXX_Size() int {
 	return xxx_messageInfo_Channel.Size(m)
@@ -198,6 +191,13 @@ func (m *Channel) GetHomepageUrl() string {
 	return ""
 }
 
+func (m *Channel) GetTags() []string {
+	if m != nil {
+		return m.Tags
+	}
+	return nil
+}
+
 func (m *Channel) GetThumbnailUrl() string {
 	if m != nil {
 		return m.ThumbnailUrl
@@ -237,17 +237,16 @@ func (m *Stream) Reset()         { *m = Stream{} }
 func (m *Stream) String() string { return proto.CompactTextString(m) }
 func (*Stream) ProtoMessage()    {}
 func (*Stream) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{2}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{2}
 }
-
 func (m *Stream) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Stream.Unmarshal(m, b)
 }
 func (m *Stream) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Stream.Marshal(b, m, deterministic)
 }
-func (m *Stream) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Stream.Merge(m, src)
+func (dst *Stream) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Stream.Merge(dst, src)
 }
 func (m *Stream) XXX_Size() int {
 	return xxx_messageInfo_Stream.Size(m)
@@ -376,17 +375,16 @@ func (m *Fee) Reset()         { *m = Fee{} }
 func (m *Fee) String() string { return proto.CompactTextString(m) }
 func (*Fee) ProtoMessage()    {}
 func (*Fee) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{3}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{3}
 }
-
 func (m *Fee) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Fee.Unmarshal(m, b)
 }
 func (m *Fee) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Fee.Marshal(b, m, deterministic)
 }
-func (m *Fee) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Fee.Merge(m, src)
+func (dst *Fee) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Fee.Merge(dst, src)
 }
 func (m *Fee) XXX_Size() int {
 	return xxx_messageInfo_Fee.Size(m)
@@ -430,17 +428,16 @@ func (m *File) Reset()         { *m = File{} }
 func (m *File) String() string { return proto.CompactTextString(m) }
 func (*File) ProtoMessage()    {}
 func (*File) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{4}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{4}
 }
-
 func (m *File) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_File.Unmarshal(m, b)
 }
 func (m *File) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_File.Marshal(b, m, deterministic)
 }
-func (m *File) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_File.Merge(m, src)
+func (dst *File) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_File.Merge(dst, src)
 }
 func (m *File) XXX_Size() int {
 	return xxx_messageInfo_File.Size(m)
@@ -477,17 +474,16 @@ func (m *Video) Reset()         { *m = Video{} }
 func (m *Video) String() string { return proto.CompactTextString(m) }
 func (*Video) ProtoMessage()    {}
 func (*Video) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bae86789b513b1db, []int{5}
+	return fileDescriptor_claim_a3202fb9f6ae6b3e, []int{5}
 }
-
 func (m *Video) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Video.Unmarshal(m, b)
 }
 func (m *Video) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Video.Marshal(b, m, deterministic)
 }
-func (m *Video) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Video.Merge(m, src)
+func (dst *Video) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Video.Merge(dst, src)
 }
 func (m *Video) XXX_Size() int {
 	return xxx_messageInfo_Video.Size(m)
@@ -513,57 +509,57 @@ func (m *Video) GetHeight() uint32 {
 }
 
 func init() {
-	proto.RegisterEnum("pb.Claim_Type", Claim_Type_name, Claim_Type_value)
-	proto.RegisterEnum("pb.Fee_Currency", Fee_Currency_name, Fee_Currency_value)
 	proto.RegisterType((*Claim)(nil), "pb.Claim")
 	proto.RegisterType((*Channel)(nil), "pb.Channel")
 	proto.RegisterType((*Stream)(nil), "pb.Stream")
 	proto.RegisterType((*Fee)(nil), "pb.Fee")
 	proto.RegisterType((*File)(nil), "pb.File")
 	proto.RegisterType((*Video)(nil), "pb.Video")
+	proto.RegisterEnum("pb.Claim_Type", Claim_Type_name, Claim_Type_value)
+	proto.RegisterEnum("pb.Fee_Currency", Fee_Currency_name, Fee_Currency_value)
 }
 
-func init() { proto.RegisterFile("claim.proto", fileDescriptor_bae86789b513b1db) }
+func init() { proto.RegisterFile("claim.proto", fileDescriptor_claim_a3202fb9f6ae6b3e) }
 
-var fileDescriptor_bae86789b513b1db = []byte{
-	// 614 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xeb, 0xda, 0x49, 0xec, 0x71, 0x52, 0x85, 0xa5, 0x54, 0xa6, 0xb4, 0x6a, 0x30, 0x42,
-	0xca, 0x01, 0xe5, 0x50, 0xc4, 0x03, 0x94, 0xd0, 0x0a, 0x89, 0xd2, 0xc3, 0xb6, 0xe5, 0x1a, 0x6d,
-	0xec, 0x69, 0xbc, 0x62, 0xfd, 0x47, 0xf6, 0xba, 0x28, 0x5c, 0x79, 0x08, 0x5e, 0x84, 0xa7, 0xe2,
-	0x29, 0xd0, 0x8e, 0x37, 0xa1, 0x82, 0xde, 0x66, 0x7e, 0x33, 0x19, 0xcd, 0xf7, 0xcd, 0x3a, 0x10,
-	0x26, 0x4a, 0xc8, 0x7c, 0x56, 0xd5, 0xa5, 0x2e, 0xd9, 0x6e, 0xb5, 0x8c, 0x7f, 0x3a, 0xd0, 0x9b,
-	0x1b, 0xc6, 0x62, 0xf0, 0xf4, 0xba, 0xc2, 0xc8, 0x99, 0x38, 0xd3, 0xbd, 0xd3, 0xbd, 0x59, 0xb5,
-	0x9c, 0x51, 0x61, 0x76, 0xb3, 0xae, 0x90, 0x53, 0x8d, 0xc5, 0xd0, 0x6f, 0x74, 0x8d, 0x22, 0x8f,
-	0x76, 0x27, 0xce, 0x34, 0x3c, 0x05, 0xd3, 0x75, 0x4d, 0x84, 0xdb, 0x0a, 0x7b, 0x0d, 0x83, 0x24,
-	0x13, 0x45, 0x81, 0x2a, 0x72, 0xa9, 0x29, 0xa4, 0x51, 0x1d, 0xe2, 0x9b, 0x5a, 0x7c, 0x02, 0x9e,
-	0x19, 0xcc, 0x00, 0xfa, 0xd7, 0x37, 0xfc, 0xfc, 0xec, 0xf3, 0x78, 0x87, 0x85, 0x30, 0x98, 0x7f,
-	0x3c, 0xbb, 0xba, 0x3a, 0xbf, 0x1c, 0x3b, 0xf1, 0x6f, 0x07, 0x06, 0xf6, 0x57, 0xec, 0x18, 0xa0,
-	0x6a, 0x97, 0x4a, 0x26, 0x8b, 0xaf, 0xb8, 0xa6, 0x0d, 0x87, 0x3c, 0xe8, 0xc8, 0x27, 0x5c, 0xb3,
-	0x7d, 0xe8, 0x69, 0xa9, 0x15, 0xd2, 0x56, 0x01, 0xef, 0x12, 0x36, 0x81, 0x30, 0xc5, 0x26, 0xa9,
-	0x65, 0xa5, 0x65, 0x59, 0xd0, 0x32, 0x01, 0x7f, 0x88, 0xd8, 0x2b, 0x18, 0x25, 0x65, 0xa1, 0x45,
-	0xa2, 0x17, 0x98, 0x0b, 0xa9, 0x22, 0x8f, 0x7a, 0x86, 0x16, 0x9e, 0x1b, 0xc6, 0x5e, 0xc2, 0x30,
-	0x2b, 0x73, 0xac, 0xc4, 0x0a, 0x17, 0x6d, 0xad, 0xa2, 0x5e, 0x37, 0x67, 0xc3, 0x6e, 0x6b, 0x65,
-	0xe6, 0xe8, 0xac, 0xcd, 0x97, 0x85, 0x90, 0x8a, 0x7a, 0xc6, 0xdd, 0x9c, 0x2d, 0x34, 0x4d, 0x2f,
-	0x20, 0x48, 0xca, 0x7b, 0xac, 0xa9, 0xe1, 0x09, 0x35, 0xf8, 0x04, 0x6e, 0x6b, 0x15, 0xff, 0x72,
-	0xa1, 0xdf, 0xf9, 0xc8, 0x18, 0x78, 0x99, 0x68, 0x32, 0xab, 0x92, 0x62, 0x76, 0x08, 0xbe, 0x12,
-	0xc5, 0xaa, 0x15, 0xab, 0x8d, 0xc6, 0x6d, 0xfe, 0x57, 0xbc, 0xfb, 0x50, 0xfc, 0x01, 0xf4, 0x45,
-	0xab, 0xb3, 0xb2, 0xb6, 0x9a, 0x6c, 0xf6, 0xaf, 0x29, 0xbd, 0xff, 0x4d, 0x39, 0x06, 0xc8, 0x31,
-	0x95, 0x62, 0x41, 0xaf, 0xa1, 0x4f, 0x0d, 0x01, 0x11, 0xba, 0x57, 0x04, 0x03, 0x25, 0x13, 0x2c,
-	0x1a, 0x8c, 0x06, 0x54, 0xdb, 0xa4, 0xec, 0x08, 0xbc, 0x3b, 0xa9, 0x30, 0xf2, 0xe9, 0xea, 0xbe,
-	0xb9, 0xfa, 0x85, 0x54, 0xc8, 0x89, 0xb2, 0xe7, 0xe0, 0xde, 0x21, 0x92, 0x33, 0xe1, 0xe9, 0x80,
-	0x8a, 0x88, 0xdc, 0x30, 0x76, 0x02, 0xa1, 0x9d, 0xf1, 0xc0, 0x1b, 0xb0, 0xe8, 0x51, 0x7f, 0xd9,
-	0x23, 0xfe, 0x1e, 0x82, 0x9f, 0xb6, 0xb5, 0x20, 0x59, 0x4f, 0x27, 0xce, 0x74, 0xc4, 0xb7, 0xb9,
-	0xf1, 0x54, 0x8b, 0x55, 0x13, 0xed, 0x4f, 0xdc, 0x69, 0xc0, 0x29, 0x36, 0x77, 0xad, 0x51, 0xa1,
-	0x68, 0x70, 0xa1, 0x65, 0x8e, 0xd1, 0xb3, 0x89, 0x33, 0x75, 0x79, 0x68, 0xd9, 0x8d, 0xcc, 0xcd,
-	0x62, 0xbd, 0x7b, 0x99, 0x62, 0x19, 0x1d, 0xd0, 0xd6, 0x81, 0xd9, 0xfa, 0x8b, 0x01, 0xbc, 0xe3,
-	0xf1, 0x0f, 0x07, 0xdc, 0x0b, 0x44, 0xf6, 0x06, 0xfc, 0xa4, 0xad, 0x6b, 0x2c, 0x92, 0xb5, 0xfd,
-	0x7e, 0xc6, 0x56, 0xe1, 0x6c, 0x6e, 0x39, 0xdf, 0x76, 0x18, 0x0b, 0x45, 0x9a, 0xd6, 0xd8, 0x34,
-	0x74, 0xcc, 0x21, 0xdf, 0xa4, 0x74, 0xb5, 0xbc, 0x6c, 0x0b, 0x4d, 0xc7, 0xf4, 0xb8, 0xcd, 0xe2,
-	0x23, 0xf0, 0x37, 0x73, 0xd8, 0x00, 0xdc, 0xcb, 0xf7, 0xf3, 0xf1, 0x8e, 0x09, 0x6e, 0xaf, 0x3f,
-	0x8c, 0x9d, 0x78, 0x06, 0x9e, 0x31, 0xda, 0xa8, 0x2c, 0x44, 0xde, 0x7d, 0xc1, 0x01, 0xa7, 0xd8,
-	0xb0, 0x46, 0x7e, 0xef, 0x5e, 0x8d, 0xc7, 0x29, 0x8e, 0xdf, 0x41, 0x8f, 0x54, 0x98, 0xa7, 0xf3,
-	0x4d, 0xa6, 0xba, 0x7b, 0x6b, 0x23, 0xde, 0x25, 0x66, 0x89, 0x0c, 0xe5, 0x2a, 0xd3, 0xf4, 0xa3,
-	0x11, 0xb7, 0xd9, 0xb2, 0x4f, 0xff, 0x1a, 0x6f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xbb,
-	0x5b, 0xad, 0x44, 0x04, 0x00, 0x00,
+var fileDescriptor_claim_a3202fb9f6ae6b3e = []byte{
+	// 624 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x94, 0xcd, 0x6e, 0xdb, 0x48,
+	0x0c, 0xc7, 0xa3, 0x48, 0xb6, 0x25, 0xca, 0x0e, 0xbc, 0xb3, 0xd9, 0x40, 0x9b, 0x4d, 0x10, 0x47,
+	0x8b, 0x02, 0x3e, 0x14, 0x3e, 0xa4, 0xe8, 0x03, 0xa4, 0x6e, 0x82, 0x02, 0x4d, 0x73, 0x98, 0x24,
+	0xbd, 0x1a, 0x63, 0x89, 0xb1, 0x06, 0x1d, 0x7d, 0x40, 0x1a, 0xa5, 0x70, 0xaf, 0x7d, 0x88, 0xbe,
+	0x48, 0x9f, 0xaf, 0x28, 0x86, 0x1a, 0xbb, 0x46, 0xd3, 0x1b, 0xf9, 0x23, 0x87, 0x26, 0xff, 0xa4,
+	0x0c, 0x61, 0xa2, 0x84, 0xcc, 0x67, 0x55, 0x5d, 0xea, 0x92, 0xed, 0x57, 0xcb, 0xf8, 0x9b, 0x03,
+	0xbd, 0xb9, 0x61, 0x2c, 0x06, 0x4f, 0xaf, 0x2b, 0x8c, 0x9c, 0x89, 0x33, 0x3d, 0xb8, 0x38, 0x98,
+	0x55, 0xcb, 0x19, 0x05, 0x66, 0xf7, 0xeb, 0x0a, 0x39, 0xc5, 0x58, 0x0c, 0xfd, 0x46, 0xd7, 0x28,
+	0xf2, 0x68, 0x7f, 0xe2, 0x4c, 0xc3, 0x0b, 0x30, 0x59, 0x77, 0x44, 0xb8, 0x8d, 0xb0, 0x17, 0x30,
+	0x48, 0x32, 0x51, 0x14, 0xa8, 0x22, 0x97, 0x92, 0x42, 0x2a, 0xd5, 0x21, 0xbe, 0x89, 0xc5, 0x67,
+	0xe0, 0x99, 0xc2, 0x0c, 0xa0, 0x7f, 0x77, 0xcf, 0xaf, 0x2e, 0x3f, 0x8c, 0xf7, 0x58, 0x08, 0x83,
+	0xf9, 0xbb, 0xcb, 0xdb, 0xdb, 0xab, 0x9b, 0xb1, 0x13, 0xff, 0x70, 0x60, 0x60, 0x5f, 0xb1, 0x53,
+	0x80, 0xaa, 0x5d, 0x2a, 0x99, 0x2c, 0x3e, 0xe1, 0x9a, 0x3a, 0x1c, 0xf2, 0xa0, 0x23, 0xef, 0x71,
+	0xcd, 0x0e, 0xa1, 0xa7, 0xa5, 0x56, 0x48, 0x5d, 0x05, 0xbc, 0x73, 0xd8, 0x04, 0xc2, 0x14, 0x9b,
+	0xa4, 0x96, 0x95, 0x96, 0x65, 0x41, 0xcd, 0x04, 0x7c, 0x17, 0xb1, 0xff, 0x61, 0x94, 0x94, 0x85,
+	0x16, 0x89, 0x5e, 0x60, 0x2e, 0xa4, 0x8a, 0x3c, 0xca, 0x19, 0x5a, 0x78, 0x65, 0x18, 0x3b, 0x87,
+	0x61, 0x56, 0xe6, 0x58, 0x89, 0x15, 0x2e, 0xda, 0x5a, 0x45, 0xbd, 0xae, 0xce, 0x86, 0x3d, 0xd4,
+	0x8a, 0x31, 0xf0, 0xb4, 0x58, 0x35, 0x51, 0x7f, 0xe2, 0x4e, 0x03, 0x4e, 0xb6, 0xa9, 0xad, 0xb3,
+	0x36, 0x5f, 0x16, 0x42, 0x2a, 0x7a, 0x37, 0xee, 0x6a, 0x6f, 0xa1, 0x79, 0xf8, 0x1f, 0x04, 0x49,
+	0xf9, 0x84, 0x35, 0x25, 0xfc, 0x45, 0x09, 0x3e, 0x81, 0x87, 0x5a, 0xc5, 0xdf, 0x5d, 0xe8, 0x77,
+	0xda, 0x9a, 0x1f, 0xc8, 0x44, 0x93, 0xd9, 0xc9, 0xc9, 0x66, 0xc7, 0xe0, 0x2b, 0x51, 0xac, 0x5a,
+	0xb1, 0xda, 0xcc, 0xbd, 0xf5, 0x7f, 0x09, 0xe2, 0xee, 0x0a, 0x72, 0x04, 0x7d, 0xd1, 0xea, 0xac,
+	0xac, 0xed, 0x9c, 0xd6, 0xfb, 0x5d, 0xa8, 0xde, 0x73, 0xa1, 0x4e, 0x01, 0x72, 0x4c, 0xa5, 0x58,
+	0xd0, 0x85, 0xf4, 0x29, 0x21, 0x20, 0x42, 0x3b, 0x8c, 0x60, 0xa0, 0x64, 0x82, 0x45, 0x83, 0xd1,
+	0x80, 0x62, 0x1b, 0x97, 0x9d, 0x80, 0xf7, 0x28, 0x15, 0x46, 0x3e, 0x5d, 0x82, 0x6f, 0x2e, 0xe1,
+	0x5a, 0x2a, 0xe4, 0x44, 0xd9, 0xbf, 0xe0, 0x3e, 0x22, 0x92, 0x32, 0xe1, 0xc5, 0x80, 0x82, 0x88,
+	0xdc, 0x30, 0x76, 0x06, 0xa1, 0xad, 0xb1, 0xa3, 0x0d, 0x58, 0x64, 0xa4, 0x7b, 0xa6, 0x2f, 0xfb,
+	0x83, 0xbe, 0xc7, 0xe0, 0xa7, 0x6d, 0x2d, 0x68, 0xac, 0xbf, 0x27, 0xce, 0x74, 0xc4, 0xb7, 0xfe,
+	0x76, 0x69, 0x87, 0x3b, 0x4b, 0x3b, 0x87, 0x61, 0x8d, 0x0a, 0x45, 0x83, 0x0b, 0x2d, 0x73, 0x8c,
+	0xfe, 0x99, 0x38, 0x53, 0x97, 0x87, 0x96, 0xdd, 0xcb, 0xdc, 0x34, 0xd6, 0x7b, 0x92, 0x29, 0x96,
+	0xd1, 0x11, 0x75, 0x1d, 0x98, 0xae, 0x3f, 0x1a, 0xc0, 0x3b, 0x1e, 0x7f, 0x75, 0xc0, 0xbd, 0x46,
+	0x64, 0x2f, 0xc1, 0x4f, 0xda, 0xba, 0xc6, 0x22, 0x59, 0xdb, 0x6f, 0x6a, 0x6c, 0x27, 0x9c, 0xcd,
+	0x2d, 0xe7, 0xdb, 0x0c, 0x23, 0xa1, 0x48, 0xd3, 0x1a, 0x9b, 0x86, 0x96, 0x39, 0xe4, 0x1b, 0x97,
+	0xb6, 0x96, 0x97, 0x6d, 0xa1, 0x69, 0x99, 0x1e, 0xb7, 0x5e, 0x7c, 0x02, 0xfe, 0xa6, 0x0e, 0x1b,
+	0x80, 0x7b, 0xf3, 0x66, 0x3e, 0xde, 0x33, 0xc6, 0xc3, 0xdd, 0xdb, 0xb1, 0x13, 0xcf, 0xc0, 0x33,
+	0x42, 0x9b, 0x29, 0x0b, 0x91, 0x77, 0x5f, 0x75, 0xc0, 0xc9, 0x36, 0xac, 0x91, 0x5f, 0xba, 0xab,
+	0xf1, 0x38, 0xd9, 0xf1, 0x6b, 0xe8, 0xd1, 0x14, 0xe6, 0x74, 0x3e, 0xcb, 0x54, 0x77, 0xb7, 0x36,
+	0xe2, 0x9d, 0x63, 0x9a, 0xc8, 0x50, 0xae, 0x32, 0x4d, 0x8f, 0x46, 0xdc, 0x7a, 0xcb, 0x3e, 0xfd,
+	0x93, 0xbc, 0xfa, 0x19, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xd7, 0xcb, 0x38, 0x58, 0x04, 0x00, 0x00,
 }
diff --git a/v2/js/claim_pb.js b/v2/js/claim_pb.js
index 5ad34c0..f5a37de 100644
--- a/v2/js/claim_pb.js
+++ b/v2/js/claim_pb.js
@@ -19,6 +19,7 @@ goog.exportSymbol('proto.pb.Fee.Currency', null, global);
 goog.exportSymbol('proto.pb.File', null, global);
 goog.exportSymbol('proto.pb.Stream', null, global);
 goog.exportSymbol('proto.pb.Video', null, global);
+
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -34,118 +35,8 @@ proto.pb.Claim = function(opt_data) {
 };
 goog.inherits(proto.pb.Claim, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
   proto.pb.Claim.displayName = 'proto.pb.Claim';
 }
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.pb.Channel = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.pb.Channel, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.pb.Channel.displayName = 'proto.pb.Channel';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.pb.Stream = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, proto.pb.Stream.repeatedFields_, null);
-};
-goog.inherits(proto.pb.Stream, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.pb.Stream.displayName = 'proto.pb.Stream';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.pb.Fee = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.pb.Fee, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.pb.Fee.displayName = 'proto.pb.Fee';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.pb.File = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.pb.File, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.pb.File.displayName = 'proto.pb.File';
-}
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.pb.Video = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.pb.Video, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  /**
-   * @public
-   * @override
-   */
-  proto.pb.Video.displayName = 'proto.pb.Video';
-}
-
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -174,7 +65,7 @@ proto.pb.Claim.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.pb.Claim.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     type: jspb.Message.getFieldWithDefault(msg, 1, 0),
     stream: (f = msg.getStream()) && proto.pb.Stream.toObject(includeInstance, f),
     channel: (f = msg.getChannel()) && proto.pb.Channel.toObject(includeInstance, f)
@@ -322,9 +213,6 @@ proto.pb.Claim.prototype.setStream = function(value) {
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
 proto.pb.Claim.prototype.clearStream = function() {
   this.setStream(undefined);
 };
@@ -332,7 +220,7 @@ proto.pb.Claim.prototype.clearStream = function() {
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
 proto.pb.Claim.prototype.hasStream = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -355,9 +243,6 @@ proto.pb.Claim.prototype.setChannel = function(value) {
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
 proto.pb.Claim.prototype.clearChannel = function() {
   this.setChannel(undefined);
 };
@@ -365,7 +250,7 @@ proto.pb.Claim.prototype.clearChannel = function() {
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
 proto.pb.Claim.prototype.hasChannel = function() {
   return jspb.Message.getField(this, 3) != null;
@@ -373,6 +258,30 @@ proto.pb.Claim.prototype.hasChannel = function() {
 
 
 
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.pb.Channel = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.pb.Channel.repeatedFields_, null);
+};
+goog.inherits(proto.pb.Channel, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb.Channel.displayName = 'proto.pb.Channel';
+}
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.pb.Channel.repeatedFields_ = [6];
+
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -401,12 +310,13 @@ proto.pb.Channel.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.pb.Channel.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     publicKey: msg.getPublicKey_asB64(),
     title: jspb.Message.getFieldWithDefault(msg, 2, ""),
     description: jspb.Message.getFieldWithDefault(msg, 3, ""),
     contactEmail: jspb.Message.getFieldWithDefault(msg, 4, ""),
     homepageUrl: jspb.Message.getFieldWithDefault(msg, 5, ""),
+    tagsList: jspb.Message.getRepeatedField(msg, 6),
     thumbnailUrl: jspb.Message.getFieldWithDefault(msg, 16, ""),
     coverUrl: jspb.Message.getFieldWithDefault(msg, 17, "")
   };
@@ -465,6 +375,10 @@ proto.pb.Channel.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {string} */ (reader.readString());
       msg.setHomepageUrl(value);
       break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addTags(value);
+      break;
     case 16:
       var value = /** @type {string} */ (reader.readString());
       msg.setThumbnailUrl(value);
@@ -537,6 +451,13 @@ proto.pb.Channel.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
+  f = message.getTagsList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      6,
+      f
+    );
+  }
   f = message.getThumbnailUrl();
   if (f.length > 0) {
     writer.writeString(
@@ -653,6 +574,35 @@ proto.pb.Channel.prototype.setHomepageUrl = function(value) {
 };
 
 
+/**
+ * repeated string tags = 6;
+ * @return {!Array<string>}
+ */
+proto.pb.Channel.prototype.getTagsList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 6));
+};
+
+
+/** @param {!Array<string>} value */
+proto.pb.Channel.prototype.setTagsList = function(value) {
+  jspb.Message.setField(this, 6, value || []);
+};
+
+
+/**
+ * @param {!string} value
+ * @param {number=} opt_index
+ */
+proto.pb.Channel.prototype.addTags = function(value, opt_index) {
+  jspb.Message.addToRepeatedField(this, 6, value, opt_index);
+};
+
+
+proto.pb.Channel.prototype.clearTagsList = function() {
+  this.setTagsList([]);
+};
+
+
 /**
  * optional string thumbnail_url = 16;
  * @return {string}
@@ -684,6 +634,23 @@ proto.pb.Channel.prototype.setCoverUrl = function(value) {
 
 
 
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.pb.Stream = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.pb.Stream.repeatedFields_, null);
+};
+goog.inherits(proto.pb.Stream, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb.Stream.displayName = 'proto.pb.Stream';
+}
 /**
  * List of repeated fields within this message type.
  * @private {!Array<number>}
@@ -719,7 +686,7 @@ proto.pb.Stream.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.pb.Stream.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     hash: msg.getHash_asB64(),
     language: jspb.Message.getFieldWithDefault(msg, 2, ""),
     title: jspb.Message.getFieldWithDefault(msg, 3, ""),
@@ -1119,9 +1086,6 @@ proto.pb.Stream.prototype.setFile = function(value) {
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
 proto.pb.Stream.prototype.clearFile = function() {
   this.setFile(undefined);
 };
@@ -1129,7 +1093,7 @@ proto.pb.Stream.prototype.clearFile = function() {
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
 proto.pb.Stream.prototype.hasFile = function() {
   return jspb.Message.getField(this, 8) != null;
@@ -1152,9 +1116,6 @@ proto.pb.Stream.prototype.setFee = function(value) {
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
 proto.pb.Stream.prototype.clearFee = function() {
   this.setFee(undefined);
 };
@@ -1162,7 +1123,7 @@ proto.pb.Stream.prototype.clearFee = function() {
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
 proto.pb.Stream.prototype.hasFee = function() {
   return jspb.Message.getField(this, 16) != null;
@@ -1230,7 +1191,7 @@ proto.pb.Stream.prototype.setTagsList = function(value) {
 
 
 /**
- * @param {string} value
+ * @param {!string} value
  * @param {number=} opt_index
  */
 proto.pb.Stream.prototype.addTags = function(value, opt_index) {
@@ -1238,9 +1199,6 @@ proto.pb.Stream.prototype.addTags = function(value, opt_index) {
 };
 
 
-/**
- * Clears the list making it empty but non-null.
- */
 proto.pb.Stream.prototype.clearTagsList = function() {
   this.setTagsList([]);
 };
@@ -1277,9 +1235,6 @@ proto.pb.Stream.prototype.setVideo = function(value) {
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
 proto.pb.Stream.prototype.clearVideo = function() {
   this.setVideo(undefined);
 };
@@ -1287,7 +1242,7 @@ proto.pb.Stream.prototype.clearVideo = function() {
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
 proto.pb.Stream.prototype.hasVideo = function() {
   return jspb.Message.getField(this, 22) != null;
@@ -1295,6 +1250,23 @@ proto.pb.Stream.prototype.hasVideo = function() {
 
 
 
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.pb.Fee = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb.Fee, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb.Fee.displayName = 'proto.pb.Fee';
+}
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1323,7 +1295,7 @@ proto.pb.Fee.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.pb.Fee.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     currency: jspb.Message.getFieldWithDefault(msg, 1, 0),
     address: msg.getAddress_asB64(),
     amount: jspb.Message.getFieldWithDefault(msg, 3, 0)
@@ -1506,6 +1478,23 @@ proto.pb.Fee.prototype.setAmount = function(value) {
 
 
 
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.pb.File = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb.File, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb.File.displayName = 'proto.pb.File';
+}
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1534,7 +1523,7 @@ proto.pb.File.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.pb.File.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     name: jspb.Message.getFieldWithDefault(msg, 1, ""),
     size: jspb.Message.getFieldWithDefault(msg, 2, 0)
   };
@@ -1658,6 +1647,23 @@ proto.pb.File.prototype.setSize = function(value) {
 
 
 
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.pb.Video = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb.Video, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb.Video.displayName = 'proto.pb.Video';
+}
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1686,7 +1692,7 @@ proto.pb.Video.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.pb.Video.toObject = function(includeInstance, msg) {
-  var obj = {
+  var f, obj = {
     width: jspb.Message.getFieldWithDefault(msg, 1, 0),
     height: jspb.Message.getFieldWithDefault(msg, 2, 0)
   };
diff --git a/v2/proto/claim.proto b/v2/proto/claim.proto
index 0bca6b2..b664271 100644
--- a/v2/proto/claim.proto
+++ b/v2/proto/claim.proto
@@ -63,4 +63,4 @@ message File {
 message Video {
     uint32 width = 1;
     uint32 height = 2;
-}
\ No newline at end of file
+}
diff --git a/v2/python/claim_pb2.py b/v2/python/claim_pb2.py
index 402b84c..1657a85 100644
--- a/v2/python/claim_pb2.py
+++ b/v2/python/claim_pb2.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: claim.proto
 
@@ -20,7 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   package='pb',
   syntax='proto3',
   serialized_options=None,
-  serialized_pb=_b('\n\x0b\x63laim.proto\x12\x02pb\"\x80\x01\n\x05\x43laim\x12\x1c\n\x04type\x18\x01 \x01(\x0e\x32\x0e.pb.Claim.Type\x12\x1a\n\x06stream\x18\x02 \x01(\x0b\x32\n.pb.Stream\x12\x1c\n\x07\x63hannel\x18\x03 \x01(\x0b\x32\x0b.pb.Channel\"\x1f\n\x04Type\x12\n\n\x06STREAM\x10\x00\x12\x0b\n\x07\x43HANNEL\x10\x01\"\x98\x01\n\x07\x43hannel\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\x12\r\n\x05title\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x15\n\rcontact_email\x18\x04 \x01(\t\x12\x14\n\x0chomepage_url\x18\x05 \x01(\t\x12\x15\n\rthumbnail_url\x18\x10 \x01(\t\x12\x11\n\tcover_url\x18\x11 \x01(\t\"\xab\x02\n\x06Stream\x12\x0c\n\x04hash\x18\x01 \x01(\x0c\x12\x10\n\x08language\x18\x02 \x01(\t\x12\r\n\x05title\x18\x03 \x01(\t\x12\x0e\n\x06\x61uthor\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x05 \x01(\t\x12\x12\n\nmedia_type\x18\x06 \x01(\t\x12\x0f\n\x07license\x18\x07 \x01(\t\x12\x16\n\x04\x66ile\x18\x08 \x01(\x0b\x32\x08.pb.File\x12\x14\n\x03\x66\x65\x65\x18\x10 \x01(\x0b\x32\x07.pb.Fee\x12\x13\n\x0blicense_url\x18\x11 \x01(\t\x12\x15\n\rthumbnail_url\x18\x12 \x01(\t\x12\x10\n\x08\x64uration\x18\x13 \x01(\r\x12\x0c\n\x04tags\x18\x14 \x03(\t\x12\x14\n\x0crelease_time\x18\x15 \x01(\x03\x12\x18\n\x05video\x18\x16 \x01(\x0b\x32\t.pb.Video\"h\n\x03\x46\x65\x65\x12\"\n\x08\x63urrency\x18\x01 \x01(\x0e\x32\x10.pb.Fee.Currency\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0c\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\"\x1c\n\x08\x43urrency\x12\x07\n\x03LBC\x10\x00\x12\x07\n\x03USD\x10\x01\"\"\n\x04\x46ile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04size\x18\x02 \x01(\x04\"&\n\x05Video\x12\r\n\x05width\x18\x01 \x01(\r\x12\x0e\n\x06height\x18\x02 \x01(\rb\x06proto3')
+  serialized_pb=_b('\n\x0b\x63laim.proto\x12\x02pb\"\x80\x01\n\x05\x43laim\x12\x1c\n\x04type\x18\x01 \x01(\x0e\x32\x0e.pb.Claim.Type\x12\x1a\n\x06stream\x18\x02 \x01(\x0b\x32\n.pb.Stream\x12\x1c\n\x07\x63hannel\x18\x03 \x01(\x0b\x32\x0b.pb.Channel\"\x1f\n\x04Type\x12\n\n\x06STREAM\x10\x00\x12\x0b\n\x07\x43HANNEL\x10\x01\"\xa6\x01\n\x07\x43hannel\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\x12\r\n\x05title\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x15\n\rcontact_email\x18\x04 \x01(\t\x12\x14\n\x0chomepage_url\x18\x05 \x01(\t\x12\x0c\n\x04tags\x18\x06 \x03(\t\x12\x15\n\rthumbnail_url\x18\x10 \x01(\t\x12\x11\n\tcover_url\x18\x11 \x01(\t\"\xab\x02\n\x06Stream\x12\x0c\n\x04hash\x18\x01 \x01(\x0c\x12\x10\n\x08language\x18\x02 \x01(\t\x12\r\n\x05title\x18\x03 \x01(\t\x12\x0e\n\x06\x61uthor\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x05 \x01(\t\x12\x12\n\nmedia_type\x18\x06 \x01(\t\x12\x0f\n\x07license\x18\x07 \x01(\t\x12\x16\n\x04\x66ile\x18\x08 \x01(\x0b\x32\x08.pb.File\x12\x14\n\x03\x66\x65\x65\x18\x10 \x01(\x0b\x32\x07.pb.Fee\x12\x13\n\x0blicense_url\x18\x11 \x01(\t\x12\x15\n\rthumbnail_url\x18\x12 \x01(\t\x12\x10\n\x08\x64uration\x18\x13 \x01(\r\x12\x0c\n\x04tags\x18\x14 \x03(\t\x12\x14\n\x0crelease_time\x18\x15 \x01(\x03\x12\x18\n\x05video\x18\x16 \x01(\x0b\x32\t.pb.Video\"h\n\x03\x46\x65\x65\x12\"\n\x08\x63urrency\x18\x01 \x01(\x0e\x32\x10.pb.Fee.Currency\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0c\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\"\x1c\n\x08\x43urrency\x12\x07\n\x03LBC\x10\x00\x12\x07\n\x03USD\x10\x01\"\"\n\x04\x46ile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04size\x18\x02 \x01(\x04\"&\n\x05Video\x12\r\n\x05width\x18\x01 \x01(\r\x12\x0e\n\x06height\x18\x02 \x01(\rb\x06proto3')
 )
 
 
@@ -64,8 +63,8 @@ _FEE_CURRENCY = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=683,
-  serialized_end=711,
+  serialized_start=697,
+  serialized_end=725,
 )
 _sym_db.RegisterEnumDescriptor(_FEE_CURRENCY)
 
@@ -159,14 +158,21 @@ _CHANNEL = _descriptor.Descriptor(
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='thumbnail_url', full_name='pb.Channel.thumbnail_url', index=5,
+      name='tags', full_name='pb.Channel.tags', index=5,
+      number=6, type=9, cpp_type=9, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='thumbnail_url', full_name='pb.Channel.thumbnail_url', index=6,
       number=16, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='cover_url', full_name='pb.Channel.cover_url', index=6,
+      name='cover_url', full_name='pb.Channel.cover_url', index=7,
       number=17, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
@@ -185,7 +191,7 @@ _CHANNEL = _descriptor.Descriptor(
   oneofs=[
   ],
   serialized_start=151,
-  serialized_end=303,
+  serialized_end=317,
 )
 
 
@@ -313,8 +319,8 @@ _STREAM = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=306,
-  serialized_end=605,
+  serialized_start=320,
+  serialized_end=619,
 )
 
 
@@ -359,8 +365,8 @@ _FEE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=607,
-  serialized_end=711,
+  serialized_start=621,
+  serialized_end=725,
 )
 
 
@@ -397,8 +403,8 @@ _FILE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=713,
-  serialized_end=747,
+  serialized_start=727,
+  serialized_end=761,
 )
 
 
@@ -435,8 +441,8 @@ _VIDEO = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=749,
-  serialized_end=787,
+  serialized_start=763,
+  serialized_end=801,
 )
 
 _CLAIM.fields_by_name['type'].enum_type = _CLAIM_TYPE