From 50f8d6a2cb07f15f3ccb4a1db46dde416a093b13 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Fri, 1 Mar 2019 17:08:52 -0300
Subject: [PATCH] regen v2

---
 v2/cpp/{claim.pb.cc => claim_schema.pb.cc}    | 1969 ++++++-----------
 v2/cpp/{claim.pb.h => claim_schema.pb.h}      | 1100 ++++-----
 v2/go/{claim.pb.go => claim_schema.pb.go}     |  177 +-
 v2/js/{claim_pb.js => claim_schema_pb.js}     |  782 +++----
 .../{claim_pb2.py => claim_schema_pb2.py}     |  152 +-
 5 files changed, 1842 insertions(+), 2338 deletions(-)
 rename v2/cpp/{claim.pb.cc => claim_schema.pb.cc} (57%)
 rename v2/cpp/{claim.pb.h => claim_schema.pb.h} (70%)
 rename v2/go/{claim.pb.go => claim_schema.pb.go} (67%)
 rename v2/js/{claim_pb.js => claim_schema_pb.js} (68%)
 rename v2/python/{claim_pb2.py => claim_schema_pb2.py} (73%)

diff --git a/v2/cpp/claim.pb.cc b/v2/cpp/claim_schema.pb.cc
similarity index 57%
rename from v2/cpp/claim.pb.cc
rename to v2/cpp/claim_schema.pb.cc
index 2a9ac7a..33b21c8 100644
--- a/v2/cpp/claim.pb.cc
+++ b/v2/cpp/claim_schema.pb.cc
@@ -1,283 +1,312 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: claim.proto
+// source: claim_schema.proto
 
-#include "claim.pb.h"
+#include "claim_schema.pb.h"
 
 #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 pb {
+namespace protobuf_claim_5fschema_2eproto {
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_5fschema_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Channel;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_5fschema_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Fee;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_5fschema_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_File;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_5fschema_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Video;
+extern PROTOBUF_INTERNAL_EXPORT_protobuf_claim_5fschema_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_Stream;
+}  // namespace protobuf_claim_5fschema_2eproto
+namespace pb3 {
 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 pb3
+namespace protobuf_claim_5fschema_2eproto {
+static void InitDefaultsClaim() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Claim_default_instance_;
-    new (ptr) ::pb::Claim();
+    void* ptr = &::pb3::_Claim_default_instance_;
+    new (ptr) ::pb3::Claim();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Claim::InitAsDefaultInstance();
+  ::pb3::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_5fschema_2eproto::scc_info_Stream.base,
+      &protobuf_claim_5fschema_2eproto::scc_info_Channel.base,}};
 
-static void InitDefaultsChannel_claim_2eproto() {
+static void InitDefaultsChannel() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Channel_default_instance_;
-    new (ptr) ::pb::Channel();
+    void* ptr = &::pb3::_Channel_default_instance_;
+    new (ptr) ::pb3::Channel();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Channel::InitAsDefaultInstance();
+  ::pb3::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;
 
   {
-    void* ptr = &::pb::_Stream_default_instance_;
-    new (ptr) ::pb::Stream();
+    void* ptr = &::pb3::_Stream_default_instance_;
+    new (ptr) ::pb3::Stream();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Stream::InitAsDefaultInstance();
+  ::pb3::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_5fschema_2eproto::scc_info_File.base,
+      &protobuf_claim_5fschema_2eproto::scc_info_Fee.base,
+      &protobuf_claim_5fschema_2eproto::scc_info_Video.base,}};
 
-static void InitDefaultsFee_claim_2eproto() {
+static void InitDefaultsFee() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Fee_default_instance_;
-    new (ptr) ::pb::Fee();
+    void* ptr = &::pb3::_Fee_default_instance_;
+    new (ptr) ::pb3::Fee();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Fee::InitAsDefaultInstance();
+  ::pb3::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;
 
   {
-    void* ptr = &::pb::_File_default_instance_;
-    new (ptr) ::pb::File();
+    void* ptr = &::pb3::_File_default_instance_;
+    new (ptr) ::pb3::File();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::File::InitAsDefaultInstance();
+  ::pb3::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;
 
   {
-    void* ptr = &::pb::_Video_default_instance_;
-    new (ptr) ::pb::Video();
+    void* ptr = &::pb3::_Video_default_instance_;
+    new (ptr) ::pb3::Video();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Video::InitAsDefaultInstance();
+  ::pb3::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(::pb3::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(::pb3::Claim, type_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Claim, stream_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Claim, channel_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Channel, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::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(::pb3::Channel, public_key_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Channel, title_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Channel, description_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Channel, contact_email_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Channel, homepage_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Channel, tags_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Channel, thumbnail_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Channel, cover_url_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Stream, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::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(::pb3::Stream, hash_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, language_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, title_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, author_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, description_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, media_type_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, license_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, file_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, fee_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, license_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, thumbnail_url_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, duration_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, tags_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, release_time_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Stream, video_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Fee, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::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(::pb3::Fee, currency_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Fee, address_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Fee, amount_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::File, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::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(::pb3::File, name_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::File, size_),
   ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::pb::Video, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::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(::pb3::Video, width_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb3::Video, height_),
 };
-static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_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)},
+static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, -1, sizeof(::pb3::Claim)},
+  { 8, -1, sizeof(::pb3::Channel)},
+  { 21, -1, sizeof(::pb3::Stream)},
+  { 41, -1, sizeof(::pb3::Fee)},
+  { 49, -1, sizeof(::pb3::File)},
+  { 56, -1, sizeof(::pb3::Video)},
 };
 
 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*>(&::pb::_Channel_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Stream_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Fee_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_File_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Video_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::pb3::_Claim_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::pb3::_Channel_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::pb3::_Stream_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::pb3::_Fee_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::pb3::_File_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::pb3::_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_schema.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; }();
-namespace pb {
+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\022claim_schema.proto\022\003pb3\"\203\001\n\005Claim\022\035\n\004t"
+      "ype\030\001 \001(\0162\017.pb3.Claim.Type\022\033\n\006stream\030\002 \001"
+      "(\0132\013.pb3.Stream\022\035\n\007channel\030\003 \001(\0132\014.pb3.C"
+      "hannel\"\037\n\004Type\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\013description\030\003 \001(\t\022\025\n\rcontact_e"
+      "mail\030\004 \001(\t\022\024\n\014homepage_url\030\005 \001(\t\022\014\n\004tags"
+      "\030\006 \003(\t\022\025\n\rthumbnail_url\030\020 \001(\t\022\021\n\tcover_u"
+      "rl\030\021 \001(\t\"\256\002\n\006Stream\022\014\n\004hash\030\001 \001(\014\022\020\n\010lan"
+      "guage\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\027\n\004file\030\010 \001(\0132\t.pb3"
+      ".File\022\025\n\003fee\030\020 \001(\0132\010.pb3.Fee\022\023\n\013license_"
+      "url\030\021 \001(\t\022\025\n\rthumbnail_url\030\022 \001(\t\022\020\n\010dura"
+      "tion\030\023 \001(\r\022\014\n\004tags\030\024 \003(\t\022\024\n\014release_time"
+      "\030\025 \001(\003\022\031\n\005video\030\026 \001(\0132\n.pb3.Video\"i\n\003Fee"
+      "\022#\n\010currency\030\001 \001(\0162\021.pb3.Fee.Currency\022\017\n"
+      "\007address\030\002 \001(\014\022\016\n\006amount\030\003 \001(\004\"\034\n\010Curren"
+      "cy\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\005width\030\001 \001(\r"
+      "\022\016\n\006height\030\002 \001(\rb\006proto3"
+  };
+  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
+      descriptor, 824);
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
+    "claim_schema.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_5fschema_2eproto
+namespace pb3 {
 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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return protobuf_claim_5fschema_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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return protobuf_claim_5fschema_2eproto::file_level_enum_descriptors[1];
 }
 bool Fee_Currency_IsValid(int value) {
   switch (value) {
@@ -321,24 +350,10 @@ const int Fee::Currency_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()->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_;
+  ::pb3::_Claim_default_instance_._instance.get_mutable()->stream_ = const_cast< ::pb3::Stream*>(
+      ::pb3::Stream::internal_default_instance());
+  ::pb3::_Claim_default_instance_._instance.get_mutable()->channel_ = const_cast< ::pb3::Channel*>(
+      ::pb3::Channel::internal_default_instance());
 }
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Claim::kTypeFieldNumber;
@@ -347,38 +362,38 @@ 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_5fschema_2eproto::scc_info_Claim.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Claim)
+  // @@protoc_insertion_point(constructor:pb3.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_);
+    stream_ = new ::pb3::Stream(*from.stream_);
   } else {
-    stream_ = nullptr;
+    stream_ = NULL;
   }
   if (from.has_channel()) {
-    channel_ = new ::pb::Channel(*from.channel_);
+    channel_ = new ::pb3::Channel(*from.channel_);
   } else {
-    channel_ = nullptr;
+    channel_ = NULL;
   }
   type_ = from.type_;
-  // @@protoc_insertion_point(copy_constructor:pb.Claim)
+  // @@protoc_insertion_point(copy_constructor:pb3.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_));
 }
 
 Claim::~Claim() {
-  // @@protoc_insertion_point(destructor:pb.Claim)
+  // @@protoc_insertion_point(destructor:pb3.Claim)
   SharedDtor();
 }
 
@@ -390,124 +405,64 @@ void Claim::SharedDtor() {
 void Claim::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Claim::descriptor() {
+  ::protobuf_claim_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_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:pb3.Claim)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // 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)
+  // @@protoc_insertion_point(parse_start:pb3.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)) {
-      // .pb.Claim.Type type = 1;
+      // .pb3.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)));
-          set_type(static_cast< ::pb::Claim_Type >(value));
+          set_type(static_cast< ::pb3::Claim_Type >(value));
         } else {
           goto handle_unusual;
         }
         break;
       }
 
-      // .pb.Stream stream = 2;
+      // .pb3.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 {
@@ -516,9 +471,10 @@ bool Claim::MergePartialFromCodedStream(
         break;
       }
 
-      // .pb.Channel channel = 3;
+      // .pb3.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 {
@@ -539,108 +495,104 @@ bool Claim::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Claim)
+  // @@protoc_insertion_point(parse_success:pb3.Claim)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Claim)
+  // @@protoc_insertion_point(parse_failure:pb3.Claim)
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Claim::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Claim)
+  // @@protoc_insertion_point(serialize_start:pb3.Claim)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .pb.Claim.Type type = 1;
+  // .pb3.Claim.Type type = 1;
   if (this->type() != 0) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->type(), output);
   }
 
-  // .pb.Stream stream = 2;
+  // .pb3.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;
+  // .pb3.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)
+  // @@protoc_insertion_point(serialize_end:pb3.Claim)
 }
 
 ::google::protobuf::uint8* Claim::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Claim)
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
+  // @@protoc_insertion_point(serialize_to_array_start:pb3.Claim)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .pb.Claim.Type type = 1;
+  // .pb3.Claim.Type type = 1;
   if (this->type() != 0) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->type(), target);
   }
 
-  // .pb.Stream stream = 2;
+  // .pb3.Stream stream = 2;
   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;
+  // .pb3.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)
+  // @@protoc_insertion_point(serialize_to_array_end:pb3.Claim)
   return target;
 }
 
 size_t Claim::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Claim)
+// @@protoc_insertion_point(message_byte_size_start:pb3.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;
+  // .pb3.Stream stream = 2;
   if (this->has_stream()) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *stream_);
   }
 
-  // .pb.Channel channel = 3;
+  // .pb3.Channel channel = 3;
   if (this->has_channel()) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *channel_);
   }
 
-  // .pb.Claim.Type type = 1;
+  // .pb3.Claim.Type type = 1;
   if (this->type() != 0) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
@@ -652,32 +604,32 @@ 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:pb3.Claim)
   GOOGLE_DCHECK_NE(&from, this);
   const Claim* source =
-      ::google::protobuf::DynamicCastToGenerated<Claim>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Claim>(
           &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Claim)
+  if (source == NULL) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb3.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:pb3.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:pb3.Claim)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (from.has_stream()) {
-    mutable_stream()->::pb::Stream::MergeFrom(from.stream());
+    mutable_stream()->::pb3::Stream::MergeFrom(from.stream());
   }
   if (from.has_channel()) {
-    mutable_channel()->::pb::Channel::MergeFrom(from.channel());
+    mutable_channel()->::pb3::Channel::MergeFrom(from.channel());
   }
   if (from.type() != 0) {
     set_type(from.type());
@@ -685,14 +637,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:pb3.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:pb3.Claim)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_2eproto::scc_info_Channel.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Channel)
+  // @@protoc_insertion_point(constructor:pb3.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) {
@@ -775,12 +727,10 @@ Channel::Channel(const Channel& from)
   if (from.cover_url().size() > 0) {
     cover_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.cover_url_);
   }
-  // @@protoc_insertion_point(copy_constructor:pb.Channel)
+  // @@protoc_insertion_point(copy_constructor:pb3.Channel)
 }
 
 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());
@@ -791,7 +741,7 @@ void Channel::SharedCtor() {
 }
 
 Channel::~Channel() {
-  // @@protoc_insertion_point(destructor:pb.Channel)
+  // @@protoc_insertion_point(destructor:pb3.Channel)
   SharedDtor();
 }
 
@@ -808,18 +758,24 @@ void Channel::SharedDtor() {
 void Channel::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Channel::descriptor() {
+  ::protobuf_claim_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_2eproto::scc_info_Channel.base);
   return *internal_default_instance();
 }
 
 
 void Channel::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Channel)
+// @@protoc_insertion_point(message_clear_start:pb3.Channel)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // 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,159 +786,11 @@ 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)
+  // @@protoc_insertion_point(parse_start:pb3.Channel)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
     tag = p.first;
@@ -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,13 +810,14 @@ 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(
             this->title().data(), static_cast<int>(this->title().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Channel.title"));
+            "pb3.Channel.title"));
         } else {
           goto handle_unusual;
         }
@@ -1016,13 +826,14 @@ 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(
             this->description().data(), static_cast<int>(this->description().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Channel.description"));
+            "pb3.Channel.description"));
         } else {
           goto handle_unusual;
         }
@@ -1031,13 +842,14 @@ 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(
             this->contact_email().data(), static_cast<int>(this->contact_email().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Channel.contact_email"));
+            "pb3.Channel.contact_email"));
         } else {
           goto handle_unusual;
         }
@@ -1046,13 +858,31 @@ 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(
             this->homepage_url().data(), static_cast<int>(this->homepage_url().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Channel.homepage_url"));
+            "pb3.Channel.homepage_url"));
+        } else {
+          goto handle_unusual;
+        }
+        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,
+            "pb3.Channel.tags"));
         } else {
           goto handle_unusual;
         }
@@ -1061,13 +891,14 @@ bool Channel::MergePartialFromCodedStream(
 
       // 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(
             this->thumbnail_url().data(), static_cast<int>(this->thumbnail_url().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Channel.thumbnail_url"));
+            "pb3.Channel.thumbnail_url"));
         } else {
           goto handle_unusual;
         }
@@ -1076,13 +907,14 @@ 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(
             this->cover_url().data(), static_cast<int>(this->cover_url().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Channel.cover_url"));
+            "pb3.Channel.cover_url"));
         } else {
           goto handle_unusual;
         }
@@ -1101,18 +933,17 @@ bool Channel::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Channel)
+  // @@protoc_insertion_point(parse_success:pb3.Channel)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Channel)
+  // @@protoc_insertion_point(parse_failure:pb3.Channel)
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Channel::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Channel)
+  // @@protoc_insertion_point(serialize_start:pb3.Channel)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -1127,7 +958,7 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->title().data(), static_cast<int>(this->title().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.title");
+      "pb3.Channel.title");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       2, this->title(), output);
   }
@@ -1137,7 +968,7 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.description");
+      "pb3.Channel.description");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       3, this->description(), output);
   }
@@ -1147,7 +978,7 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->contact_email().data(), static_cast<int>(this->contact_email().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.contact_email");
+      "pb3.Channel.contact_email");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       4, this->contact_email(), output);
   }
@@ -1157,17 +988,27 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->homepage_url().data(), static_cast<int>(this->homepage_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.homepage_url");
+      "pb3.Channel.homepage_url");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       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,
+      "pb3.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(
       this->thumbnail_url().data(), static_cast<int>(this->thumbnail_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.thumbnail_url");
+      "pb3.Channel.thumbnail_url");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       16, this->thumbnail_url(), output);
   }
@@ -1177,21 +1018,22 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->cover_url().data(), static_cast<int>(this->cover_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.cover_url");
+      "pb3.Channel.cover_url");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       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)
+  // @@protoc_insertion_point(serialize_end:pb3.Channel)
 }
 
 ::google::protobuf::uint8* Channel::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Channel)
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
+  // @@protoc_insertion_point(serialize_to_array_start:pb3.Channel)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -1207,7 +1049,7 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->title().data(), static_cast<int>(this->title().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.title");
+      "pb3.Channel.title");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         2, this->title(), target);
@@ -1218,7 +1060,7 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.description");
+      "pb3.Channel.description");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         3, this->description(), target);
@@ -1229,7 +1071,7 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->contact_email().data(), static_cast<int>(this->contact_email().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.contact_email");
+      "pb3.Channel.contact_email");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         4, this->contact_email(), target);
@@ -1240,18 +1082,28 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->homepage_url().data(), static_cast<int>(this->homepage_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.homepage_url");
+      "pb3.Channel.homepage_url");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         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,
+      "pb3.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(
       this->thumbnail_url().data(), static_cast<int>(this->thumbnail_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.thumbnail_url");
+      "pb3.Channel.thumbnail_url");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         16, this->thumbnail_url(), target);
@@ -1262,32 +1114,36 @@ void Channel::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->cover_url().data(), static_cast<int>(this->cover_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Channel.cover_url");
+      "pb3.Channel.cover_url");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         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)
+  // @@protoc_insertion_point(serialize_to_array_end:pb3.Channel)
   return target;
 }
 
 size_t Channel::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Channel)
+// @@protoc_insertion_point(message_byte_size_start:pb3.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) {
@@ -1344,27 +1200,28 @@ size_t Channel::ByteSizeLong() const {
 }
 
 void Channel::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Channel)
+// @@protoc_insertion_point(generalized_merge_from_start:pb3.Channel)
   GOOGLE_DCHECK_NE(&from, this);
   const Channel* source =
-      ::google::protobuf::DynamicCastToGenerated<Channel>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Channel>(
           &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Channel)
+  if (source == NULL) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb3.Channel)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Channel)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb3.Channel)
     MergeFrom(*source);
   }
 }
 
 void Channel::MergeFrom(const Channel& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Channel)
+// @@protoc_insertion_point(class_specific_merge_from_start:pb3.Channel)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::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_);
@@ -1396,14 +1253,14 @@ void Channel::MergeFrom(const Channel& from) {
 }
 
 void Channel::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Channel)
+// @@protoc_insertion_point(generalized_copy_from_start:pb3.Channel)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Channel::CopyFrom(const Channel& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Channel)
+// @@protoc_insertion_point(class_specific_copy_from_start:pb3.Channel)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -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,42 +1291,24 @@ 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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
 // ===================================================================
 
 void Stream::InitAsDefaultInstance() {
-  ::pb::_Stream_default_instance_._instance.get_mutable()->file_ = const_cast< ::pb::File*>(
-      ::pb::File::internal_default_instance());
-  ::pb::_Stream_default_instance_._instance.get_mutable()->fee_ = const_cast< ::pb::Fee*>(
-      ::pb::Fee::internal_default_instance());
-  ::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_;
+  ::pb3::_Stream_default_instance_._instance.get_mutable()->file_ = const_cast< ::pb3::File*>(
+      ::pb3::File::internal_default_instance());
+  ::pb3::_Stream_default_instance_._instance.get_mutable()->fee_ = const_cast< ::pb3::Fee*>(
+      ::pb3::Fee::internal_default_instance());
+  ::pb3::_Stream_default_instance_._instance.get_mutable()->video_ = const_cast< ::pb3::Video*>(
+      ::pb3::Video::internal_default_instance());
 }
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Stream::kHashFieldNumber;
@@ -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_5fschema_2eproto::scc_info_Stream.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Stream)
+  // @@protoc_insertion_point(constructor:pb3.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());
@@ -1536,29 +1377,27 @@ Stream::Stream(const Stream& from)
     thumbnail_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.thumbnail_url_);
   }
   if (from.has_file()) {
-    file_ = new ::pb::File(*from.file_);
+    file_ = new ::pb3::File(*from.file_);
   } else {
-    file_ = nullptr;
+    file_ = NULL;
   }
   if (from.has_fee()) {
-    fee_ = new ::pb::Fee(*from.fee_);
+    fee_ = new ::pb3::Fee(*from.fee_);
   } else {
-    fee_ = nullptr;
+    fee_ = NULL;
   }
   if (from.has_video()) {
-    video_ = new ::pb::Video(*from.video_);
+    video_ = new ::pb3::Video(*from.video_);
   } else {
-    video_ = nullptr;
+    video_ = NULL;
   }
   ::memcpy(&duration_, &from.duration_,
     static_cast<size_t>(reinterpret_cast<char*>(&release_time_) -
     reinterpret_cast<char*>(&duration_)) + sizeof(release_time_));
-  // @@protoc_insertion_point(copy_constructor:pb.Stream)
+  // @@protoc_insertion_point(copy_constructor:pb3.Stream)
 }
 
 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());
@@ -1574,7 +1413,7 @@ void Stream::SharedCtor() {
 }
 
 Stream::~Stream() {
-  // @@protoc_insertion_point(destructor:pb.Stream)
+  // @@protoc_insertion_point(destructor:pb3.Stream)
   SharedDtor();
 }
 
@@ -1596,14 +1435,19 @@ void Stream::SharedDtor() {
 void Stream::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Stream::descriptor() {
+  ::protobuf_claim_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_2eproto::scc_info_Stream.base);
   return *internal_default_instance();
 }
 
 
 void Stream::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Stream)
+// @@protoc_insertion_point(message_clear_start:pb3.Stream)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -1618,281 +1462,29 @@ 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)
+  // @@protoc_insertion_point(parse_start:pb3.Stream)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
     tag = p.first;
@@ -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,13 +1504,14 @@ 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(
             this->language().data(), static_cast<int>(this->language().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.language"));
+            "pb3.Stream.language"));
         } else {
           goto handle_unusual;
         }
@@ -1926,13 +1520,14 @@ 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(
             this->title().data(), static_cast<int>(this->title().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.title"));
+            "pb3.Stream.title"));
         } else {
           goto handle_unusual;
         }
@@ -1941,13 +1536,14 @@ 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(
             this->author().data(), static_cast<int>(this->author().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.author"));
+            "pb3.Stream.author"));
         } else {
           goto handle_unusual;
         }
@@ -1956,13 +1552,14 @@ 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(
             this->description().data(), static_cast<int>(this->description().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.description"));
+            "pb3.Stream.description"));
         } else {
           goto handle_unusual;
         }
@@ -1971,13 +1568,14 @@ 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(
             this->media_type().data(), static_cast<int>(this->media_type().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.media_type"));
+            "pb3.Stream.media_type"));
         } else {
           goto handle_unusual;
         }
@@ -1986,22 +1584,24 @@ 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(
             this->license().data(), static_cast<int>(this->license().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.license"));
+            "pb3.Stream.license"));
         } else {
           goto handle_unusual;
         }
         break;
       }
 
-      // .pb.File file = 8;
+      // .pb3.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 {
@@ -2010,9 +1610,10 @@ bool Stream::MergePartialFromCodedStream(
         break;
       }
 
-      // .pb.Fee fee = 16;
+      // .pb3.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,13 +1624,14 @@ 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(
             this->license_url().data(), static_cast<int>(this->license_url().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.license_url"));
+            "pb3.Stream.license_url"));
         } else {
           goto handle_unusual;
         }
@@ -2038,13 +1640,14 @@ 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(
             this->thumbnail_url().data(), static_cast<int>(this->thumbnail_url().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.thumbnail_url"));
+            "pb3.Stream.thumbnail_url"));
         } else {
           goto handle_unusual;
         }
@@ -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,14 +1670,15 @@ 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(
             this->tags(this->tags_size() - 1).data(),
             static_cast<int>(this->tags(this->tags_size() - 1).length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.Stream.tags"));
+            "pb3.Stream.tags"));
         } else {
           goto handle_unusual;
         }
@@ -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>(
@@ -2093,9 +1699,10 @@ bool Stream::MergePartialFromCodedStream(
         break;
       }
 
-      // .pb.Video video = 22;
+      // .pb3.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 {
@@ -2116,18 +1723,17 @@ bool Stream::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Stream)
+  // @@protoc_insertion_point(parse_success:pb3.Stream)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Stream)
+  // @@protoc_insertion_point(parse_failure:pb3.Stream)
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Stream::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Stream)
+  // @@protoc_insertion_point(serialize_start:pb3.Stream)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -2142,7 +1748,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->language().data(), static_cast<int>(this->language().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.language");
+      "pb3.Stream.language");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       2, this->language(), output);
   }
@@ -2152,7 +1758,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->title().data(), static_cast<int>(this->title().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.title");
+      "pb3.Stream.title");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       3, this->title(), output);
   }
@@ -2162,7 +1768,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->author().data(), static_cast<int>(this->author().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.author");
+      "pb3.Stream.author");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       4, this->author(), output);
   }
@@ -2172,7 +1778,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.description");
+      "pb3.Stream.description");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       5, this->description(), output);
   }
@@ -2182,7 +1788,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->media_type().data(), static_cast<int>(this->media_type().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.media_type");
+      "pb3.Stream.media_type");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       6, this->media_type(), output);
   }
@@ -2192,21 +1798,21 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->license().data(), static_cast<int>(this->license().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.license");
+      "pb3.Stream.license");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       7, this->license(), output);
   }
 
-  // .pb.File file = 8;
+  // .pb3.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;
+  // .pb3.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;
@@ -2214,7 +1820,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->license_url().data(), static_cast<int>(this->license_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.license_url");
+      "pb3.Stream.license_url");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       17, this->license_url(), output);
   }
@@ -2224,7 +1830,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->thumbnail_url().data(), static_cast<int>(this->thumbnail_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.thumbnail_url");
+      "pb3.Stream.thumbnail_url");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       18, this->thumbnail_url(), output);
   }
@@ -2239,7 +1845,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->tags(i).data(), static_cast<int>(this->tags(i).length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.tags");
+      "pb3.Stream.tags");
     ::google::protobuf::internal::WireFormatLite::WriteString(
       20, this->tags(i), output);
   }
@@ -2249,22 +1855,23 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt64(21, this->release_time(), output);
   }
 
-  // .pb.Video video = 22;
+  // .pb3.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)
+  // @@protoc_insertion_point(serialize_end:pb3.Stream)
 }
 
 ::google::protobuf::uint8* Stream::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Stream)
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
+  // @@protoc_insertion_point(serialize_to_array_start:pb3.Stream)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -2280,7 +1887,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->language().data(), static_cast<int>(this->language().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.language");
+      "pb3.Stream.language");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         2, this->language(), target);
@@ -2291,7 +1898,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->title().data(), static_cast<int>(this->title().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.title");
+      "pb3.Stream.title");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         3, this->title(), target);
@@ -2302,7 +1909,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->author().data(), static_cast<int>(this->author().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.author");
+      "pb3.Stream.author");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         4, this->author(), target);
@@ -2313,7 +1920,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.description");
+      "pb3.Stream.description");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         5, this->description(), target);
@@ -2324,7 +1931,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->media_type().data(), static_cast<int>(this->media_type().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.media_type");
+      "pb3.Stream.media_type");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         6, this->media_type(), target);
@@ -2335,24 +1942,24 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->license().data(), static_cast<int>(this->license().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.license");
+      "pb3.Stream.license");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         7, this->license(), target);
   }
 
-  // .pb.File file = 8;
+  // .pb3.File file = 8;
   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;
+  // .pb3.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;
@@ -2360,7 +1967,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->license_url().data(), static_cast<int>(this->license_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.license_url");
+      "pb3.Stream.license_url");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         17, this->license_url(), target);
@@ -2371,7 +1978,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->thumbnail_url().data(), static_cast<int>(this->thumbnail_url().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.thumbnail_url");
+      "pb3.Stream.thumbnail_url");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         18, this->thumbnail_url(), target);
@@ -2387,7 +1994,7 @@ void Stream::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->tags(i).data(), static_cast<int>(this->tags(i).length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.Stream.tags");
+      "pb3.Stream.tags");
     target = ::google::protobuf::internal::WireFormatLite::
       WriteStringToArray(20, this->tags(i), target);
   }
@@ -2397,34 +2004,30 @@ void Stream::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(21, this->release_time(), target);
   }
 
-  // .pb.Video video = 22;
+  // .pb3.Video video = 22;
   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)
+  // @@protoc_insertion_point(serialize_to_array_end:pb3.Stream)
   return target;
 }
 
 size_t Stream::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Stream)
+// @@protoc_insertion_point(message_byte_size_start:pb3.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());
@@ -2496,21 +2099,21 @@ size_t Stream::ByteSizeLong() const {
         this->thumbnail_url());
   }
 
-  // .pb.File file = 8;
+  // .pb3.File file = 8;
   if (this->has_file()) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *file_);
   }
 
-  // .pb.Fee fee = 16;
+  // .pb3.Fee fee = 16;
   if (this->has_fee()) {
     total_size += 2 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *fee_);
   }
 
-  // .pb.Video video = 22;
+  // .pb3.Video video = 22;
   if (this->has_video()) {
     total_size += 2 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
@@ -2537,22 +2140,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:pb3.Stream)
   GOOGLE_DCHECK_NE(&from, this);
   const Stream* source =
-      ::google::protobuf::DynamicCastToGenerated<Stream>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Stream>(
           &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Stream)
+  if (source == NULL) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb3.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:pb3.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:pb3.Stream)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -2596,13 +2199,13 @@ void Stream::MergeFrom(const Stream& from) {
     thumbnail_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.thumbnail_url_);
   }
   if (from.has_file()) {
-    mutable_file()->::pb::File::MergeFrom(from.file());
+    mutable_file()->::pb3::File::MergeFrom(from.file());
   }
   if (from.has_fee()) {
-    mutable_fee()->::pb::Fee::MergeFrom(from.fee());
+    mutable_fee()->::pb3::Fee::MergeFrom(from.fee());
   }
   if (from.has_video()) {
-    mutable_video()->::pb::Video::MergeFrom(from.video());
+    mutable_video()->::pb3::Video::MergeFrom(from.video());
   }
   if (from.duration() != 0) {
     set_duration(from.duration());
@@ -2613,14 +2216,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:pb3.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:pb3.Stream)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_2eproto::scc_info_Fee.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Fee)
+  // @@protoc_insertion_point(constructor:pb3.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) {
@@ -2699,12 +2300,10 @@ Fee::Fee(const Fee& from)
   ::memcpy(&amount_, &from.amount_,
     static_cast<size_t>(reinterpret_cast<char*>(&currency_) -
     reinterpret_cast<char*>(&amount_)) + sizeof(currency_));
-  // @@protoc_insertion_point(copy_constructor:pb.Fee)
+  // @@protoc_insertion_point(copy_constructor:pb3.Fee)
 }
 
 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_) -
@@ -2712,7 +2311,7 @@ void Fee::SharedCtor() {
 }
 
 Fee::~Fee() {
-  // @@protoc_insertion_point(destructor:pb.Fee)
+  // @@protoc_insertion_point(destructor:pb3.Fee)
   SharedDtor();
 }
 
@@ -2723,14 +2322,19 @@ void Fee::SharedDtor() {
 void Fee::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Fee::descriptor() {
+  ::protobuf_claim_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_2eproto::scc_info_Fee.base);
   return *internal_default_instance();
 }
 
 
 void Fee::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Fee)
+// @@protoc_insertion_point(message_clear_start:pb3.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -2742,91 +2346,25 @@ 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)
+  // @@protoc_insertion_point(parse_start:pb3.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)) {
-      // .pb.Fee.Currency currency = 1;
+      // .pb3.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)));
-          set_currency(static_cast< ::pb::Fee_Currency >(value));
+          set_currency(static_cast< ::pb3::Fee_Currency >(value));
         } else {
           goto handle_unusual;
         }
@@ -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>(
@@ -2869,22 +2409,21 @@ bool Fee::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Fee)
+  // @@protoc_insertion_point(parse_success:pb3.Fee)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Fee)
+  // @@protoc_insertion_point(parse_failure:pb3.Fee)
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Fee::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Fee)
+  // @@protoc_insertion_point(serialize_start:pb3.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .pb.Fee.Currency currency = 1;
+  // .pb3.Fee.Currency currency = 1;
   if (this->currency() != 0) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->currency(), output);
@@ -2901,20 +2440,21 @@ 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)
+  // @@protoc_insertion_point(serialize_end:pb3.Fee)
 }
 
 ::google::protobuf::uint8* Fee::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Fee)
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
+  // @@protoc_insertion_point(serialize_to_array_start:pb3.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .pb.Fee.Currency currency = 1;
+  // .pb3.Fee.Currency currency = 1;
   if (this->currency() != 0) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->currency(), target);
@@ -2932,27 +2472,23 @@ 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)
+  // @@protoc_insertion_point(serialize_to_array_end:pb3.Fee)
   return target;
 }
 
 size_t Fee::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Fee)
+// @@protoc_insertion_point(message_byte_size_start:pb3.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 +
@@ -2967,7 +2503,7 @@ size_t Fee::ByteSizeLong() const {
         this->amount());
   }
 
-  // .pb.Fee.Currency currency = 1;
+  // .pb3.Fee.Currency currency = 1;
   if (this->currency() != 0) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->currency());
@@ -2979,22 +2515,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:pb3.Fee)
   GOOGLE_DCHECK_NE(&from, this);
   const Fee* source =
-      ::google::protobuf::DynamicCastToGenerated<Fee>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Fee>(
           &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Fee)
+  if (source == NULL) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb3.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:pb3.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:pb3.Fee)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -3013,14 +2549,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:pb3.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:pb3.Fee)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -3053,41 +2589,37 @@ 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_5fschema_2eproto::scc_info_File.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.File)
+  // @@protoc_insertion_point(constructor:pb3.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) {
     name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
   }
   size_ = from.size_;
-  // @@protoc_insertion_point(copy_constructor:pb.File)
+  // @@protoc_insertion_point(copy_constructor:pb3.File)
 }
 
 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() {
-  // @@protoc_insertion_point(destructor:pb.File)
+  // @@protoc_insertion_point(destructor:pb3.File)
   SharedDtor();
 }
 
@@ -3098,88 +2630,33 @@ void File::SharedDtor() {
 void File::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* File::descriptor() {
+  ::protobuf_claim_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_2eproto::scc_info_File.base);
   return *internal_default_instance();
 }
 
 
 void File::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.File)
+// @@protoc_insertion_point(message_clear_start:pb3.File)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (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)
+  // @@protoc_insertion_point(parse_start:pb3.File)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
@@ -3187,13 +2664,14 @@ 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(
             this->name().data(), static_cast<int>(this->name().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "pb.File.name"));
+            "pb3.File.name"));
         } else {
           goto handle_unusual;
         }
@@ -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>(
@@ -3225,18 +2704,17 @@ bool File::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.File)
+  // @@protoc_insertion_point(parse_success:pb3.File)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.File)
+  // @@protoc_insertion_point(parse_failure:pb3.File)
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void File::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.File)
+  // @@protoc_insertion_point(serialize_start:pb3.File)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -3245,7 +2723,7 @@ void File::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->name().data(), static_cast<int>(this->name().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.File.name");
+      "pb3.File.name");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       1, this->name(), output);
   }
@@ -3255,16 +2733,17 @@ 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)
+  // @@protoc_insertion_point(serialize_end:pb3.File)
 }
 
 ::google::protobuf::uint8* File::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:pb.File)
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
+  // @@protoc_insertion_point(serialize_to_array_start:pb3.File)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -3273,7 +2752,7 @@ void File::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
       this->name().data(), static_cast<int>(this->name().length()),
       ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-      "pb.File.name");
+      "pb3.File.name");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         1, this->name(), target);
@@ -3284,27 +2763,23 @@ 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)
+  // @@protoc_insertion_point(serialize_to_array_end:pb3.File)
   return target;
 }
 
 size_t File::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.File)
+// @@protoc_insertion_point(message_byte_size_start:pb3.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 +
@@ -3325,22 +2800,22 @@ size_t File::ByteSizeLong() const {
 }
 
 void File::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.File)
+// @@protoc_insertion_point(generalized_merge_from_start:pb3.File)
   GOOGLE_DCHECK_NE(&from, this);
   const File* source =
-      ::google::protobuf::DynamicCastToGenerated<File>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const File>(
           &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.File)
+  if (source == NULL) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb3.File)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.File)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb3.File)
     MergeFrom(*source);
   }
 }
 
 void File::MergeFrom(const File& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.File)
+// @@protoc_insertion_point(class_specific_merge_from_start:pb3.File)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -3356,14 +2831,14 @@ void File::MergeFrom(const File& from) {
 }
 
 void File::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.File)
+// @@protoc_insertion_point(generalized_copy_from_start:pb3.File)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void File::CopyFrom(const File& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.File)
+// @@protoc_insertion_point(class_specific_copy_from_start:pb3.File)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
@@ -3395,28 +2870,26 @@ 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_5fschema_2eproto::scc_info_Video.base);
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Video)
+  // @@protoc_insertion_point(constructor:pb3.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_) -
     reinterpret_cast<char*>(&width_)) + sizeof(height_));
-  // @@protoc_insertion_point(copy_constructor:pb.Video)
+  // @@protoc_insertion_point(copy_constructor:pb3.Video)
 }
 
 void Video::SharedCtor() {
@@ -3426,7 +2899,7 @@ void Video::SharedCtor() {
 }
 
 Video::~Video() {
-  // @@protoc_insertion_point(destructor:pb.Video)
+  // @@protoc_insertion_point(destructor:pb3.Video)
   SharedDtor();
 }
 
@@ -3436,14 +2909,19 @@ void Video::SharedDtor() {
 void Video::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
+const ::google::protobuf::Descriptor* Video::descriptor() {
+  ::protobuf_claim_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_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_5fschema_2eproto::scc_info_Video.base);
   return *internal_default_instance();
 }
 
 
 void Video::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Video)
+// @@protoc_insertion_point(message_clear_start:pb3.Video)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -3454,55 +2932,11 @@ 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)
+  // @@protoc_insertion_point(parse_start:pb3.Video)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
@@ -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>(
@@ -3546,18 +2982,17 @@ bool Video::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Video)
+  // @@protoc_insertion_point(parse_success:pb3.Video)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Video)
+  // @@protoc_insertion_point(parse_failure:pb3.Video)
   return false;
 #undef DO_
 }
-#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Video::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Video)
+  // @@protoc_insertion_point(serialize_start:pb3.Video)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -3571,16 +3006,17 @@ 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)
+  // @@protoc_insertion_point(serialize_end:pb3.Video)
 }
 
 ::google::protobuf::uint8* Video::InternalSerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Video)
+    bool deterministic, ::google::protobuf::uint8* target) const {
+  (void)deterministic; // Unused
+  // @@protoc_insertion_point(serialize_to_array_start:pb3.Video)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -3594,27 +3030,23 @@ 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)
+  // @@protoc_insertion_point(serialize_to_array_end:pb3.Video)
   return target;
 }
 
 size_t Video::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Video)
+// @@protoc_insertion_point(message_byte_size_start:pb3.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 +
@@ -3635,22 +3067,22 @@ size_t Video::ByteSizeLong() const {
 }
 
 void Video::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Video)
+// @@protoc_insertion_point(generalized_merge_from_start:pb3.Video)
   GOOGLE_DCHECK_NE(&from, this);
   const Video* source =
-      ::google::protobuf::DynamicCastToGenerated<Video>(
+      ::google::protobuf::internal::DynamicCastToGenerated<const Video>(
           &from);
-  if (source == nullptr) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Video)
+  if (source == NULL) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb3.Video)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Video)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb3.Video)
     MergeFrom(*source);
   }
 }
 
 void Video::MergeFrom(const Video& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Video)
+// @@protoc_insertion_point(class_specific_merge_from_start:pb3.Video)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -3665,14 +3097,14 @@ void Video::MergeFrom(const Video& from) {
 }
 
 void Video::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Video)
+// @@protoc_insertion_point(generalized_copy_from_start:pb3.Video)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Video::CopyFrom(const Video& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Video)
+// @@protoc_insertion_point(class_specific_copy_from_start:pb3.Video)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -3688,41 +3120,40 @@ 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_5fschema_2eproto::protobuf_AssignDescriptorsOnce();
+  return ::protobuf_claim_5fschema_2eproto::file_level_metadata[kIndexInFileMessages];
 }
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace pb3
 namespace google {
 namespace protobuf {
-template<> PROTOBUF_NOINLINE ::pb::Claim* Arena::CreateMaybeMessage< ::pb::Claim >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Claim >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb3::Claim* Arena::CreateMaybeMessage< ::pb3::Claim >(Arena* arena) {
+  return Arena::CreateInternal< ::pb3::Claim >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Channel* Arena::CreateMaybeMessage< ::pb::Channel >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Channel >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb3::Channel* Arena::CreateMaybeMessage< ::pb3::Channel >(Arena* arena) {
+  return Arena::CreateInternal< ::pb3::Channel >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Stream* Arena::CreateMaybeMessage< ::pb::Stream >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Stream >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb3::Stream* Arena::CreateMaybeMessage< ::pb3::Stream >(Arena* arena) {
+  return Arena::CreateInternal< ::pb3::Stream >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Fee* Arena::CreateMaybeMessage< ::pb::Fee >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Fee >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb3::Fee* Arena::CreateMaybeMessage< ::pb3::Fee >(Arena* arena) {
+  return Arena::CreateInternal< ::pb3::Fee >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::File* Arena::CreateMaybeMessage< ::pb::File >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::File >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb3::File* Arena::CreateMaybeMessage< ::pb3::File >(Arena* arena) {
+  return Arena::CreateInternal< ::pb3::File >(arena);
 }
-template<> PROTOBUF_NOINLINE ::pb::Video* Arena::CreateMaybeMessage< ::pb::Video >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Video >(arena);
+template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb3::Video* Arena::CreateMaybeMessage< ::pb3::Video >(Arena* arena) {
+  return Arena::CreateInternal< ::pb3::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_schema.pb.h
similarity index 70%
rename from v2/cpp/claim.pb.h
rename to v2/cpp/claim_schema.pb.h
index 84346a8..6fda239 100644
--- a/v2/cpp/claim.pb.h
+++ b/v2/cpp/claim_schema.pb.h
@@ -1,25 +1,24 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: claim.proto
+// source: claim_schema.proto
 
-#ifndef PROTOBUF_INCLUDED_claim_2eproto
-#define PROTOBUF_INCLUDED_claim_2eproto
+#ifndef PROTOBUF_INCLUDED_claim_5fschema_2eproto
+#define PROTOBUF_INCLUDED_claim_5fschema_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,23 +32,21 @@
 #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_5fschema_2eproto 
 
+namespace protobuf_claim_5fschema_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();
-namespace pb {
+void AddDescriptors();
+}  // namespace protobuf_claim_5fschema_2eproto
+namespace pb3 {
 class Channel;
 class ChannelDefaultTypeInternal;
 extern ChannelDefaultTypeInternal _Channel_default_instance_;
@@ -68,24 +65,24 @@ extern StreamDefaultTypeInternal _Stream_default_instance_;
 class Video;
 class VideoDefaultTypeInternal;
 extern VideoDefaultTypeInternal _Video_default_instance_;
-}  // namespace pb
+}  // namespace pb3
 namespace google {
 namespace protobuf {
-template<> ::pb::Channel* Arena::CreateMaybeMessage<::pb::Channel>(Arena*);
-template<> ::pb::Claim* Arena::CreateMaybeMessage<::pb::Claim>(Arena*);
-template<> ::pb::Fee* Arena::CreateMaybeMessage<::pb::Fee>(Arena*);
-template<> ::pb::File* Arena::CreateMaybeMessage<::pb::File>(Arena*);
-template<> ::pb::Stream* Arena::CreateMaybeMessage<::pb::Stream>(Arena*);
-template<> ::pb::Video* Arena::CreateMaybeMessage<::pb::Video>(Arena*);
+template<> ::pb3::Channel* Arena::CreateMaybeMessage<::pb3::Channel>(Arena*);
+template<> ::pb3::Claim* Arena::CreateMaybeMessage<::pb3::Claim>(Arena*);
+template<> ::pb3::Fee* Arena::CreateMaybeMessage<::pb3::Fee>(Arena*);
+template<> ::pb3::File* Arena::CreateMaybeMessage<::pb3::File>(Arena*);
+template<> ::pb3::Stream* Arena::CreateMaybeMessage<::pb3::Stream>(Arena*);
+template<> ::pb3::Video* Arena::CreateMaybeMessage<::pb3::Video>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace pb3 {
 
 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:pb3.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:
 
@@ -246,45 +235,49 @@ class Claim final :
 
   // accessors -------------------------------------------------------
 
-  // .pb.Stream stream = 2;
+  // .pb3.Stream stream = 2;
   bool has_stream() const;
   void clear_stream();
   static const int kStreamFieldNumber = 2;
-  const ::pb::Stream& stream() const;
-  ::pb::Stream* release_stream();
-  ::pb::Stream* mutable_stream();
-  void set_allocated_stream(::pb::Stream* stream);
+  private:
+  const ::pb3::Stream& _internal_stream() const;
+  public:
+  const ::pb3::Stream& stream() const;
+  ::pb3::Stream* release_stream();
+  ::pb3::Stream* mutable_stream();
+  void set_allocated_stream(::pb3::Stream* stream);
 
-  // .pb.Channel channel = 3;
+  // .pb3.Channel channel = 3;
   bool has_channel() const;
   void clear_channel();
   static const int kChannelFieldNumber = 3;
-  const ::pb::Channel& channel() const;
-  ::pb::Channel* release_channel();
-  ::pb::Channel* mutable_channel();
-  void set_allocated_channel(::pb::Channel* channel);
+  private:
+  const ::pb3::Channel& _internal_channel() const;
+  public:
+  const ::pb3::Channel& channel() const;
+  ::pb3::Channel* release_channel();
+  ::pb3::Channel* mutable_channel();
+  void set_allocated_channel(::pb3::Channel* channel);
 
-  // .pb.Claim.Type type = 1;
+  // .pb3.Claim.Type type = 1;
   void clear_type();
   static const int kTypeFieldNumber = 1;
-  ::pb::Claim_Type type() const;
-  void set_type(::pb::Claim_Type value);
+  ::pb3::Claim_Type type() const;
+  void set_type(::pb3::Claim_Type value);
 
-  // @@protoc_insertion_point(class_scope:pb.Claim)
+  // @@protoc_insertion_point(class_scope:pb3.Claim)
  private:
-  class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::pb::Stream* stream_;
-  ::pb::Channel* channel_;
+  ::pb3::Stream* stream_;
+  ::pb3::Channel* channel_;
   int type_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  friend struct ::TableStruct_claim_2eproto;
+  friend struct ::protobuf_claim_5fschema_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:pb3.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;
@@ -476,11 +484,11 @@ class Channel final :
   ::std::string* release_cover_url();
   void set_allocated_cover_url(::std::string* cover_url);
 
-  // @@protoc_insertion_point(class_scope:pb.Channel)
+  // @@protoc_insertion_point(class_scope:pb3.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_5fschema_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:pb3.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();
@@ -736,32 +736,41 @@ class Stream final :
   ::std::string* release_thumbnail_url();
   void set_allocated_thumbnail_url(::std::string* thumbnail_url);
 
-  // .pb.File file = 8;
+  // .pb3.File file = 8;
   bool has_file() const;
   void clear_file();
   static const int kFileFieldNumber = 8;
-  const ::pb::File& file() const;
-  ::pb::File* release_file();
-  ::pb::File* mutable_file();
-  void set_allocated_file(::pb::File* file);
+  private:
+  const ::pb3::File& _internal_file() const;
+  public:
+  const ::pb3::File& file() const;
+  ::pb3::File* release_file();
+  ::pb3::File* mutable_file();
+  void set_allocated_file(::pb3::File* file);
 
-  // .pb.Fee fee = 16;
+  // .pb3.Fee fee = 16;
   bool has_fee() const;
   void clear_fee();
   static const int kFeeFieldNumber = 16;
-  const ::pb::Fee& fee() const;
-  ::pb::Fee* release_fee();
-  ::pb::Fee* mutable_fee();
-  void set_allocated_fee(::pb::Fee* fee);
+  private:
+  const ::pb3::Fee& _internal_fee() const;
+  public:
+  const ::pb3::Fee& fee() const;
+  ::pb3::Fee* release_fee();
+  ::pb3::Fee* mutable_fee();
+  void set_allocated_fee(::pb3::Fee* fee);
 
-  // .pb.Video video = 22;
+  // .pb3.Video video = 22;
   bool has_video() const;
   void clear_video();
   static const int kVideoFieldNumber = 22;
-  const ::pb::Video& video() const;
-  ::pb::Video* release_video();
-  ::pb::Video* mutable_video();
-  void set_allocated_video(::pb::Video* video);
+  private:
+  const ::pb3::Video& _internal_video() const;
+  public:
+  const ::pb3::Video& video() const;
+  ::pb3::Video* release_video();
+  ::pb3::Video* mutable_video();
+  void set_allocated_video(::pb3::Video* video);
 
   // uint32 duration = 19;
   void clear_duration();
@@ -775,12 +784,11 @@ class Stream final :
   ::google::protobuf::int64 release_time() const;
   void set_release_time(::google::protobuf::int64 value);
 
-  // @@protoc_insertion_point(class_scope:pb.Stream)
+  // @@protoc_insertion_point(class_scope:pb3.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_;
@@ -790,18 +798,17 @@ class Stream final :
   ::google::protobuf::internal::ArenaStringPtr license_;
   ::google::protobuf::internal::ArenaStringPtr license_url_;
   ::google::protobuf::internal::ArenaStringPtr thumbnail_url_;
-  ::pb::File* file_;
-  ::pb::Fee* fee_;
-  ::pb::Video* video_;
+  ::pb3::File* file_;
+  ::pb3::Fee* fee_;
+  ::pb3::Video* video_;
   ::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_5fschema_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:pb3.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:
 
@@ -941,27 +941,25 @@ class Fee final :
   ::google::protobuf::uint64 amount() const;
   void set_amount(::google::protobuf::uint64 value);
 
-  // .pb.Fee.Currency currency = 1;
+  // .pb3.Fee.Currency currency = 1;
   void clear_currency();
   static const int kCurrencyFieldNumber = 1;
-  ::pb::Fee_Currency currency() const;
-  void set_currency(::pb::Fee_Currency value);
+  ::pb3::Fee_Currency currency() const;
+  void set_currency(::pb3::Fee_Currency value);
 
-  // @@protoc_insertion_point(class_scope:pb.Fee)
+  // @@protoc_insertion_point(class_scope:pb3.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_5fschema_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:pb3.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:
 
@@ -1075,20 +1066,18 @@ class File final :
   ::google::protobuf::uint64 size() const;
   void set_size(::google::protobuf::uint64 value);
 
-  // @@protoc_insertion_point(class_scope:pb.File)
+  // @@protoc_insertion_point(class_scope:pb3.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_5fschema_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:pb3.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:
 
@@ -1194,15 +1176,14 @@ class Video final :
   ::google::protobuf::uint32 height() const;
   void set_height(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:pb.Video)
+  // @@protoc_insertion_point(class_scope:pb3.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_5fschema_2eproto::TableStruct;
 };
 // ===================================================================
 
@@ -1215,59 +1196,62 @@ class Video final :
 #endif  // __GNUC__
 // Claim
 
-// .pb.Claim.Type type = 1;
+// .pb3.Claim.Type type = 1;
 inline void Claim::clear_type() {
   type_ = 0;
 }
-inline ::pb::Claim_Type Claim::type() const {
-  // @@protoc_insertion_point(field_get:pb.Claim.type)
-  return static_cast< ::pb::Claim_Type >(type_);
+inline ::pb3::Claim_Type Claim::type() const {
+  // @@protoc_insertion_point(field_get:pb3.Claim.type)
+  return static_cast< ::pb3::Claim_Type >(type_);
 }
-inline void Claim::set_type(::pb::Claim_Type value) {
+inline void Claim::set_type(::pb3::Claim_Type value) {
   
   type_ = value;
-  // @@protoc_insertion_point(field_set:pb.Claim.type)
+  // @@protoc_insertion_point(field_set:pb3.Claim.type)
 }
 
-// .pb.Stream stream = 2;
+// .pb3.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::stream() const {
-  const ::pb::Stream* p = stream_;
-  // @@protoc_insertion_point(field_get:pb.Claim.stream)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Stream*>(
-      &::pb::_Stream_default_instance_);
+inline const ::pb3::Stream& Claim::_internal_stream() const {
+  return *stream_;
 }
-inline ::pb::Stream* Claim::release_stream() {
-  // @@protoc_insertion_point(field_release:pb.Claim.stream)
+inline const ::pb3::Stream& Claim::stream() const {
+  const ::pb3::Stream* p = stream_;
+  // @@protoc_insertion_point(field_get:pb3.Claim.stream)
+  return p != NULL ? *p : *reinterpret_cast<const ::pb3::Stream*>(
+      &::pb3::_Stream_default_instance_);
+}
+inline ::pb3::Stream* Claim::release_stream() {
+  // @@protoc_insertion_point(field_release:pb3.Claim.stream)
   
-  ::pb::Stream* temp = stream_;
-  stream_ = nullptr;
+  ::pb3::Stream* temp = stream_;
+  stream_ = NULL;
   return temp;
 }
-inline ::pb::Stream* Claim::mutable_stream() {
+inline ::pb3::Stream* Claim::mutable_stream() {
   
-  if (stream_ == nullptr) {
-    auto* p = CreateMaybeMessage<::pb::Stream>(GetArenaNoVirtual());
+  if (stream_ == NULL) {
+    auto* p = CreateMaybeMessage<::pb3::Stream>(GetArenaNoVirtual());
     stream_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.stream)
+  // @@protoc_insertion_point(field_mutable:pb3.Claim.stream)
   return stream_;
 }
-inline void Claim::set_allocated_stream(::pb::Stream* stream) {
+inline void Claim::set_allocated_stream(::pb3::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);
@@ -1277,48 +1261,51 @@ inline void Claim::set_allocated_stream(::pb::Stream* stream) {
     
   }
   stream_ = stream;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.stream)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Claim.stream)
 }
 
-// .pb.Channel channel = 3;
+// .pb3.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::channel() const {
-  const ::pb::Channel* p = channel_;
-  // @@protoc_insertion_point(field_get:pb.Claim.channel)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Channel*>(
-      &::pb::_Channel_default_instance_);
+inline const ::pb3::Channel& Claim::_internal_channel() const {
+  return *channel_;
 }
-inline ::pb::Channel* Claim::release_channel() {
-  // @@protoc_insertion_point(field_release:pb.Claim.channel)
+inline const ::pb3::Channel& Claim::channel() const {
+  const ::pb3::Channel* p = channel_;
+  // @@protoc_insertion_point(field_get:pb3.Claim.channel)
+  return p != NULL ? *p : *reinterpret_cast<const ::pb3::Channel*>(
+      &::pb3::_Channel_default_instance_);
+}
+inline ::pb3::Channel* Claim::release_channel() {
+  // @@protoc_insertion_point(field_release:pb3.Claim.channel)
   
-  ::pb::Channel* temp = channel_;
-  channel_ = nullptr;
+  ::pb3::Channel* temp = channel_;
+  channel_ = NULL;
   return temp;
 }
-inline ::pb::Channel* Claim::mutable_channel() {
+inline ::pb3::Channel* Claim::mutable_channel() {
   
-  if (channel_ == nullptr) {
-    auto* p = CreateMaybeMessage<::pb::Channel>(GetArenaNoVirtual());
+  if (channel_ == NULL) {
+    auto* p = CreateMaybeMessage<::pb3::Channel>(GetArenaNoVirtual());
     channel_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.channel)
+  // @@protoc_insertion_point(field_mutable:pb3.Claim.channel)
   return channel_;
 }
-inline void Claim::set_allocated_channel(::pb::Channel* channel) {
+inline void Claim::set_allocated_channel(::pb3::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);
@@ -1328,7 +1315,7 @@ inline void Claim::set_allocated_channel(::pb::Channel* channel) {
     
   }
   channel_ = channel;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.channel)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Claim.channel)
 }
 
 // -------------------------------------------------------------------
@@ -1340,52 +1327,52 @@ inline void Channel::clear_public_key() {
   public_key_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Channel::public_key() const {
-  // @@protoc_insertion_point(field_get:pb.Channel.public_key)
+  // @@protoc_insertion_point(field_get:pb3.Channel.public_key)
   return public_key_.GetNoArena();
 }
 inline void Channel::set_public_key(const ::std::string& value) {
   
   public_key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Channel.public_key)
+  // @@protoc_insertion_point(field_set:pb3.Channel.public_key)
 }
 #if LANG_CXX11
 inline void Channel::set_public_key(::std::string&& value) {
   
   public_key_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Channel.public_key)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Channel.public_key)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Channel.public_key)
 }
 inline void Channel::set_public_key(const void* value, size_t size) {
   
   public_key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Channel.public_key)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Channel.public_key)
 }
 inline ::std::string* Channel::mutable_public_key() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Channel.public_key)
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.public_key)
   return public_key_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Channel::release_public_key() {
-  // @@protoc_insertion_point(field_release:pb.Channel.public_key)
+  // @@protoc_insertion_point(field_release:pb3.Channel.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 {
     
   }
   public_key_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), public_key);
-  // @@protoc_insertion_point(field_set_allocated:pb.Channel.public_key)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Channel.public_key)
 }
 
 // string title = 2;
@@ -1393,52 +1380,52 @@ inline void Channel::clear_title() {
   title_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Channel::title() const {
-  // @@protoc_insertion_point(field_get:pb.Channel.title)
+  // @@protoc_insertion_point(field_get:pb3.Channel.title)
   return title_.GetNoArena();
 }
 inline void Channel::set_title(const ::std::string& value) {
   
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Channel.title)
+  // @@protoc_insertion_point(field_set:pb3.Channel.title)
 }
 #if LANG_CXX11
 inline void Channel::set_title(::std::string&& value) {
   
   title_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Channel.title)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Channel.title)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Channel.title)
 }
 inline void Channel::set_title(const char* value, size_t size) {
   
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Channel.title)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Channel.title)
 }
 inline ::std::string* Channel::mutable_title() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Channel.title)
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.title)
   return title_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Channel::release_title() {
-  // @@protoc_insertion_point(field_release:pb.Channel.title)
+  // @@protoc_insertion_point(field_release:pb3.Channel.title)
   
   return title_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_title(::std::string* title) {
-  if (title != nullptr) {
+  if (title != NULL) {
     
   } else {
     
   }
   title_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), title);
-  // @@protoc_insertion_point(field_set_allocated:pb.Channel.title)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Channel.title)
 }
 
 // string description = 3;
@@ -1446,52 +1433,52 @@ inline void Channel::clear_description() {
   description_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Channel::description() const {
-  // @@protoc_insertion_point(field_get:pb.Channel.description)
+  // @@protoc_insertion_point(field_get:pb3.Channel.description)
   return description_.GetNoArena();
 }
 inline void Channel::set_description(const ::std::string& value) {
   
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Channel.description)
+  // @@protoc_insertion_point(field_set:pb3.Channel.description)
 }
 #if LANG_CXX11
 inline void Channel::set_description(::std::string&& value) {
   
   description_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Channel.description)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Channel.description)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Channel.description)
 }
 inline void Channel::set_description(const char* value, size_t size) {
   
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Channel.description)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Channel.description)
 }
 inline ::std::string* Channel::mutable_description() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Channel.description)
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.description)
   return description_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Channel::release_description() {
-  // @@protoc_insertion_point(field_release:pb.Channel.description)
+  // @@protoc_insertion_point(field_release:pb3.Channel.description)
   
   return description_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Channel::set_allocated_description(::std::string* description) {
-  if (description != nullptr) {
+  if (description != NULL) {
     
   } else {
     
   }
   description_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), description);
-  // @@protoc_insertion_point(field_set_allocated:pb.Channel.description)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Channel.description)
 }
 
 // string contact_email = 4;
@@ -1499,52 +1486,52 @@ inline void Channel::clear_contact_email() {
   contact_email_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Channel::contact_email() const {
-  // @@protoc_insertion_point(field_get:pb.Channel.contact_email)
+  // @@protoc_insertion_point(field_get:pb3.Channel.contact_email)
   return contact_email_.GetNoArena();
 }
 inline void Channel::set_contact_email(const ::std::string& value) {
   
   contact_email_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Channel.contact_email)
+  // @@protoc_insertion_point(field_set:pb3.Channel.contact_email)
 }
 #if LANG_CXX11
 inline void Channel::set_contact_email(::std::string&& value) {
   
   contact_email_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Channel.contact_email)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Channel.contact_email)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Channel.contact_email)
 }
 inline void Channel::set_contact_email(const char* value, size_t size) {
   
   contact_email_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Channel.contact_email)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Channel.contact_email)
 }
 inline ::std::string* Channel::mutable_contact_email() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Channel.contact_email)
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.contact_email)
   return contact_email_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Channel::release_contact_email() {
-  // @@protoc_insertion_point(field_release:pb.Channel.contact_email)
+  // @@protoc_insertion_point(field_release:pb3.Channel.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 {
     
   }
   contact_email_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), contact_email);
-  // @@protoc_insertion_point(field_set_allocated:pb.Channel.contact_email)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Channel.contact_email)
 }
 
 // string homepage_url = 5;
@@ -1552,52 +1539,121 @@ inline void Channel::clear_homepage_url() {
   homepage_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Channel::homepage_url() const {
-  // @@protoc_insertion_point(field_get:pb.Channel.homepage_url)
+  // @@protoc_insertion_point(field_get:pb3.Channel.homepage_url)
   return homepage_url_.GetNoArena();
 }
 inline void Channel::set_homepage_url(const ::std::string& value) {
   
   homepage_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Channel.homepage_url)
+  // @@protoc_insertion_point(field_set:pb3.Channel.homepage_url)
 }
 #if LANG_CXX11
 inline void Channel::set_homepage_url(::std::string&& value) {
   
   homepage_url_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Channel.homepage_url)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Channel.homepage_url)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Channel.homepage_url)
 }
 inline void Channel::set_homepage_url(const char* value, size_t size) {
   
   homepage_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Channel.homepage_url)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Channel.homepage_url)
 }
 inline ::std::string* Channel::mutable_homepage_url() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Channel.homepage_url)
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.homepage_url)
   return homepage_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Channel::release_homepage_url() {
-  // @@protoc_insertion_point(field_release:pb.Channel.homepage_url)
+  // @@protoc_insertion_point(field_release:pb3.Channel.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 {
     
   }
   homepage_url_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), homepage_url);
-  // @@protoc_insertion_point(field_set_allocated:pb.Channel.homepage_url)
+  // @@protoc_insertion_point(field_set_allocated:pb3.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:pb3.Channel.tags)
+  return tags_.Get(index);
+}
+inline ::std::string* Channel::mutable_tags(int index) {
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.tags)
+  return tags_.Mutable(index);
+}
+inline void Channel::set_tags(int index, const ::std::string& value) {
+  // @@protoc_insertion_point(field_set:pb3.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:pb3.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:pb3.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:pb3.Channel.tags)
+}
+inline ::std::string* Channel::add_tags() {
+  // @@protoc_insertion_point(field_add_mutable:pb3.Channel.tags)
+  return tags_.Add();
+}
+inline void Channel::add_tags(const ::std::string& value) {
+  tags_.Add()->assign(value);
+  // @@protoc_insertion_point(field_add:pb3.Channel.tags)
+}
+#if LANG_CXX11
+inline void Channel::add_tags(::std::string&& value) {
+  tags_.Add(std::move(value));
+  // @@protoc_insertion_point(field_add:pb3.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:pb3.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:pb3.Channel.tags)
+}
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+Channel::tags() const {
+  // @@protoc_insertion_point(field_list:pb3.Channel.tags)
+  return tags_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+Channel::mutable_tags() {
+  // @@protoc_insertion_point(field_mutable_list:pb3.Channel.tags)
+  return &tags_;
 }
 
 // string thumbnail_url = 16;
@@ -1605,52 +1661,52 @@ inline void Channel::clear_thumbnail_url() {
   thumbnail_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Channel::thumbnail_url() const {
-  // @@protoc_insertion_point(field_get:pb.Channel.thumbnail_url)
+  // @@protoc_insertion_point(field_get:pb3.Channel.thumbnail_url)
   return thumbnail_url_.GetNoArena();
 }
 inline void Channel::set_thumbnail_url(const ::std::string& value) {
   
   thumbnail_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Channel.thumbnail_url)
+  // @@protoc_insertion_point(field_set:pb3.Channel.thumbnail_url)
 }
 #if LANG_CXX11
 inline void Channel::set_thumbnail_url(::std::string&& value) {
   
   thumbnail_url_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Channel.thumbnail_url)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Channel.thumbnail_url)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Channel.thumbnail_url)
 }
 inline void Channel::set_thumbnail_url(const char* value, size_t size) {
   
   thumbnail_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Channel.thumbnail_url)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Channel.thumbnail_url)
 }
 inline ::std::string* Channel::mutable_thumbnail_url() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Channel.thumbnail_url)
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.thumbnail_url)
   return thumbnail_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Channel::release_thumbnail_url() {
-  // @@protoc_insertion_point(field_release:pb.Channel.thumbnail_url)
+  // @@protoc_insertion_point(field_release:pb3.Channel.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 {
     
   }
   thumbnail_url_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), thumbnail_url);
-  // @@protoc_insertion_point(field_set_allocated:pb.Channel.thumbnail_url)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Channel.thumbnail_url)
 }
 
 // string cover_url = 17;
@@ -1658,52 +1714,52 @@ inline void Channel::clear_cover_url() {
   cover_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Channel::cover_url() const {
-  // @@protoc_insertion_point(field_get:pb.Channel.cover_url)
+  // @@protoc_insertion_point(field_get:pb3.Channel.cover_url)
   return cover_url_.GetNoArena();
 }
 inline void Channel::set_cover_url(const ::std::string& value) {
   
   cover_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Channel.cover_url)
+  // @@protoc_insertion_point(field_set:pb3.Channel.cover_url)
 }
 #if LANG_CXX11
 inline void Channel::set_cover_url(::std::string&& value) {
   
   cover_url_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Channel.cover_url)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Channel.cover_url)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Channel.cover_url)
 }
 inline void Channel::set_cover_url(const char* value, size_t size) {
   
   cover_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Channel.cover_url)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Channel.cover_url)
 }
 inline ::std::string* Channel::mutable_cover_url() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Channel.cover_url)
+  // @@protoc_insertion_point(field_mutable:pb3.Channel.cover_url)
   return cover_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Channel::release_cover_url() {
-  // @@protoc_insertion_point(field_release:pb.Channel.cover_url)
+  // @@protoc_insertion_point(field_release:pb3.Channel.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 {
     
   }
   cover_url_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), cover_url);
-  // @@protoc_insertion_point(field_set_allocated:pb.Channel.cover_url)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Channel.cover_url)
 }
 
 // -------------------------------------------------------------------
@@ -1715,52 +1771,52 @@ inline void Stream::clear_hash() {
   hash_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::hash() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.hash)
+  // @@protoc_insertion_point(field_get:pb3.Stream.hash)
   return hash_.GetNoArena();
 }
 inline void Stream::set_hash(const ::std::string& value) {
   
   hash_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.hash)
+  // @@protoc_insertion_point(field_set:pb3.Stream.hash)
 }
 #if LANG_CXX11
 inline void Stream::set_hash(::std::string&& value) {
   
   hash_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.hash)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.hash)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.hash)
 }
 inline void Stream::set_hash(const void* value, size_t size) {
   
   hash_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.hash)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.hash)
 }
 inline ::std::string* Stream::mutable_hash() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.hash)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.hash)
   return hash_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_hash() {
-  // @@protoc_insertion_point(field_release:pb.Stream.hash)
+  // @@protoc_insertion_point(field_release:pb3.Stream.hash)
   
   return hash_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_hash(::std::string* hash) {
-  if (hash != nullptr) {
+  if (hash != NULL) {
     
   } else {
     
   }
   hash_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), hash);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.hash)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.hash)
 }
 
 // string language = 2;
@@ -1768,52 +1824,52 @@ inline void Stream::clear_language() {
   language_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::language() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.language)
+  // @@protoc_insertion_point(field_get:pb3.Stream.language)
   return language_.GetNoArena();
 }
 inline void Stream::set_language(const ::std::string& value) {
   
   language_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.language)
+  // @@protoc_insertion_point(field_set:pb3.Stream.language)
 }
 #if LANG_CXX11
 inline void Stream::set_language(::std::string&& value) {
   
   language_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.language)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.language)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.language)
 }
 inline void Stream::set_language(const char* value, size_t size) {
   
   language_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.language)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.language)
 }
 inline ::std::string* Stream::mutable_language() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.language)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.language)
   return language_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_language() {
-  // @@protoc_insertion_point(field_release:pb.Stream.language)
+  // @@protoc_insertion_point(field_release:pb3.Stream.language)
   
   return language_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_language(::std::string* language) {
-  if (language != nullptr) {
+  if (language != NULL) {
     
   } else {
     
   }
   language_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), language);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.language)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.language)
 }
 
 // string title = 3;
@@ -1821,52 +1877,52 @@ inline void Stream::clear_title() {
   title_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::title() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.title)
+  // @@protoc_insertion_point(field_get:pb3.Stream.title)
   return title_.GetNoArena();
 }
 inline void Stream::set_title(const ::std::string& value) {
   
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.title)
+  // @@protoc_insertion_point(field_set:pb3.Stream.title)
 }
 #if LANG_CXX11
 inline void Stream::set_title(::std::string&& value) {
   
   title_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.title)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.title)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.title)
 }
 inline void Stream::set_title(const char* value, size_t size) {
   
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.title)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.title)
 }
 inline ::std::string* Stream::mutable_title() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.title)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.title)
   return title_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_title() {
-  // @@protoc_insertion_point(field_release:pb.Stream.title)
+  // @@protoc_insertion_point(field_release:pb3.Stream.title)
   
   return title_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_title(::std::string* title) {
-  if (title != nullptr) {
+  if (title != NULL) {
     
   } else {
     
   }
   title_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), title);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.title)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.title)
 }
 
 // string author = 4;
@@ -1874,52 +1930,52 @@ inline void Stream::clear_author() {
   author_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::author() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.author)
+  // @@protoc_insertion_point(field_get:pb3.Stream.author)
   return author_.GetNoArena();
 }
 inline void Stream::set_author(const ::std::string& value) {
   
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.author)
+  // @@protoc_insertion_point(field_set:pb3.Stream.author)
 }
 #if LANG_CXX11
 inline void Stream::set_author(::std::string&& value) {
   
   author_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.author)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.author)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.author)
 }
 inline void Stream::set_author(const char* value, size_t size) {
   
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.author)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.author)
 }
 inline ::std::string* Stream::mutable_author() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.author)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.author)
   return author_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_author() {
-  // @@protoc_insertion_point(field_release:pb.Stream.author)
+  // @@protoc_insertion_point(field_release:pb3.Stream.author)
   
   return author_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_author(::std::string* author) {
-  if (author != nullptr) {
+  if (author != NULL) {
     
   } else {
     
   }
   author_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), author);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.author)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.author)
 }
 
 // string description = 5;
@@ -1927,52 +1983,52 @@ inline void Stream::clear_description() {
   description_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::description() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.description)
+  // @@protoc_insertion_point(field_get:pb3.Stream.description)
   return description_.GetNoArena();
 }
 inline void Stream::set_description(const ::std::string& value) {
   
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.description)
+  // @@protoc_insertion_point(field_set:pb3.Stream.description)
 }
 #if LANG_CXX11
 inline void Stream::set_description(::std::string&& value) {
   
   description_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.description)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.description)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.description)
 }
 inline void Stream::set_description(const char* value, size_t size) {
   
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.description)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.description)
 }
 inline ::std::string* Stream::mutable_description() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.description)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.description)
   return description_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_description() {
-  // @@protoc_insertion_point(field_release:pb.Stream.description)
+  // @@protoc_insertion_point(field_release:pb3.Stream.description)
   
   return description_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_description(::std::string* description) {
-  if (description != nullptr) {
+  if (description != NULL) {
     
   } else {
     
   }
   description_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), description);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.description)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.description)
 }
 
 // string media_type = 6;
@@ -1980,52 +2036,52 @@ inline void Stream::clear_media_type() {
   media_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::media_type() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.media_type)
+  // @@protoc_insertion_point(field_get:pb3.Stream.media_type)
   return media_type_.GetNoArena();
 }
 inline void Stream::set_media_type(const ::std::string& value) {
   
   media_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.media_type)
+  // @@protoc_insertion_point(field_set:pb3.Stream.media_type)
 }
 #if LANG_CXX11
 inline void Stream::set_media_type(::std::string&& value) {
   
   media_type_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.media_type)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.media_type)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.media_type)
 }
 inline void Stream::set_media_type(const char* value, size_t size) {
   
   media_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.media_type)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.media_type)
 }
 inline ::std::string* Stream::mutable_media_type() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.media_type)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.media_type)
   return media_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_media_type() {
-  // @@protoc_insertion_point(field_release:pb.Stream.media_type)
+  // @@protoc_insertion_point(field_release:pb3.Stream.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 {
     
   }
   media_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), media_type);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.media_type)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.media_type)
 }
 
 // string license = 7;
@@ -2033,93 +2089,96 @@ inline void Stream::clear_license() {
   license_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::license() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.license)
+  // @@protoc_insertion_point(field_get:pb3.Stream.license)
   return license_.GetNoArena();
 }
 inline void Stream::set_license(const ::std::string& value) {
   
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.license)
+  // @@protoc_insertion_point(field_set:pb3.Stream.license)
 }
 #if LANG_CXX11
 inline void Stream::set_license(::std::string&& value) {
   
   license_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.license)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.license)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.license)
 }
 inline void Stream::set_license(const char* value, size_t size) {
   
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.license)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.license)
 }
 inline ::std::string* Stream::mutable_license() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.license)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.license)
   return license_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_license() {
-  // @@protoc_insertion_point(field_release:pb.Stream.license)
+  // @@protoc_insertion_point(field_release:pb3.Stream.license)
   
   return license_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Stream::set_allocated_license(::std::string* license) {
-  if (license != nullptr) {
+  if (license != NULL) {
     
   } else {
     
   }
   license_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), license);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.license)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.license)
 }
 
-// .pb.File file = 8;
+// .pb3.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::file() const {
-  const ::pb::File* p = file_;
-  // @@protoc_insertion_point(field_get:pb.Stream.file)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::File*>(
-      &::pb::_File_default_instance_);
+inline const ::pb3::File& Stream::_internal_file() const {
+  return *file_;
 }
-inline ::pb::File* Stream::release_file() {
-  // @@protoc_insertion_point(field_release:pb.Stream.file)
+inline const ::pb3::File& Stream::file() const {
+  const ::pb3::File* p = file_;
+  // @@protoc_insertion_point(field_get:pb3.Stream.file)
+  return p != NULL ? *p : *reinterpret_cast<const ::pb3::File*>(
+      &::pb3::_File_default_instance_);
+}
+inline ::pb3::File* Stream::release_file() {
+  // @@protoc_insertion_point(field_release:pb3.Stream.file)
   
-  ::pb::File* temp = file_;
-  file_ = nullptr;
+  ::pb3::File* temp = file_;
+  file_ = NULL;
   return temp;
 }
-inline ::pb::File* Stream::mutable_file() {
+inline ::pb3::File* Stream::mutable_file() {
   
-  if (file_ == nullptr) {
-    auto* p = CreateMaybeMessage<::pb::File>(GetArenaNoVirtual());
+  if (file_ == NULL) {
+    auto* p = CreateMaybeMessage<::pb3::File>(GetArenaNoVirtual());
     file_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Stream.file)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.file)
   return file_;
 }
-inline void Stream::set_allocated_file(::pb::File* file) {
+inline void Stream::set_allocated_file(::pb3::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);
@@ -2129,48 +2188,51 @@ inline void Stream::set_allocated_file(::pb::File* file) {
     
   }
   file_ = file;
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.file)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.file)
 }
 
-// .pb.Fee fee = 16;
+// .pb3.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::fee() const {
-  const ::pb::Fee* p = fee_;
-  // @@protoc_insertion_point(field_get:pb.Stream.fee)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Fee*>(
-      &::pb::_Fee_default_instance_);
+inline const ::pb3::Fee& Stream::_internal_fee() const {
+  return *fee_;
 }
-inline ::pb::Fee* Stream::release_fee() {
-  // @@protoc_insertion_point(field_release:pb.Stream.fee)
+inline const ::pb3::Fee& Stream::fee() const {
+  const ::pb3::Fee* p = fee_;
+  // @@protoc_insertion_point(field_get:pb3.Stream.fee)
+  return p != NULL ? *p : *reinterpret_cast<const ::pb3::Fee*>(
+      &::pb3::_Fee_default_instance_);
+}
+inline ::pb3::Fee* Stream::release_fee() {
+  // @@protoc_insertion_point(field_release:pb3.Stream.fee)
   
-  ::pb::Fee* temp = fee_;
-  fee_ = nullptr;
+  ::pb3::Fee* temp = fee_;
+  fee_ = NULL;
   return temp;
 }
-inline ::pb::Fee* Stream::mutable_fee() {
+inline ::pb3::Fee* Stream::mutable_fee() {
   
-  if (fee_ == nullptr) {
-    auto* p = CreateMaybeMessage<::pb::Fee>(GetArenaNoVirtual());
+  if (fee_ == NULL) {
+    auto* p = CreateMaybeMessage<::pb3::Fee>(GetArenaNoVirtual());
     fee_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Stream.fee)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.fee)
   return fee_;
 }
-inline void Stream::set_allocated_fee(::pb::Fee* fee) {
+inline void Stream::set_allocated_fee(::pb3::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);
@@ -2180,7 +2242,7 @@ inline void Stream::set_allocated_fee(::pb::Fee* fee) {
     
   }
   fee_ = fee;
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.fee)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.fee)
 }
 
 // string license_url = 17;
@@ -2188,52 +2250,52 @@ inline void Stream::clear_license_url() {
   license_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::license_url() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.license_url)
+  // @@protoc_insertion_point(field_get:pb3.Stream.license_url)
   return license_url_.GetNoArena();
 }
 inline void Stream::set_license_url(const ::std::string& value) {
   
   license_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.license_url)
+  // @@protoc_insertion_point(field_set:pb3.Stream.license_url)
 }
 #if LANG_CXX11
 inline void Stream::set_license_url(::std::string&& value) {
   
   license_url_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.license_url)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.license_url)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.license_url)
 }
 inline void Stream::set_license_url(const char* value, size_t size) {
   
   license_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.license_url)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.license_url)
 }
 inline ::std::string* Stream::mutable_license_url() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.license_url)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.license_url)
   return license_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_license_url() {
-  // @@protoc_insertion_point(field_release:pb.Stream.license_url)
+  // @@protoc_insertion_point(field_release:pb3.Stream.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 {
     
   }
   license_url_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), license_url);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.license_url)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.license_url)
 }
 
 // string thumbnail_url = 18;
@@ -2241,52 +2303,52 @@ inline void Stream::clear_thumbnail_url() {
   thumbnail_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Stream::thumbnail_url() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.thumbnail_url)
+  // @@protoc_insertion_point(field_get:pb3.Stream.thumbnail_url)
   return thumbnail_url_.GetNoArena();
 }
 inline void Stream::set_thumbnail_url(const ::std::string& value) {
   
   thumbnail_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Stream.thumbnail_url)
+  // @@protoc_insertion_point(field_set:pb3.Stream.thumbnail_url)
 }
 #if LANG_CXX11
 inline void Stream::set_thumbnail_url(::std::string&& value) {
   
   thumbnail_url_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Stream.thumbnail_url)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Stream.thumbnail_url)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.thumbnail_url)
 }
 inline void Stream::set_thumbnail_url(const char* value, size_t size) {
   
   thumbnail_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Stream.thumbnail_url)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.thumbnail_url)
 }
 inline ::std::string* Stream::mutable_thumbnail_url() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Stream.thumbnail_url)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.thumbnail_url)
   return thumbnail_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Stream::release_thumbnail_url() {
-  // @@protoc_insertion_point(field_release:pb.Stream.thumbnail_url)
+  // @@protoc_insertion_point(field_release:pb3.Stream.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 {
     
   }
   thumbnail_url_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), thumbnail_url);
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.thumbnail_url)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.thumbnail_url)
 }
 
 // uint32 duration = 19;
@@ -2294,13 +2356,13 @@ inline void Stream::clear_duration() {
   duration_ = 0u;
 }
 inline ::google::protobuf::uint32 Stream::duration() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.duration)
+  // @@protoc_insertion_point(field_get:pb3.Stream.duration)
   return duration_;
 }
 inline void Stream::set_duration(::google::protobuf::uint32 value) {
   
   duration_ = value;
-  // @@protoc_insertion_point(field_set:pb.Stream.duration)
+  // @@protoc_insertion_point(field_set:pb3.Stream.duration)
 }
 
 // repeated string tags = 20;
@@ -2311,120 +2373,123 @@ inline void Stream::clear_tags() {
   tags_.Clear();
 }
 inline const ::std::string& Stream::tags(int index) const {
-  // @@protoc_insertion_point(field_get:pb.Stream.tags)
+  // @@protoc_insertion_point(field_get:pb3.Stream.tags)
   return tags_.Get(index);
 }
 inline ::std::string* Stream::mutable_tags(int index) {
-  // @@protoc_insertion_point(field_mutable:pb.Stream.tags)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.tags)
   return tags_.Mutable(index);
 }
 inline void Stream::set_tags(int index, const ::std::string& value) {
-  // @@protoc_insertion_point(field_set:pb.Stream.tags)
+  // @@protoc_insertion_point(field_set:pb3.Stream.tags)
   tags_.Mutable(index)->assign(value);
 }
 #if LANG_CXX11
 inline void Stream::set_tags(int index, ::std::string&& value) {
-  // @@protoc_insertion_point(field_set:pb.Stream.tags)
+  // @@protoc_insertion_point(field_set:pb3.Stream.tags)
   tags_.Mutable(index)->assign(std::move(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)
+  // @@protoc_insertion_point(field_set_char:pb3.Stream.tags)
 }
 inline void Stream::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.Stream.tags)
+  // @@protoc_insertion_point(field_set_pointer:pb3.Stream.tags)
 }
 inline ::std::string* Stream::add_tags() {
-  // @@protoc_insertion_point(field_add_mutable:pb.Stream.tags)
+  // @@protoc_insertion_point(field_add_mutable:pb3.Stream.tags)
   return tags_.Add();
 }
 inline void Stream::add_tags(const ::std::string& value) {
   tags_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:pb.Stream.tags)
+  // @@protoc_insertion_point(field_add:pb3.Stream.tags)
 }
 #if LANG_CXX11
 inline void Stream::add_tags(::std::string&& value) {
   tags_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:pb.Stream.tags)
+  // @@protoc_insertion_point(field_add:pb3.Stream.tags)
 }
 #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)
+  // @@protoc_insertion_point(field_add_char:pb3.Stream.tags)
 }
 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)
+  // @@protoc_insertion_point(field_add_pointer:pb3.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)
+  // @@protoc_insertion_point(field_list:pb3.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)
+  // @@protoc_insertion_point(field_mutable_list:pb3.Stream.tags)
   return &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)
+  // @@protoc_insertion_point(field_get:pb3.Stream.release_time)
   return release_time_;
 }
 inline void Stream::set_release_time(::google::protobuf::int64 value) {
   
   release_time_ = value;
-  // @@protoc_insertion_point(field_set:pb.Stream.release_time)
+  // @@protoc_insertion_point(field_set:pb3.Stream.release_time)
 }
 
-// .pb.Video video = 22;
+// .pb3.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::video() const {
-  const ::pb::Video* p = video_;
-  // @@protoc_insertion_point(field_get:pb.Stream.video)
-  return p != nullptr ? *p : *reinterpret_cast<const ::pb::Video*>(
-      &::pb::_Video_default_instance_);
+inline const ::pb3::Video& Stream::_internal_video() const {
+  return *video_;
 }
-inline ::pb::Video* Stream::release_video() {
-  // @@protoc_insertion_point(field_release:pb.Stream.video)
+inline const ::pb3::Video& Stream::video() const {
+  const ::pb3::Video* p = video_;
+  // @@protoc_insertion_point(field_get:pb3.Stream.video)
+  return p != NULL ? *p : *reinterpret_cast<const ::pb3::Video*>(
+      &::pb3::_Video_default_instance_);
+}
+inline ::pb3::Video* Stream::release_video() {
+  // @@protoc_insertion_point(field_release:pb3.Stream.video)
   
-  ::pb::Video* temp = video_;
-  video_ = nullptr;
+  ::pb3::Video* temp = video_;
+  video_ = NULL;
   return temp;
 }
-inline ::pb::Video* Stream::mutable_video() {
+inline ::pb3::Video* Stream::mutable_video() {
   
-  if (video_ == nullptr) {
-    auto* p = CreateMaybeMessage<::pb::Video>(GetArenaNoVirtual());
+  if (video_ == NULL) {
+    auto* p = CreateMaybeMessage<::pb3::Video>(GetArenaNoVirtual());
     video_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Stream.video)
+  // @@protoc_insertion_point(field_mutable:pb3.Stream.video)
   return video_;
 }
-inline void Stream::set_allocated_video(::pb::Video* video) {
+inline void Stream::set_allocated_video(::pb3::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);
@@ -2434,25 +2499,25 @@ inline void Stream::set_allocated_video(::pb::Video* video) {
     
   }
   video_ = video;
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.video)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Stream.video)
 }
 
 // -------------------------------------------------------------------
 
 // Fee
 
-// .pb.Fee.Currency currency = 1;
+// .pb3.Fee.Currency currency = 1;
 inline void Fee::clear_currency() {
   currency_ = 0;
 }
-inline ::pb::Fee_Currency Fee::currency() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.currency)
-  return static_cast< ::pb::Fee_Currency >(currency_);
+inline ::pb3::Fee_Currency Fee::currency() const {
+  // @@protoc_insertion_point(field_get:pb3.Fee.currency)
+  return static_cast< ::pb3::Fee_Currency >(currency_);
 }
-inline void Fee::set_currency(::pb::Fee_Currency value) {
+inline void Fee::set_currency(::pb3::Fee_Currency value) {
   
   currency_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.currency)
+  // @@protoc_insertion_point(field_set:pb3.Fee.currency)
 }
 
 // bytes address = 2;
@@ -2460,66 +2525,66 @@ inline void Fee::clear_address() {
   address_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& Fee::address() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.address)
+  // @@protoc_insertion_point(field_get:pb3.Fee.address)
   return address_.GetNoArena();
 }
 inline void Fee::set_address(const ::std::string& value) {
   
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Fee.address)
+  // @@protoc_insertion_point(field_set:pb3.Fee.address)
 }
 #if LANG_CXX11
 inline void Fee::set_address(::std::string&& value) {
   
   address_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.Fee.address)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.Fee.address)
 }
 inline void Fee::set_address(const void* value, size_t size) {
   
   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:pb3.Fee.address)
 }
 inline ::std::string* Fee::mutable_address() {
   
-  // @@protoc_insertion_point(field_mutable:pb.Fee.address)
+  // @@protoc_insertion_point(field_mutable:pb3.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:pb3.Fee.address)
   
   return address_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Fee::set_allocated_address(::std::string* address) {
-  if (address != nullptr) {
+  if (address != NULL) {
     
   } else {
     
   }
   address_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), address);
-  // @@protoc_insertion_point(field_set_allocated:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_allocated:pb3.Fee.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)
+  // @@protoc_insertion_point(field_get:pb3.Fee.amount)
   return amount_;
 }
 inline void Fee::set_amount(::google::protobuf::uint64 value) {
   
   amount_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.amount)
+  // @@protoc_insertion_point(field_set:pb3.Fee.amount)
 }
 
 // -------------------------------------------------------------------
@@ -2531,66 +2596,66 @@ inline void File::clear_name() {
   name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline const ::std::string& File::name() const {
-  // @@protoc_insertion_point(field_get:pb.File.name)
+  // @@protoc_insertion_point(field_get:pb3.File.name)
   return name_.GetNoArena();
 }
 inline void File::set_name(const ::std::string& value) {
   
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.File.name)
+  // @@protoc_insertion_point(field_set:pb3.File.name)
 }
 #if LANG_CXX11
 inline void File::set_name(::std::string&& value) {
   
   name_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.File.name)
+  // @@protoc_insertion_point(field_set_rvalue:pb3.File.name)
 }
 #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)
+  // @@protoc_insertion_point(field_set_char:pb3.File.name)
 }
 inline void File::set_name(const char* value, size_t size) {
   
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.File.name)
+  // @@protoc_insertion_point(field_set_pointer:pb3.File.name)
 }
 inline ::std::string* File::mutable_name() {
   
-  // @@protoc_insertion_point(field_mutable:pb.File.name)
+  // @@protoc_insertion_point(field_mutable:pb3.File.name)
   return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* File::release_name() {
-  // @@protoc_insertion_point(field_release:pb.File.name)
+  // @@protoc_insertion_point(field_release:pb3.File.name)
   
   return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void File::set_allocated_name(::std::string* name) {
-  if (name != nullptr) {
+  if (name != NULL) {
     
   } else {
     
   }
   name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
-  // @@protoc_insertion_point(field_set_allocated:pb.File.name)
+  // @@protoc_insertion_point(field_set_allocated:pb3.File.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)
+  // @@protoc_insertion_point(field_get:pb3.File.size)
   return size_;
 }
 inline void File::set_size(::google::protobuf::uint64 value) {
   
   size_ = value;
-  // @@protoc_insertion_point(field_set:pb.File.size)
+  // @@protoc_insertion_point(field_set:pb3.File.size)
 }
 
 // -------------------------------------------------------------------
@@ -2602,13 +2667,13 @@ inline void Video::clear_width() {
   width_ = 0u;
 }
 inline ::google::protobuf::uint32 Video::width() const {
-  // @@protoc_insertion_point(field_get:pb.Video.width)
+  // @@protoc_insertion_point(field_get:pb3.Video.width)
   return width_;
 }
 inline void Video::set_width(::google::protobuf::uint32 value) {
   
   width_ = value;
-  // @@protoc_insertion_point(field_set:pb.Video.width)
+  // @@protoc_insertion_point(field_set:pb3.Video.width)
 }
 
 // uint32 height = 2;
@@ -2616,13 +2681,13 @@ inline void Video::clear_height() {
   height_ = 0u;
 }
 inline ::google::protobuf::uint32 Video::height() const {
-  // @@protoc_insertion_point(field_get:pb.Video.height)
+  // @@protoc_insertion_point(field_get:pb3.Video.height)
   return height_;
 }
 inline void Video::set_height(::google::protobuf::uint32 value) {
   
   height_ = value;
-  // @@protoc_insertion_point(field_set:pb.Video.height)
+  // @@protoc_insertion_point(field_set:pb3.Video.height)
 }
 
 #ifdef __GNUC__
@@ -2641,20 +2706,20 @@ inline void Video::set_height(::google::protobuf::uint32 value) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace pb3
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Claim_Type> : ::std::true_type {};
+template <> struct is_proto_enum< ::pb3::Claim_Type> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Claim_Type>() {
-  return ::pb::Claim_Type_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::pb3::Claim_Type>() {
+  return ::pb3::Claim_Type_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Fee_Currency> : ::std::true_type {};
+template <> struct is_proto_enum< ::pb3::Fee_Currency> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Fee_Currency>() {
-  return ::pb::Fee_Currency_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::pb3::Fee_Currency>() {
+  return ::pb3::Fee_Currency_descriptor();
 }
 
 }  // namespace protobuf
@@ -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
+#endif  // PROTOBUF_INCLUDED_claim_5fschema_2eproto
diff --git a/v2/go/claim.pb.go b/v2/go/claim_schema.pb.go
similarity index 67%
rename from v2/go/claim.pb.go
rename to v2/go/claim_schema.pb.go
index f2b3af8..2b4d181 100644
--- a/v2/go/claim.pb.go
+++ b/v2/go/claim_schema.pb.go
@@ -1,13 +1,11 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: claim.proto
+// source: claim_schema.proto
 
-package pb
+package pb3
 
-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_schema_6b5e08f519623944, []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,13 +60,12 @@ 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_schema_6b5e08f519623944, []int{3, 0}
 }
 
 type Claim struct {
-	Type                 Claim_Type `protobuf:"varint,1,opt,name=type,proto3,enum=pb.Claim_Type" json:"type,omitempty"`
+	Type                 Claim_Type `protobuf:"varint,1,opt,name=type,proto3,enum=pb3.Claim_Type" json:"type,omitempty"`
 	Stream               *Stream    `protobuf:"bytes,2,opt,name=stream,proto3" json:"stream,omitempty"`
 	Channel              *Channel   `protobuf:"bytes,3,opt,name=channel,proto3" json:"channel,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
@@ -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_schema_6b5e08f519623944, []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_schema_6b5e08f519623944, []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_schema_6b5e08f519623944, []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)
@@ -364,7 +363,7 @@ func (m *Stream) GetVideo() *Video {
 }
 
 type Fee struct {
-	Currency             Fee_Currency `protobuf:"varint,1,opt,name=currency,proto3,enum=pb.Fee_Currency" json:"currency,omitempty"`
+	Currency             Fee_Currency `protobuf:"varint,1,opt,name=currency,proto3,enum=pb3.Fee_Currency" json:"currency,omitempty"`
 	Address              []byte       `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
 	Amount               uint64       `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
@@ -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_schema_6b5e08f519623944, []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_schema_6b5e08f519623944, []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_schema_6b5e08f519623944, []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,58 @@ 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.RegisterType((*Claim)(nil), "pb3.Claim")
+	proto.RegisterType((*Channel)(nil), "pb3.Channel")
+	proto.RegisterType((*Stream)(nil), "pb3.Stream")
+	proto.RegisterType((*Fee)(nil), "pb3.Fee")
+	proto.RegisterType((*File)(nil), "pb3.File")
+	proto.RegisterType((*Video)(nil), "pb3.Video")
+	proto.RegisterEnum("pb3.Claim_Type", Claim_Type_name, Claim_Type_value)
+	proto.RegisterEnum("pb3.Fee_Currency", Fee_Currency_name, Fee_Currency_value)
 }
 
-func init() { proto.RegisterFile("claim.proto", fileDescriptor_bae86789b513b1db) }
+func init() { proto.RegisterFile("claim_schema.proto", fileDescriptor_claim_schema_6b5e08f519623944) }
 
-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_schema_6b5e08f519623944 = []byte{
+	// 632 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0xdd, 0x4e, 0xdb, 0x4a,
+	0x10, 0xc6, 0xc7, 0x8e, 0x63, 0x8f, 0x93, 0x73, 0xc2, 0x1e, 0x0e, 0xb2, 0x38, 0x45, 0x04, 0x23,
+	0x55, 0xb9, 0x69, 0x2e, 0x40, 0x7d, 0x00, 0x9a, 0x82, 0x2a, 0x95, 0x72, 0xb1, 0x40, 0x6f, 0xa3,
+	0x8d, 0x3d, 0xc4, 0xab, 0xae, 0x7f, 0x64, 0xaf, 0xa9, 0xd2, 0xeb, 0x3e, 0x45, 0x5f, 0xa4, 0x6f,
+	0x57, 0x55, 0x3b, 0xb6, 0xd3, 0xa8, 0xf4, 0x6e, 0xbe, 0xef, 0x9b, 0x9d, 0xcc, 0x7c, 0x33, 0x0e,
+	0xb0, 0x58, 0x09, 0x99, 0x2d, 0xeb, 0x38, 0xc5, 0x4c, 0xcc, 0xcb, 0xaa, 0xd0, 0x05, 0xb3, 0xcb,
+	0xd5, 0x45, 0xf4, 0xcd, 0x82, 0xc1, 0xc2, 0x68, 0xec, 0x0c, 0x1c, 0xbd, 0x29, 0x31, 0xb4, 0xa6,
+	0xd6, 0xec, 0xef, 0xf3, 0x7f, 0xe6, 0xe5, 0xea, 0x62, 0x4e, 0xca, 0xfc, 0x7e, 0x53, 0x22, 0x27,
+	0x91, 0x9d, 0x81, 0x5b, 0xeb, 0x0a, 0x45, 0x16, 0xfe, 0x35, 0xb5, 0x66, 0xc1, 0x79, 0x40, 0x69,
+	0x77, 0x44, 0xf1, 0x4e, 0x62, 0x2f, 0x61, 0x18, 0xa7, 0x22, 0xcf, 0x51, 0x85, 0x36, 0x65, 0x8d,
+	0xda, 0x62, 0x2d, 0xc7, 0x7b, 0x31, 0x3a, 0x01, 0xc7, 0x94, 0x66, 0x00, 0xee, 0xdd, 0x3d, 0xbf,
+	0xba, 0xfc, 0x30, 0xd9, 0x63, 0x01, 0x0c, 0x17, 0xef, 0x2e, 0x6f, 0x6f, 0xaf, 0x6e, 0x26, 0x56,
+	0xf4, 0xc3, 0x82, 0x61, 0xf7, 0x8a, 0x1d, 0x03, 0x94, 0xcd, 0x4a, 0xc9, 0x78, 0xf9, 0x09, 0x37,
+	0xd4, 0xe4, 0x88, 0xfb, 0x2d, 0xf3, 0x1e, 0x37, 0xec, 0x00, 0x06, 0x5a, 0x6a, 0x85, 0xd4, 0x97,
+	0xcf, 0x5b, 0xc0, 0xa6, 0x10, 0x24, 0x58, 0xc7, 0x95, 0x2c, 0xb5, 0x2c, 0x72, 0xea, 0xc6, 0xe7,
+	0xbb, 0x14, 0x3b, 0x83, 0x71, 0x5c, 0xe4, 0x5a, 0xc4, 0x7a, 0x89, 0x99, 0x90, 0x2a, 0x74, 0x28,
+	0x67, 0xd4, 0x91, 0x57, 0x86, 0x63, 0xa7, 0x30, 0x4a, 0x8b, 0x0c, 0x4b, 0xb1, 0xc6, 0x65, 0x53,
+	0xa9, 0x70, 0xd0, 0xd6, 0xe9, 0xb9, 0x87, 0x4a, 0x31, 0x06, 0x8e, 0x16, 0xeb, 0x3a, 0x74, 0xa7,
+	0xf6, 0xcc, 0xe7, 0x14, 0x9b, 0xda, 0x3a, 0x6d, 0xb2, 0x55, 0x2e, 0xa4, 0xa2, 0x77, 0x93, 0xb6,
+	0xf6, 0x96, 0x34, 0x0f, 0xff, 0x07, 0x3f, 0x2e, 0x9e, 0xb0, 0xa2, 0x84, 0x7d, 0x4a, 0xf0, 0x88,
+	0x78, 0xa8, 0x54, 0xf4, 0xdd, 0x06, 0xb7, 0x35, 0xd7, 0xfc, 0x40, 0x2a, 0xea, 0xb4, 0x9b, 0x9c,
+	0x62, 0x76, 0x04, 0x9e, 0x12, 0xf9, 0xba, 0x11, 0xeb, 0x7e, 0xee, 0x2d, 0xfe, 0x65, 0x88, 0xbd,
+	0x6b, 0xc8, 0x21, 0xb8, 0xa2, 0xd1, 0x69, 0x51, 0x75, 0x73, 0x76, 0xe8, 0x77, 0xa3, 0x06, 0xcf,
+	0x8d, 0x3a, 0x06, 0xc8, 0x30, 0x91, 0x62, 0x49, 0x47, 0xe2, 0x52, 0x82, 0x4f, 0x0c, 0xed, 0x30,
+	0x84, 0xa1, 0x92, 0x31, 0xe6, 0x35, 0x86, 0x43, 0xd2, 0x7a, 0xc8, 0x8e, 0xc1, 0x79, 0x94, 0x0a,
+	0x43, 0x8f, 0x4e, 0xc1, 0xa7, 0x53, 0xb8, 0x96, 0x0a, 0x39, 0xd1, 0xec, 0x08, 0xec, 0x47, 0x44,
+	0xb2, 0x26, 0x38, 0xf7, 0x5a, 0x15, 0x91, 0x1b, 0x92, 0x9d, 0x40, 0xd0, 0x55, 0xd9, 0x71, 0x07,
+	0x3a, 0xca, 0x98, 0xf7, 0xcc, 0x61, 0xf6, 0x07, 0x87, 0x8f, 0xc0, 0x4b, 0x9a, 0x4a, 0xd0, 0x60,
+	0xff, 0x4e, 0xad, 0xd9, 0x98, 0x6f, 0xf1, 0x76, 0x6d, 0x07, 0x3b, 0x6b, 0x3b, 0x85, 0x51, 0x85,
+	0x0a, 0x45, 0x8d, 0x4b, 0x2d, 0x33, 0x0c, 0xff, 0x9b, 0x5a, 0x33, 0x9b, 0x07, 0x1d, 0x77, 0x2f,
+	0x33, 0x73, 0x57, 0x83, 0x27, 0x99, 0x60, 0x11, 0x1e, 0x52, 0xdb, 0x40, 0x6d, 0x7f, 0x34, 0x0c,
+	0x6f, 0x85, 0xe8, 0xab, 0x05, 0xf6, 0x35, 0x22, 0x7b, 0x05, 0x5e, 0xdc, 0x54, 0x15, 0xe6, 0xf1,
+	0xa6, 0xfb, 0xb2, 0xf6, 0xfb, 0x19, 0xe7, 0x8b, 0x4e, 0xe0, 0xdb, 0x14, 0x63, 0xa3, 0x48, 0x92,
+	0x0a, 0xeb, 0x9a, 0x16, 0x3a, 0xe2, 0x3d, 0xa4, 0xcd, 0x65, 0x45, 0x93, 0x6b, 0x5a, 0xa8, 0xc3,
+	0x3b, 0x14, 0xbd, 0x00, 0xaf, 0xaf, 0xc3, 0x86, 0x60, 0xdf, 0xbc, 0x59, 0x4c, 0xf6, 0x4c, 0xf0,
+	0x70, 0xf7, 0x76, 0x62, 0x45, 0x73, 0x70, 0x8c, 0xd7, 0x66, 0xce, 0x5c, 0x64, 0xed, 0xc7, 0xed,
+	0x73, 0x8a, 0x0d, 0x57, 0xcb, 0x2f, 0xed, 0xe5, 0x38, 0x9c, 0xe2, 0xe8, 0x35, 0x0c, 0x68, 0x0c,
+	0x73, 0x3e, 0x9f, 0x65, 0xa2, 0xdb, 0x7b, 0x1b, 0xf3, 0x16, 0x98, 0x26, 0x52, 0x94, 0xeb, 0x54,
+	0xd3, 0xa3, 0x31, 0xef, 0xd0, 0xca, 0xa5, 0x7f, 0x94, 0x8b, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x81, 0x5b, 0x03, 0x64, 0x67, 0x04, 0x00, 0x00,
 }
diff --git a/v2/js/claim_pb.js b/v2/js/claim_schema_pb.js
similarity index 68%
rename from v2/js/claim_pb.js
rename to v2/js/claim_schema_pb.js
index 5ad34c0..6f05803 100644
--- a/v2/js/claim_pb.js
+++ b/v2/js/claim_schema_pb.js
@@ -11,141 +11,32 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.pb.Channel', null, global);
-goog.exportSymbol('proto.pb.Claim', null, global);
-goog.exportSymbol('proto.pb.Claim.Type', null, global);
-goog.exportSymbol('proto.pb.Fee', null, global);
-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
- * 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.Claim = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-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';
-}
+goog.exportSymbol('proto.pb3.Channel', null, global);
+goog.exportSymbol('proto.pb3.Claim', null, global);
+goog.exportSymbol('proto.pb3.Claim.Type', null, global);
+goog.exportSymbol('proto.pb3.Fee', null, global);
+goog.exportSymbol('proto.pb3.Fee.Currency', null, global);
+goog.exportSymbol('proto.pb3.File', null, global);
+goog.exportSymbol('proto.pb3.Stream', null, global);
+goog.exportSymbol('proto.pb3.Video', null, global);
 
+/**
+ * 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.pb3.Claim = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb3.Claim, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb3.Claim.displayName = 'proto.pb3.Claim';
+}
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -159,8 +50,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.pb3.Claim.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb3.Claim.toObject(opt_includeInstance, this);
 };
 
 
@@ -169,15 +60,15 @@ 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.pb3.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) {
-  var obj = {
+proto.pb3.Claim.toObject = function(includeInstance, msg) {
+  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)
+    stream: (f = msg.getStream()) && proto.pb3.Stream.toObject(includeInstance, f),
+    channel: (f = msg.getChannel()) && proto.pb3.Channel.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -191,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.pb3.Claim}
  */
-proto.pb.Claim.deserializeBinary = function(bytes) {
+proto.pb3.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.pb3.Claim;
+  return proto.pb3.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.pb3.Claim} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Claim}
+ * @return {!proto.pb3.Claim}
  */
-proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
+proto.pb3.Claim.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -215,17 +106,17 @@ proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Claim.Type} */ (reader.readEnum());
+      var value = /** @type {!proto.pb3.Claim.Type} */ (reader.readEnum());
       msg.setType(value);
       break;
     case 2:
-      var value = new proto.pb.Stream;
-      reader.readMessage(value,proto.pb.Stream.deserializeBinaryFromReader);
+      var value = new proto.pb3.Stream;
+      reader.readMessage(value,proto.pb3.Stream.deserializeBinaryFromReader);
       msg.setStream(value);
       break;
     case 3:
-      var value = new proto.pb.Channel;
-      reader.readMessage(value,proto.pb.Channel.deserializeBinaryFromReader);
+      var value = new proto.pb3.Channel;
+      reader.readMessage(value,proto.pb3.Channel.deserializeBinaryFromReader);
       msg.setChannel(value);
       break;
     default:
@@ -241,9 +132,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.pb3.Claim.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Claim.serializeBinaryToWriter(this, writer);
+  proto.pb3.Claim.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -251,11 +142,11 @@ 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.pb3.Claim} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
+proto.pb3.Claim.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getType();
   if (f !== 0.0) {
@@ -269,7 +160,7 @@ proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
     writer.writeMessage(
       2,
       f,
-      proto.pb.Stream.serializeBinaryToWriter
+      proto.pb3.Stream.serializeBinaryToWriter
     );
   }
   f = message.getChannel();
@@ -277,7 +168,7 @@ proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
     writer.writeMessage(
       3,
       f,
-      proto.pb.Channel.serializeBinaryToWriter
+      proto.pb3.Channel.serializeBinaryToWriter
     );
   }
 };
@@ -286,93 +177,111 @@ proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Claim.Type = {
+proto.pb3.Claim.Type = {
   STREAM: 0,
   CHANNEL: 1
 };
 
 /**
  * optional Type type = 1;
- * @return {!proto.pb.Claim.Type}
+ * @return {!proto.pb3.Claim.Type}
  */
-proto.pb.Claim.prototype.getType = function() {
-  return /** @type {!proto.pb.Claim.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.pb3.Claim.prototype.getType = function() {
+  return /** @type {!proto.pb3.Claim.Type} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Claim.Type} value */
-proto.pb.Claim.prototype.setType = function(value) {
+/** @param {!proto.pb3.Claim.Type} value */
+proto.pb3.Claim.prototype.setType = function(value) {
   jspb.Message.setProto3EnumField(this, 1, value);
 };
 
 
 /**
  * optional Stream stream = 2;
- * @return {?proto.pb.Stream}
+ * @return {?proto.pb3.Stream}
  */
-proto.pb.Claim.prototype.getStream = function() {
-  return /** @type{?proto.pb.Stream} */ (
-    jspb.Message.getWrapperField(this, proto.pb.Stream, 2));
+proto.pb3.Claim.prototype.getStream = function() {
+  return /** @type{?proto.pb3.Stream} */ (
+    jspb.Message.getWrapperField(this, proto.pb3.Stream, 2));
 };
 
 
-/** @param {?proto.pb.Stream|undefined} value */
-proto.pb.Claim.prototype.setStream = function(value) {
+/** @param {?proto.pb3.Stream|undefined} value */
+proto.pb3.Claim.prototype.setStream = function(value) {
   jspb.Message.setWrapperField(this, 2, value);
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
-proto.pb.Claim.prototype.clearStream = function() {
+proto.pb3.Claim.prototype.clearStream = function() {
   this.setStream(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
-proto.pb.Claim.prototype.hasStream = function() {
+proto.pb3.Claim.prototype.hasStream = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
  * optional Channel channel = 3;
- * @return {?proto.pb.Channel}
+ * @return {?proto.pb3.Channel}
  */
-proto.pb.Claim.prototype.getChannel = function() {
-  return /** @type{?proto.pb.Channel} */ (
-    jspb.Message.getWrapperField(this, proto.pb.Channel, 3));
+proto.pb3.Claim.prototype.getChannel = function() {
+  return /** @type{?proto.pb3.Channel} */ (
+    jspb.Message.getWrapperField(this, proto.pb3.Channel, 3));
 };
 
 
-/** @param {?proto.pb.Channel|undefined} value */
-proto.pb.Claim.prototype.setChannel = function(value) {
+/** @param {?proto.pb3.Channel|undefined} value */
+proto.pb3.Claim.prototype.setChannel = function(value) {
   jspb.Message.setWrapperField(this, 3, value);
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
-proto.pb.Claim.prototype.clearChannel = function() {
+proto.pb3.Claim.prototype.clearChannel = function() {
   this.setChannel(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
-proto.pb.Claim.prototype.hasChannel = function() {
+proto.pb3.Claim.prototype.hasChannel = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
 
+/**
+ * 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.pb3.Channel = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.pb3.Channel.repeatedFields_, null);
+};
+goog.inherits(proto.pb3.Channel, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb3.Channel.displayName = 'proto.pb3.Channel';
+}
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.pb3.Channel.repeatedFields_ = [6];
+
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -386,8 +295,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Channel.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Channel.toObject(opt_includeInstance, this);
+proto.pb3.Channel.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb3.Channel.toObject(opt_includeInstance, this);
 };
 
 
@@ -396,17 +305,18 @@ proto.pb.Channel.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.Channel} msg The msg instance to transform.
+ * @param {!proto.pb3.Channel} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Channel.toObject = function(includeInstance, msg) {
-  var obj = {
+proto.pb3.Channel.toObject = function(includeInstance, msg) {
+  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, "")
   };
@@ -422,23 +332,23 @@ proto.pb.Channel.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Channel}
+ * @return {!proto.pb3.Channel}
  */
-proto.pb.Channel.deserializeBinary = function(bytes) {
+proto.pb3.Channel.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Channel;
-  return proto.pb.Channel.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.pb3.Channel;
+  return proto.pb3.Channel.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Channel} msg The message object to deserialize into.
+ * @param {!proto.pb3.Channel} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Channel}
+ * @return {!proto.pb3.Channel}
  */
-proto.pb.Channel.deserializeBinaryFromReader = function(msg, reader) {
+proto.pb3.Channel.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -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);
@@ -486,9 +400,9 @@ proto.pb.Channel.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Channel.prototype.serializeBinary = function() {
+proto.pb3.Channel.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Channel.serializeBinaryToWriter(this, writer);
+  proto.pb3.Channel.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -496,11 +410,11 @@ proto.pb.Channel.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Channel} message
+ * @param {!proto.pb3.Channel} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Channel.serializeBinaryToWriter = function(message, writer) {
+proto.pb3.Channel.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getPublicKey_asU8();
   if (f.length > 0) {
@@ -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(
@@ -558,7 +479,7 @@ proto.pb.Channel.serializeBinaryToWriter = function(message, writer) {
  * optional bytes public_key = 1;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Channel.prototype.getPublicKey = function() {
+proto.pb3.Channel.prototype.getPublicKey = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
@@ -568,7 +489,7 @@ proto.pb.Channel.prototype.getPublicKey = function() {
  * This is a type-conversion wrapper around `getPublicKey()`
  * @return {string}
  */
-proto.pb.Channel.prototype.getPublicKey_asB64 = function() {
+proto.pb3.Channel.prototype.getPublicKey_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getPublicKey()));
 };
@@ -581,14 +502,14 @@ proto.pb.Channel.prototype.getPublicKey_asB64 = function() {
  * This is a type-conversion wrapper around `getPublicKey()`
  * @return {!Uint8Array}
  */
-proto.pb.Channel.prototype.getPublicKey_asU8 = function() {
+proto.pb3.Channel.prototype.getPublicKey_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getPublicKey()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Channel.prototype.setPublicKey = function(value) {
+proto.pb3.Channel.prototype.setPublicKey = function(value) {
   jspb.Message.setProto3BytesField(this, 1, value);
 };
 
@@ -597,13 +518,13 @@ proto.pb.Channel.prototype.setPublicKey = function(value) {
  * optional string title = 2;
  * @return {string}
  */
-proto.pb.Channel.prototype.getTitle = function() {
+proto.pb3.Channel.prototype.getTitle = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Channel.prototype.setTitle = function(value) {
+proto.pb3.Channel.prototype.setTitle = function(value) {
   jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -612,13 +533,13 @@ proto.pb.Channel.prototype.setTitle = function(value) {
  * optional string description = 3;
  * @return {string}
  */
-proto.pb.Channel.prototype.getDescription = function() {
+proto.pb3.Channel.prototype.getDescription = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Channel.prototype.setDescription = function(value) {
+proto.pb3.Channel.prototype.setDescription = function(value) {
   jspb.Message.setProto3StringField(this, 3, value);
 };
 
@@ -627,13 +548,13 @@ proto.pb.Channel.prototype.setDescription = function(value) {
  * optional string contact_email = 4;
  * @return {string}
  */
-proto.pb.Channel.prototype.getContactEmail = function() {
+proto.pb3.Channel.prototype.getContactEmail = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Channel.prototype.setContactEmail = function(value) {
+proto.pb3.Channel.prototype.setContactEmail = function(value) {
   jspb.Message.setProto3StringField(this, 4, value);
 };
 
@@ -642,28 +563,57 @@ proto.pb.Channel.prototype.setContactEmail = function(value) {
  * optional string homepage_url = 5;
  * @return {string}
  */
-proto.pb.Channel.prototype.getHomepageUrl = function() {
+proto.pb3.Channel.prototype.getHomepageUrl = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Channel.prototype.setHomepageUrl = function(value) {
+proto.pb3.Channel.prototype.setHomepageUrl = function(value) {
   jspb.Message.setProto3StringField(this, 5, value);
 };
 
 
+/**
+ * repeated string tags = 6;
+ * @return {!Array<string>}
+ */
+proto.pb3.Channel.prototype.getTagsList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 6));
+};
+
+
+/** @param {!Array<string>} value */
+proto.pb3.Channel.prototype.setTagsList = function(value) {
+  jspb.Message.setField(this, 6, value || []);
+};
+
+
+/**
+ * @param {!string} value
+ * @param {number=} opt_index
+ */
+proto.pb3.Channel.prototype.addTags = function(value, opt_index) {
+  jspb.Message.addToRepeatedField(this, 6, value, opt_index);
+};
+
+
+proto.pb3.Channel.prototype.clearTagsList = function() {
+  this.setTagsList([]);
+};
+
+
 /**
  * optional string thumbnail_url = 16;
  * @return {string}
  */
-proto.pb.Channel.prototype.getThumbnailUrl = function() {
+proto.pb3.Channel.prototype.getThumbnailUrl = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Channel.prototype.setThumbnailUrl = function(value) {
+proto.pb3.Channel.prototype.setThumbnailUrl = function(value) {
   jspb.Message.setProto3StringField(this, 16, value);
 };
 
@@ -672,24 +622,41 @@ proto.pb.Channel.prototype.setThumbnailUrl = function(value) {
  * optional string cover_url = 17;
  * @return {string}
  */
-proto.pb.Channel.prototype.getCoverUrl = function() {
+proto.pb3.Channel.prototype.getCoverUrl = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 17, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Channel.prototype.setCoverUrl = function(value) {
+proto.pb3.Channel.prototype.setCoverUrl = function(value) {
   jspb.Message.setProto3StringField(this, 17, 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.pb3.Stream = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.pb3.Stream.repeatedFields_, null);
+};
+goog.inherits(proto.pb3.Stream, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb3.Stream.displayName = 'proto.pb3.Stream';
+}
 /**
  * List of repeated fields within this message type.
  * @private {!Array<number>}
  * @const
  */
-proto.pb.Stream.repeatedFields_ = [20];
+proto.pb3.Stream.repeatedFields_ = [20];
 
 
 
@@ -704,8 +671,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.pb3.Stream.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb3.Stream.toObject(opt_includeInstance, this);
 };
 
 
@@ -714,12 +681,12 @@ 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.pb3.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) {
-  var obj = {
+proto.pb3.Stream.toObject = function(includeInstance, msg) {
+  var f, obj = {
     hash: msg.getHash_asB64(),
     language: jspb.Message.getFieldWithDefault(msg, 2, ""),
     title: jspb.Message.getFieldWithDefault(msg, 3, ""),
@@ -727,14 +694,14 @@ proto.pb.Stream.toObject = function(includeInstance, msg) {
     description: jspb.Message.getFieldWithDefault(msg, 5, ""),
     mediaType: jspb.Message.getFieldWithDefault(msg, 6, ""),
     license: jspb.Message.getFieldWithDefault(msg, 7, ""),
-    file: (f = msg.getFile()) && proto.pb.File.toObject(includeInstance, f),
-    fee: (f = msg.getFee()) && proto.pb.Fee.toObject(includeInstance, f),
+    file: (f = msg.getFile()) && proto.pb3.File.toObject(includeInstance, f),
+    fee: (f = msg.getFee()) && proto.pb3.Fee.toObject(includeInstance, f),
     licenseUrl: jspb.Message.getFieldWithDefault(msg, 17, ""),
     thumbnailUrl: jspb.Message.getFieldWithDefault(msg, 18, ""),
     duration: jspb.Message.getFieldWithDefault(msg, 19, 0),
     tagsList: jspb.Message.getRepeatedField(msg, 20),
     releaseTime: jspb.Message.getFieldWithDefault(msg, 21, 0),
-    video: (f = msg.getVideo()) && proto.pb.Video.toObject(includeInstance, f)
+    video: (f = msg.getVideo()) && proto.pb3.Video.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -748,23 +715,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.pb3.Stream}
  */
-proto.pb.Stream.deserializeBinary = function(bytes) {
+proto.pb3.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.pb3.Stream;
+  return proto.pb3.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.pb3.Stream} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Stream}
+ * @return {!proto.pb3.Stream}
  */
-proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
+proto.pb3.Stream.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -800,13 +767,13 @@ proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
       msg.setLicense(value);
       break;
     case 8:
-      var value = new proto.pb.File;
-      reader.readMessage(value,proto.pb.File.deserializeBinaryFromReader);
+      var value = new proto.pb3.File;
+      reader.readMessage(value,proto.pb3.File.deserializeBinaryFromReader);
       msg.setFile(value);
       break;
     case 16:
-      var value = new proto.pb.Fee;
-      reader.readMessage(value,proto.pb.Fee.deserializeBinaryFromReader);
+      var value = new proto.pb3.Fee;
+      reader.readMessage(value,proto.pb3.Fee.deserializeBinaryFromReader);
       msg.setFee(value);
       break;
     case 17:
@@ -830,8 +797,8 @@ proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
       msg.setReleaseTime(value);
       break;
     case 22:
-      var value = new proto.pb.Video;
-      reader.readMessage(value,proto.pb.Video.deserializeBinaryFromReader);
+      var value = new proto.pb3.Video;
+      reader.readMessage(value,proto.pb3.Video.deserializeBinaryFromReader);
       msg.setVideo(value);
       break;
     default:
@@ -847,9 +814,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.pb3.Stream.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Stream.serializeBinaryToWriter(this, writer);
+  proto.pb3.Stream.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -857,11 +824,11 @@ 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.pb3.Stream} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
+proto.pb3.Stream.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getHash_asU8();
   if (f.length > 0) {
@@ -917,7 +884,7 @@ proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
     writer.writeMessage(
       8,
       f,
-      proto.pb.File.serializeBinaryToWriter
+      proto.pb3.File.serializeBinaryToWriter
     );
   }
   f = message.getFee();
@@ -925,7 +892,7 @@ proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
     writer.writeMessage(
       16,
       f,
-      proto.pb.Fee.serializeBinaryToWriter
+      proto.pb3.Fee.serializeBinaryToWriter
     );
   }
   f = message.getLicenseUrl();
@@ -968,7 +935,7 @@ proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
     writer.writeMessage(
       22,
       f,
-      proto.pb.Video.serializeBinaryToWriter
+      proto.pb3.Video.serializeBinaryToWriter
     );
   }
 };
@@ -978,7 +945,7 @@ proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
  * optional bytes hash = 1;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Stream.prototype.getHash = function() {
+proto.pb3.Stream.prototype.getHash = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
@@ -988,7 +955,7 @@ proto.pb.Stream.prototype.getHash = function() {
  * This is a type-conversion wrapper around `getHash()`
  * @return {string}
  */
-proto.pb.Stream.prototype.getHash_asB64 = function() {
+proto.pb3.Stream.prototype.getHash_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getHash()));
 };
@@ -1001,14 +968,14 @@ proto.pb.Stream.prototype.getHash_asB64 = function() {
  * This is a type-conversion wrapper around `getHash()`
  * @return {!Uint8Array}
  */
-proto.pb.Stream.prototype.getHash_asU8 = function() {
+proto.pb3.Stream.prototype.getHash_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getHash()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Stream.prototype.setHash = function(value) {
+proto.pb3.Stream.prototype.setHash = function(value) {
   jspb.Message.setProto3BytesField(this, 1, value);
 };
 
@@ -1017,13 +984,13 @@ proto.pb.Stream.prototype.setHash = function(value) {
  * optional string language = 2;
  * @return {string}
  */
-proto.pb.Stream.prototype.getLanguage = function() {
+proto.pb3.Stream.prototype.getLanguage = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setLanguage = function(value) {
+proto.pb3.Stream.prototype.setLanguage = function(value) {
   jspb.Message.setProto3StringField(this, 2, value);
 };
 
@@ -1032,13 +999,13 @@ proto.pb.Stream.prototype.setLanguage = function(value) {
  * optional string title = 3;
  * @return {string}
  */
-proto.pb.Stream.prototype.getTitle = function() {
+proto.pb3.Stream.prototype.getTitle = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setTitle = function(value) {
+proto.pb3.Stream.prototype.setTitle = function(value) {
   jspb.Message.setProto3StringField(this, 3, value);
 };
 
@@ -1047,13 +1014,13 @@ proto.pb.Stream.prototype.setTitle = function(value) {
  * optional string author = 4;
  * @return {string}
  */
-proto.pb.Stream.prototype.getAuthor = function() {
+proto.pb3.Stream.prototype.getAuthor = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setAuthor = function(value) {
+proto.pb3.Stream.prototype.setAuthor = function(value) {
   jspb.Message.setProto3StringField(this, 4, value);
 };
 
@@ -1062,13 +1029,13 @@ proto.pb.Stream.prototype.setAuthor = function(value) {
  * optional string description = 5;
  * @return {string}
  */
-proto.pb.Stream.prototype.getDescription = function() {
+proto.pb3.Stream.prototype.getDescription = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setDescription = function(value) {
+proto.pb3.Stream.prototype.setDescription = function(value) {
   jspb.Message.setProto3StringField(this, 5, value);
 };
 
@@ -1077,13 +1044,13 @@ proto.pb.Stream.prototype.setDescription = function(value) {
  * optional string media_type = 6;
  * @return {string}
  */
-proto.pb.Stream.prototype.getMediaType = function() {
+proto.pb3.Stream.prototype.getMediaType = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setMediaType = function(value) {
+proto.pb3.Stream.prototype.setMediaType = function(value) {
   jspb.Message.setProto3StringField(this, 6, value);
 };
 
@@ -1092,79 +1059,73 @@ proto.pb.Stream.prototype.setMediaType = function(value) {
  * optional string license = 7;
  * @return {string}
  */
-proto.pb.Stream.prototype.getLicense = function() {
+proto.pb3.Stream.prototype.getLicense = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setLicense = function(value) {
+proto.pb3.Stream.prototype.setLicense = function(value) {
   jspb.Message.setProto3StringField(this, 7, value);
 };
 
 
 /**
  * optional File file = 8;
- * @return {?proto.pb.File}
+ * @return {?proto.pb3.File}
  */
-proto.pb.Stream.prototype.getFile = function() {
-  return /** @type{?proto.pb.File} */ (
-    jspb.Message.getWrapperField(this, proto.pb.File, 8));
+proto.pb3.Stream.prototype.getFile = function() {
+  return /** @type{?proto.pb3.File} */ (
+    jspb.Message.getWrapperField(this, proto.pb3.File, 8));
 };
 
 
-/** @param {?proto.pb.File|undefined} value */
-proto.pb.Stream.prototype.setFile = function(value) {
+/** @param {?proto.pb3.File|undefined} value */
+proto.pb3.Stream.prototype.setFile = function(value) {
   jspb.Message.setWrapperField(this, 8, value);
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
-proto.pb.Stream.prototype.clearFile = function() {
+proto.pb3.Stream.prototype.clearFile = function() {
   this.setFile(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
-proto.pb.Stream.prototype.hasFile = function() {
+proto.pb3.Stream.prototype.hasFile = function() {
   return jspb.Message.getField(this, 8) != null;
 };
 
 
 /**
  * optional Fee fee = 16;
- * @return {?proto.pb.Fee}
+ * @return {?proto.pb3.Fee}
  */
-proto.pb.Stream.prototype.getFee = function() {
-  return /** @type{?proto.pb.Fee} */ (
-    jspb.Message.getWrapperField(this, proto.pb.Fee, 16));
+proto.pb3.Stream.prototype.getFee = function() {
+  return /** @type{?proto.pb3.Fee} */ (
+    jspb.Message.getWrapperField(this, proto.pb3.Fee, 16));
 };
 
 
-/** @param {?proto.pb.Fee|undefined} value */
-proto.pb.Stream.prototype.setFee = function(value) {
+/** @param {?proto.pb3.Fee|undefined} value */
+proto.pb3.Stream.prototype.setFee = function(value) {
   jspb.Message.setWrapperField(this, 16, value);
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
-proto.pb.Stream.prototype.clearFee = function() {
+proto.pb3.Stream.prototype.clearFee = function() {
   this.setFee(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
-proto.pb.Stream.prototype.hasFee = function() {
+proto.pb3.Stream.prototype.hasFee = function() {
   return jspb.Message.getField(this, 16) != null;
 };
 
@@ -1173,13 +1134,13 @@ proto.pb.Stream.prototype.hasFee = function() {
  * optional string license_url = 17;
  * @return {string}
  */
-proto.pb.Stream.prototype.getLicenseUrl = function() {
+proto.pb3.Stream.prototype.getLicenseUrl = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 17, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setLicenseUrl = function(value) {
+proto.pb3.Stream.prototype.setLicenseUrl = function(value) {
   jspb.Message.setProto3StringField(this, 17, value);
 };
 
@@ -1188,13 +1149,13 @@ proto.pb.Stream.prototype.setLicenseUrl = function(value) {
  * optional string thumbnail_url = 18;
  * @return {string}
  */
-proto.pb.Stream.prototype.getThumbnailUrl = function() {
+proto.pb3.Stream.prototype.getThumbnailUrl = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Stream.prototype.setThumbnailUrl = function(value) {
+proto.pb3.Stream.prototype.setThumbnailUrl = function(value) {
   jspb.Message.setProto3StringField(this, 18, value);
 };
 
@@ -1203,13 +1164,13 @@ proto.pb.Stream.prototype.setThumbnailUrl = function(value) {
  * optional uint32 duration = 19;
  * @return {number}
  */
-proto.pb.Stream.prototype.getDuration = function() {
+proto.pb3.Stream.prototype.getDuration = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 19, 0));
 };
 
 
 /** @param {number} value */
-proto.pb.Stream.prototype.setDuration = function(value) {
+proto.pb3.Stream.prototype.setDuration = function(value) {
   jspb.Message.setProto3IntField(this, 19, value);
 };
 
@@ -1218,30 +1179,27 @@ proto.pb.Stream.prototype.setDuration = function(value) {
  * repeated string tags = 20;
  * @return {!Array<string>}
  */
-proto.pb.Stream.prototype.getTagsList = function() {
+proto.pb3.Stream.prototype.getTagsList = function() {
   return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 20));
 };
 
 
 /** @param {!Array<string>} value */
-proto.pb.Stream.prototype.setTagsList = function(value) {
+proto.pb3.Stream.prototype.setTagsList = function(value) {
   jspb.Message.setField(this, 20, value || []);
 };
 
 
 /**
- * @param {string} value
+ * @param {!string} value
  * @param {number=} opt_index
  */
-proto.pb.Stream.prototype.addTags = function(value, opt_index) {
+proto.pb3.Stream.prototype.addTags = function(value, opt_index) {
   jspb.Message.addToRepeatedField(this, 20, value, opt_index);
 };
 
 
-/**
- * Clears the list making it empty but non-null.
- */
-proto.pb.Stream.prototype.clearTagsList = function() {
+proto.pb3.Stream.prototype.clearTagsList = function() {
   this.setTagsList([]);
 };
 
@@ -1250,51 +1208,65 @@ proto.pb.Stream.prototype.clearTagsList = function() {
  * optional int64 release_time = 21;
  * @return {number}
  */
-proto.pb.Stream.prototype.getReleaseTime = function() {
+proto.pb3.Stream.prototype.getReleaseTime = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
 };
 
 
 /** @param {number} value */
-proto.pb.Stream.prototype.setReleaseTime = function(value) {
+proto.pb3.Stream.prototype.setReleaseTime = function(value) {
   jspb.Message.setProto3IntField(this, 21, value);
 };
 
 
 /**
  * optional Video video = 22;
- * @return {?proto.pb.Video}
+ * @return {?proto.pb3.Video}
  */
-proto.pb.Stream.prototype.getVideo = function() {
-  return /** @type{?proto.pb.Video} */ (
-    jspb.Message.getWrapperField(this, proto.pb.Video, 22));
+proto.pb3.Stream.prototype.getVideo = function() {
+  return /** @type{?proto.pb3.Video} */ (
+    jspb.Message.getWrapperField(this, proto.pb3.Video, 22));
 };
 
 
-/** @param {?proto.pb.Video|undefined} value */
-proto.pb.Stream.prototype.setVideo = function(value) {
+/** @param {?proto.pb3.Video|undefined} value */
+proto.pb3.Stream.prototype.setVideo = function(value) {
   jspb.Message.setWrapperField(this, 22, value);
 };
 
 
-/**
- * Clears the message field making it undefined.
- */
-proto.pb.Stream.prototype.clearVideo = function() {
+proto.pb3.Stream.prototype.clearVideo = function() {
   this.setVideo(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {boolean}
+ * @return {!boolean}
  */
-proto.pb.Stream.prototype.hasVideo = function() {
+proto.pb3.Stream.prototype.hasVideo = function() {
   return jspb.Message.getField(this, 22) != null;
 };
 
 
 
+/**
+ * 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.pb3.Fee = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb3.Fee, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb3.Fee.displayName = 'proto.pb3.Fee';
+}
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1308,8 +1280,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.pb3.Fee.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb3.Fee.toObject(opt_includeInstance, this);
 };
 
 
@@ -1318,12 +1290,12 @@ 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.pb3.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) {
-  var obj = {
+proto.pb3.Fee.toObject = function(includeInstance, msg) {
+  var f, obj = {
     currency: jspb.Message.getFieldWithDefault(msg, 1, 0),
     address: msg.getAddress_asB64(),
     amount: jspb.Message.getFieldWithDefault(msg, 3, 0)
@@ -1340,23 +1312,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.pb3.Fee}
  */
-proto.pb.Fee.deserializeBinary = function(bytes) {
+proto.pb3.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.pb3.Fee;
+  return proto.pb3.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.pb3.Fee} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Fee}
+ * @return {!proto.pb3.Fee}
  */
-proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
+proto.pb3.Fee.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1364,7 +1336,7 @@ proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Fee.Currency} */ (reader.readEnum());
+      var value = /** @type {!proto.pb3.Fee.Currency} */ (reader.readEnum());
       msg.setCurrency(value);
       break;
     case 2:
@@ -1388,9 +1360,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.pb3.Fee.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Fee.serializeBinaryToWriter(this, writer);
+  proto.pb3.Fee.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -1398,11 +1370,11 @@ 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.pb3.Fee} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Fee.serializeBinaryToWriter = function(message, writer) {
+proto.pb3.Fee.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getCurrency();
   if (f !== 0.0) {
@@ -1431,22 +1403,22 @@ proto.pb.Fee.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Fee.Currency = {
+proto.pb3.Fee.Currency = {
   LBC: 0,
   USD: 1
 };
 
 /**
  * optional Currency currency = 1;
- * @return {!proto.pb.Fee.Currency}
+ * @return {!proto.pb3.Fee.Currency}
  */
-proto.pb.Fee.prototype.getCurrency = function() {
-  return /** @type {!proto.pb.Fee.Currency} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.pb3.Fee.prototype.getCurrency = function() {
+  return /** @type {!proto.pb3.Fee.Currency} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Fee.Currency} value */
-proto.pb.Fee.prototype.setCurrency = function(value) {
+/** @param {!proto.pb3.Fee.Currency} value */
+proto.pb3.Fee.prototype.setCurrency = function(value) {
   jspb.Message.setProto3EnumField(this, 1, value);
 };
 
@@ -1455,7 +1427,7 @@ proto.pb.Fee.prototype.setCurrency = function(value) {
  * optional bytes address = 2;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Fee.prototype.getAddress = function() {
+proto.pb3.Fee.prototype.getAddress = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
@@ -1465,7 +1437,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.pb3.Fee.prototype.getAddress_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getAddress()));
 };
@@ -1478,14 +1450,14 @@ 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.pb3.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.pb3.Fee.prototype.setAddress = function(value) {
   jspb.Message.setProto3BytesField(this, 2, value);
 };
 
@@ -1494,18 +1466,35 @@ proto.pb.Fee.prototype.setAddress = function(value) {
  * optional uint64 amount = 3;
  * @return {number}
  */
-proto.pb.Fee.prototype.getAmount = function() {
+proto.pb3.Fee.prototype.getAmount = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
 
 /** @param {number} value */
-proto.pb.Fee.prototype.setAmount = function(value) {
+proto.pb3.Fee.prototype.setAmount = function(value) {
   jspb.Message.setProto3IntField(this, 3, 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.pb3.File = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb3.File, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb3.File.displayName = 'proto.pb3.File';
+}
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1519,8 +1508,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.File.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.File.toObject(opt_includeInstance, this);
+proto.pb3.File.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb3.File.toObject(opt_includeInstance, this);
 };
 
 
@@ -1529,12 +1518,12 @@ proto.pb.File.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.File} msg The msg instance to transform.
+ * @param {!proto.pb3.File} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.File.toObject = function(includeInstance, msg) {
-  var obj = {
+proto.pb3.File.toObject = function(includeInstance, msg) {
+  var f, obj = {
     name: jspb.Message.getFieldWithDefault(msg, 1, ""),
     size: jspb.Message.getFieldWithDefault(msg, 2, 0)
   };
@@ -1550,23 +1539,23 @@ proto.pb.File.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.File}
+ * @return {!proto.pb3.File}
  */
-proto.pb.File.deserializeBinary = function(bytes) {
+proto.pb3.File.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.File;
-  return proto.pb.File.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.pb3.File;
+  return proto.pb3.File.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.File} msg The message object to deserialize into.
+ * @param {!proto.pb3.File} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.File}
+ * @return {!proto.pb3.File}
  */
-proto.pb.File.deserializeBinaryFromReader = function(msg, reader) {
+proto.pb3.File.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1594,9 +1583,9 @@ proto.pb.File.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.File.prototype.serializeBinary = function() {
+proto.pb3.File.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.File.serializeBinaryToWriter(this, writer);
+  proto.pb3.File.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -1604,11 +1593,11 @@ proto.pb.File.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.File} message
+ * @param {!proto.pb3.File} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.File.serializeBinaryToWriter = function(message, writer) {
+proto.pb3.File.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getName();
   if (f.length > 0) {
@@ -1631,13 +1620,13 @@ proto.pb.File.serializeBinaryToWriter = function(message, writer) {
  * optional string name = 1;
  * @return {string}
  */
-proto.pb.File.prototype.getName = function() {
+proto.pb3.File.prototype.getName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.File.prototype.setName = function(value) {
+proto.pb3.File.prototype.setName = function(value) {
   jspb.Message.setProto3StringField(this, 1, value);
 };
 
@@ -1646,18 +1635,35 @@ proto.pb.File.prototype.setName = function(value) {
  * optional uint64 size = 2;
  * @return {number}
  */
-proto.pb.File.prototype.getSize = function() {
+proto.pb3.File.prototype.getSize = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
 /** @param {number} value */
-proto.pb.File.prototype.setSize = function(value) {
+proto.pb3.File.prototype.setSize = function(value) {
   jspb.Message.setProto3IntField(this, 2, 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.pb3.Video = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb3.Video, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  proto.pb3.Video.displayName = 'proto.pb3.Video';
+}
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -1671,8 +1677,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Video.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Video.toObject(opt_includeInstance, this);
+proto.pb3.Video.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb3.Video.toObject(opt_includeInstance, this);
 };
 
 
@@ -1681,12 +1687,12 @@ proto.pb.Video.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.Video} msg The msg instance to transform.
+ * @param {!proto.pb3.Video} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Video.toObject = function(includeInstance, msg) {
-  var obj = {
+proto.pb3.Video.toObject = function(includeInstance, msg) {
+  var f, obj = {
     width: jspb.Message.getFieldWithDefault(msg, 1, 0),
     height: jspb.Message.getFieldWithDefault(msg, 2, 0)
   };
@@ -1702,23 +1708,23 @@ proto.pb.Video.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Video}
+ * @return {!proto.pb3.Video}
  */
-proto.pb.Video.deserializeBinary = function(bytes) {
+proto.pb3.Video.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Video;
-  return proto.pb.Video.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.pb3.Video;
+  return proto.pb3.Video.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Video} msg The message object to deserialize into.
+ * @param {!proto.pb3.Video} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Video}
+ * @return {!proto.pb3.Video}
  */
-proto.pb.Video.deserializeBinaryFromReader = function(msg, reader) {
+proto.pb3.Video.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -1746,9 +1752,9 @@ proto.pb.Video.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Video.prototype.serializeBinary = function() {
+proto.pb3.Video.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Video.serializeBinaryToWriter(this, writer);
+  proto.pb3.Video.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -1756,11 +1762,11 @@ proto.pb.Video.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Video} message
+ * @param {!proto.pb3.Video} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Video.serializeBinaryToWriter = function(message, writer) {
+proto.pb3.Video.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getWidth();
   if (f !== 0) {
@@ -1783,13 +1789,13 @@ proto.pb.Video.serializeBinaryToWriter = function(message, writer) {
  * optional uint32 width = 1;
  * @return {number}
  */
-proto.pb.Video.prototype.getWidth = function() {
+proto.pb3.Video.prototype.getWidth = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
 /** @param {number} value */
-proto.pb.Video.prototype.setWidth = function(value) {
+proto.pb3.Video.prototype.setWidth = function(value) {
   jspb.Message.setProto3IntField(this, 1, value);
 };
 
@@ -1798,15 +1804,15 @@ proto.pb.Video.prototype.setWidth = function(value) {
  * optional uint32 height = 2;
  * @return {number}
  */
-proto.pb.Video.prototype.getHeight = function() {
+proto.pb3.Video.prototype.getHeight = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
 /** @param {number} value */
-proto.pb.Video.prototype.setHeight = function(value) {
+proto.pb3.Video.prototype.setHeight = function(value) {
   jspb.Message.setProto3IntField(this, 2, value);
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.pb3);
diff --git a/v2/python/claim_pb2.py b/v2/python/claim_schema_pb2.py
similarity index 73%
rename from v2/python/claim_pb2.py
rename to v2/python/claim_schema_pb2.py
index 402b84c..e8b90d6 100644
--- a/v2/python/claim_pb2.py
+++ b/v2/python/claim_schema_pb2.py
@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: claim.proto
+# source: claim_schema.proto
 
 import sys
 _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
@@ -16,18 +15,18 @@ _sym_db = _symbol_database.Default()
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
-  name='claim.proto',
-  package='pb',
+  name='claim_schema.proto',
+  package='pb3',
   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\x12\x63laim_schema.proto\x12\x03pb3\"\x83\x01\n\x05\x43laim\x12\x1d\n\x04type\x18\x01 \x01(\x0e\x32\x0f.pb3.Claim.Type\x12\x1b\n\x06stream\x18\x02 \x01(\x0b\x32\x0b.pb3.Stream\x12\x1d\n\x07\x63hannel\x18\x03 \x01(\x0b\x32\x0c.pb3.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\"\xae\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\x17\n\x04\x66ile\x18\x08 \x01(\x0b\x32\t.pb3.File\x12\x15\n\x03\x66\x65\x65\x18\x10 \x01(\x0b\x32\x08.pb3.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\x19\n\x05video\x18\x16 \x01(\x0b\x32\n.pb3.Video\"i\n\x03\x46\x65\x65\x12#\n\x08\x63urrency\x18\x01 \x01(\x0e\x32\x11.pb3.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')
 )
 
 
 
 _CLAIM_TYPE = _descriptor.EnumDescriptor(
   name='Type',
-  full_name='pb.Claim.Type',
+  full_name='pb3.Claim.Type',
   filename=None,
   file=DESCRIPTOR,
   values=[
@@ -42,14 +41,14 @@ _CLAIM_TYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=117,
-  serialized_end=148,
+  serialized_start=128,
+  serialized_end=159,
 )
 _sym_db.RegisterEnumDescriptor(_CLAIM_TYPE)
 
 _FEE_CURRENCY = _descriptor.EnumDescriptor(
   name='Currency',
-  full_name='pb.Fee.Currency',
+  full_name='pb3.Fee.Currency',
   filename=None,
   file=DESCRIPTOR,
   values=[
@@ -64,35 +63,35 @@ _FEE_CURRENCY = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   serialized_options=None,
-  serialized_start=683,
-  serialized_end=711,
+  serialized_start=712,
+  serialized_end=740,
 )
 _sym_db.RegisterEnumDescriptor(_FEE_CURRENCY)
 
 
 _CLAIM = _descriptor.Descriptor(
   name='Claim',
-  full_name='pb.Claim',
+  full_name='pb3.Claim',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='type', full_name='pb.Claim.type', index=0,
+      name='type', full_name='pb3.Claim.type', index=0,
       number=1, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='stream', full_name='pb.Claim.stream', index=1,
+      name='stream', full_name='pb3.Claim.stream', index=1,
       number=2, 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,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='channel', full_name='pb.Claim.channel', index=2,
+      name='channel', full_name='pb3.Claim.channel', 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,
@@ -111,62 +110,69 @@ _CLAIM = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=20,
-  serialized_end=148,
+  serialized_start=28,
+  serialized_end=159,
 )
 
 
 _CHANNEL = _descriptor.Descriptor(
   name='Channel',
-  full_name='pb.Channel',
+  full_name='pb3.Channel',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='public_key', full_name='pb.Channel.public_key', index=0,
+      name='public_key', full_name='pb3.Channel.public_key', index=0,
       number=1, type=12, cpp_type=9, label=1,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='title', full_name='pb.Channel.title', index=1,
+      name='title', full_name='pb3.Channel.title', index=1,
       number=2, 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='description', full_name='pb.Channel.description', index=2,
+      name='description', full_name='pb3.Channel.description', index=2,
       number=3, 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='contact_email', full_name='pb.Channel.contact_email', index=3,
+      name='contact_email', full_name='pb3.Channel.contact_email', index=3,
       number=4, 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='homepage_url', full_name='pb.Channel.homepage_url', index=4,
+      name='homepage_url', full_name='pb3.Channel.homepage_url', index=4,
       number=5, 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='thumbnail_url', full_name='pb.Channel.thumbnail_url', index=5,
+      name='tags', full_name='pb3.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='pb3.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='pb3.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,
@@ -184,118 +190,118 @@ _CHANNEL = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=151,
-  serialized_end=303,
+  serialized_start=162,
+  serialized_end=328,
 )
 
 
 _STREAM = _descriptor.Descriptor(
   name='Stream',
-  full_name='pb.Stream',
+  full_name='pb3.Stream',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='hash', full_name='pb.Stream.hash', index=0,
+      name='hash', full_name='pb3.Stream.hash', index=0,
       number=1, type=12, cpp_type=9, label=1,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='language', full_name='pb.Stream.language', index=1,
+      name='language', full_name='pb3.Stream.language', index=1,
       number=2, 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='title', full_name='pb.Stream.title', index=2,
+      name='title', full_name='pb3.Stream.title', index=2,
       number=3, 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='author', full_name='pb.Stream.author', index=3,
+      name='author', full_name='pb3.Stream.author', index=3,
       number=4, 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='description', full_name='pb.Stream.description', index=4,
+      name='description', full_name='pb3.Stream.description', index=4,
       number=5, 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='media_type', full_name='pb.Stream.media_type', index=5,
+      name='media_type', full_name='pb3.Stream.media_type', index=5,
       number=6, 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='license', full_name='pb.Stream.license', index=6,
+      name='license', full_name='pb3.Stream.license', index=6,
       number=7, 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='file', full_name='pb.Stream.file', index=7,
+      name='file', full_name='pb3.Stream.file', 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,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='fee', full_name='pb.Stream.fee', index=8,
+      name='fee', full_name='pb3.Stream.fee', index=8,
       number=16, 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,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='license_url', full_name='pb.Stream.license_url', index=9,
+      name='license_url', full_name='pb3.Stream.license_url', index=9,
       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,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='thumbnail_url', full_name='pb.Stream.thumbnail_url', index=10,
+      name='thumbnail_url', full_name='pb3.Stream.thumbnail_url', index=10,
       number=18, 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='duration', full_name='pb.Stream.duration', index=11,
+      name='duration', full_name='pb3.Stream.duration', index=11,
       number=19, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='tags', full_name='pb.Stream.tags', index=12,
+      name='tags', full_name='pb3.Stream.tags', index=12,
       number=20, 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='release_time', full_name='pb.Stream.release_time', index=13,
+      name='release_time', full_name='pb3.Stream.release_time', index=13,
       number=21, type=3, cpp_type=2, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='video', full_name='pb.Stream.video', index=14,
+      name='video', full_name='pb3.Stream.video', index=14,
       number=22, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
@@ -313,34 +319,34 @@ _STREAM = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=306,
-  serialized_end=605,
+  serialized_start=331,
+  serialized_end=633,
 )
 
 
 _FEE = _descriptor.Descriptor(
   name='Fee',
-  full_name='pb.Fee',
+  full_name='pb3.Fee',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='currency', full_name='pb.Fee.currency', index=0,
+      name='currency', full_name='pb3.Fee.currency', index=0,
       number=1, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='address', full_name='pb.Fee.address', index=1,
+      name='address', full_name='pb3.Fee.address', index=1,
       number=2, type=12, cpp_type=9, label=1,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='amount', full_name='pb.Fee.amount', index=2,
+      name='amount', full_name='pb3.Fee.amount', index=2,
       number=3, type=4, cpp_type=4, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
@@ -359,27 +365,27 @@ _FEE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=607,
-  serialized_end=711,
+  serialized_start=635,
+  serialized_end=740,
 )
 
 
 _FILE = _descriptor.Descriptor(
   name='File',
-  full_name='pb.File',
+  full_name='pb3.File',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='name', full_name='pb.File.name', index=0,
+      name='name', full_name='pb3.File.name', index=0,
       number=1, 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='size', full_name='pb.File.size', index=1,
+      name='size', full_name='pb3.File.size', index=1,
       number=2, type=4, cpp_type=4, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
@@ -397,27 +403,27 @@ _FILE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=713,
-  serialized_end=747,
+  serialized_start=742,
+  serialized_end=776,
 )
 
 
 _VIDEO = _descriptor.Descriptor(
   name='Video',
-  full_name='pb.Video',
+  full_name='pb3.Video',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='width', full_name='pb.Video.width', index=0,
+      name='width', full_name='pb3.Video.width', index=0,
       number=1, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='height', full_name='pb.Video.height', index=1,
+      name='height', full_name='pb3.Video.height', index=1,
       number=2, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
@@ -435,8 +441,8 @@ _VIDEO = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=749,
-  serialized_end=787,
+  serialized_start=778,
+  serialized_end=816,
 )
 
 _CLAIM.fields_by_name['type'].enum_type = _CLAIM_TYPE
@@ -458,43 +464,43 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 Claim = _reflection.GeneratedProtocolMessageType('Claim', (_message.Message,), dict(
   DESCRIPTOR = _CLAIM,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Claim)
+  __module__ = 'claim_schema_pb2'
+  # @@protoc_insertion_point(class_scope:pb3.Claim)
   ))
 _sym_db.RegisterMessage(Claim)
 
 Channel = _reflection.GeneratedProtocolMessageType('Channel', (_message.Message,), dict(
   DESCRIPTOR = _CHANNEL,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Channel)
+  __module__ = 'claim_schema_pb2'
+  # @@protoc_insertion_point(class_scope:pb3.Channel)
   ))
 _sym_db.RegisterMessage(Channel)
 
 Stream = _reflection.GeneratedProtocolMessageType('Stream', (_message.Message,), dict(
   DESCRIPTOR = _STREAM,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Stream)
+  __module__ = 'claim_schema_pb2'
+  # @@protoc_insertion_point(class_scope:pb3.Stream)
   ))
 _sym_db.RegisterMessage(Stream)
 
 Fee = _reflection.GeneratedProtocolMessageType('Fee', (_message.Message,), dict(
   DESCRIPTOR = _FEE,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Fee)
+  __module__ = 'claim_schema_pb2'
+  # @@protoc_insertion_point(class_scope:pb3.Fee)
   ))
 _sym_db.RegisterMessage(Fee)
 
 File = _reflection.GeneratedProtocolMessageType('File', (_message.Message,), dict(
   DESCRIPTOR = _FILE,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.File)
+  __module__ = 'claim_schema_pb2'
+  # @@protoc_insertion_point(class_scope:pb3.File)
   ))
 _sym_db.RegisterMessage(File)
 
 Video = _reflection.GeneratedProtocolMessageType('Video', (_message.Message,), dict(
   DESCRIPTOR = _VIDEO,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Video)
+  __module__ = 'claim_schema_pb2'
+  # @@protoc_insertion_point(class_scope:pb3.Video)
   ))
 _sym_db.RegisterMessage(Video)