Core/Bnet: Updated protobuf messages and services

66 files changed, 9537 insertions, 7280 deletions

diff --git a/src/server/proto/Client/account_service.pb.cc b/src/server/proto/Client/account_service.pb.cc
index e86b507a604..3524253f680 100644
--- a/src/server/proto/Client/account_service.pb.cc
+++ b/src/server/proto/Client/account_service.pb.cc
@@ -42,9 +42,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* SubscriptionUpdateResponse_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   SubscriptionUpdateResponse_reflection_ = NULL;
-const ::google::protobuf::Descriptor* IsIgrAddressRequest_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  IsIgrAddressRequest_reflection_ = NULL;
 const ::google::protobuf::Descriptor* GetAccountStateRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   GetAccountStateRequest_reflection_ = NULL;
@@ -195,23 +192,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SubscriptionUpdateResponse));
-  IsIgrAddressRequest_descriptor_ = file->message_type(5);
-  static const int IsIgrAddressRequest_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IsIgrAddressRequest, client_address_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IsIgrAddressRequest, region_),
-  };
-  IsIgrAddressRequest_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      IsIgrAddressRequest_descriptor_,
-      IsIgrAddressRequest::default_instance_,
-      IsIgrAddressRequest_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IsIgrAddressRequest, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IsIgrAddressRequest, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(IsIgrAddressRequest));
-  GetAccountStateRequest_descriptor_ = file->message_type(6);
+  GetAccountStateRequest_descriptor_ = file->message_type(5);
   static const int GetAccountStateRequest_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAccountStateRequest, entity_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAccountStateRequest, program_),
@@ -230,7 +211,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetAccountStateRequest));
-  GetAccountStateResponse_descriptor_ = file->message_type(7);
+  GetAccountStateResponse_descriptor_ = file->message_type(6);
   static const int GetAccountStateResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAccountStateResponse, state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAccountStateResponse, tags_),
@@ -246,7 +227,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetAccountStateResponse));
-  GetSignedAccountStateRequest_descriptor_ = file->message_type(8);
+  GetSignedAccountStateRequest_descriptor_ = file->message_type(7);
   static const int GetSignedAccountStateRequest_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSignedAccountStateRequest, account_),
   };
@@ -261,7 +242,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetSignedAccountStateRequest));
-  GetSignedAccountStateResponse_descriptor_ = file->message_type(9);
+  GetSignedAccountStateResponse_descriptor_ = file->message_type(8);
   static const int GetSignedAccountStateResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSignedAccountStateResponse, token_),
   };
@@ -276,7 +257,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetSignedAccountStateResponse));
-  GetGameAccountStateRequest_descriptor_ = file->message_type(10);
+  GetGameAccountStateRequest_descriptor_ = file->message_type(9);
   static const int GetGameAccountStateRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameAccountStateRequest, account_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameAccountStateRequest, game_account_id_),
@@ -294,7 +275,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetGameAccountStateRequest));
-  GetGameAccountStateResponse_descriptor_ = file->message_type(11);
+  GetGameAccountStateResponse_descriptor_ = file->message_type(10);
   static const int GetGameAccountStateResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameAccountStateResponse, state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameAccountStateResponse, tags_),
@@ -310,7 +291,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetGameAccountStateResponse));
-  GetLicensesRequest_descriptor_ = file->message_type(12);
+  GetLicensesRequest_descriptor_ = file->message_type(11);
   static const int GetLicensesRequest_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetLicensesRequest, target_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetLicensesRequest, fetch_account_licenses_),
@@ -330,7 +311,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetLicensesRequest));
-  GetLicensesResponse_descriptor_ = file->message_type(13);
+  GetLicensesResponse_descriptor_ = file->message_type(12);
   static const int GetLicensesResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetLicensesResponse, licenses_),
   };
@@ -345,7 +326,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetLicensesResponse));
-  GetGameSessionInfoRequest_descriptor_ = file->message_type(14);
+  GetGameSessionInfoRequest_descriptor_ = file->message_type(13);
   static const int GetGameSessionInfoRequest_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameSessionInfoRequest, entity_id_),
   };
@@ -360,7 +341,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetGameSessionInfoRequest));
-  GetGameSessionInfoResponse_descriptor_ = file->message_type(15);
+  GetGameSessionInfoResponse_descriptor_ = file->message_type(14);
   static const int GetGameSessionInfoResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameSessionInfoResponse, session_info_),
   };
@@ -375,10 +356,11 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetGameSessionInfoResponse));
-  GetGameTimeRemainingInfoRequest_descriptor_ = file->message_type(16);
-  static const int GetGameTimeRemainingInfoRequest_offsets_[2] = {
+  GetGameTimeRemainingInfoRequest_descriptor_ = file->message_type(15);
+  static const int GetGameTimeRemainingInfoRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameTimeRemainingInfoRequest, game_account_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameTimeRemainingInfoRequest, account_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameTimeRemainingInfoRequest, benefactor_id_),
   };
   GetGameTimeRemainingInfoRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -391,7 +373,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetGameTimeRemainingInfoRequest));
-  GetGameTimeRemainingInfoResponse_descriptor_ = file->message_type(17);
+  GetGameTimeRemainingInfoResponse_descriptor_ = file->message_type(16);
   static const int GetGameTimeRemainingInfoResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetGameTimeRemainingInfoResponse, game_time_remaining_info_),
   };
@@ -406,7 +388,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetGameTimeRemainingInfoResponse));
-  GetCAISInfoRequest_descriptor_ = file->message_type(18);
+  GetCAISInfoRequest_descriptor_ = file->message_type(17);
   static const int GetCAISInfoRequest_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetCAISInfoRequest, entity_id_),
   };
@@ -421,7 +403,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetCAISInfoRequest));
-  GetCAISInfoResponse_descriptor_ = file->message_type(19);
+  GetCAISInfoResponse_descriptor_ = file->message_type(18);
   static const int GetCAISInfoResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetCAISInfoResponse, cais_info_),
   };
@@ -436,7 +418,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetCAISInfoResponse));
-  GetAuthorizedDataRequest_descriptor_ = file->message_type(20);
+  GetAuthorizedDataRequest_descriptor_ = file->message_type(19);
   static const int GetAuthorizedDataRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAuthorizedDataRequest, entity_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAuthorizedDataRequest, tag_),
@@ -453,7 +435,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetAuthorizedDataRequest));
-  GetAuthorizedDataResponse_descriptor_ = file->message_type(21);
+  GetAuthorizedDataResponse_descriptor_ = file->message_type(20);
   static const int GetAuthorizedDataResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAuthorizedDataResponse, data_),
   };
@@ -468,7 +450,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetAuthorizedDataResponse));
-  AccountStateNotification_descriptor_ = file->message_type(22);
+  AccountStateNotification_descriptor_ = file->message_type(21);
   static const int AccountStateNotification_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountStateNotification, account_state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountStateNotification, subscriber_id_),
@@ -486,7 +468,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AccountStateNotification));
-  GameAccountStateNotification_descriptor_ = file->message_type(23);
+  GameAccountStateNotification_descriptor_ = file->message_type(22);
   static const int GameAccountStateNotification_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountStateNotification, game_account_state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountStateNotification, subscriber_id_),
@@ -504,7 +486,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountStateNotification));
-  GameAccountNotification_descriptor_ = file->message_type(24);
+  GameAccountNotification_descriptor_ = file->message_type(23);
   static const int GameAccountNotification_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountNotification, game_accounts_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountNotification, subscriber_id_),
@@ -521,7 +503,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountNotification));
-  GameAccountSessionNotification_descriptor_ = file->message_type(25);
+  GameAccountSessionNotification_descriptor_ = file->message_type(24);
   static const int GameAccountSessionNotification_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountSessionNotification, game_account_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountSessionNotification, session_info_),
@@ -562,8 +544,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     SubscriptionUpdateResponse_descriptor_, &SubscriptionUpdateResponse::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    IsIgrAddressRequest_descriptor_, &IsIgrAddressRequest::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GetAccountStateRequest_descriptor_, &GetAccountStateRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GetAccountStateResponse_descriptor_, &GetAccountStateResponse::default_instance());
@@ -618,8 +598,6 @@ void protobuf_ShutdownFile_account_5fservice_2eproto() {
   delete SubscriptionUpdateRequest_reflection_;
   delete SubscriptionUpdateResponse::default_instance_;
   delete SubscriptionUpdateResponse_reflection_;
-  delete IsIgrAddressRequest::default_instance_;
-  delete IsIgrAddressRequest_reflection_;
   delete GetAccountStateRequest::default_instance_;
   delete GetAccountStateRequest_reflection_;
   delete GetAccountStateResponse::default_instance_;
@@ -675,9 +653,9 @@ void protobuf_AddDesc_account_5fservice_2eproto() {
     "\n\025account_service.proto\022\027bgs.protocol.ac"
     "count.v1\032\023account_types.proto\032\022entity_ty"
     "pes.proto\032\017rpc_types.proto\"i\n\025ResolveAcc"
-    "ountRequest\0226\n\003ref\030\001 \001(\0132).bgs.protocol."
-    "account.v1.AccountReference\022\020\n\010fetch_id\030"
-    "\014 \001(\010:\006\202\371+\002\010\001\"H\n\026ResolveAccountResponse\022"
+    "ountRequest\022>\n\003ref\030\001 \001(\0132).bgs.protocol."
+    "account.v1.AccountReferenceB\006\202\371+\002\020\001\022\020\n\010f"
+    "etch_id\030\014 \001(\010\"H\n\026ResolveAccountResponse\022"
     ".\n\002id\030\014 \001(\0132\".bgs.protocol.account.v1.Ac"
     "countId\"~\n\034GameAccountFlagUpdateRequest\022"
     "@\n\014game_account\030\001 \001(\0132*.bgs.protocol.acc"
@@ -686,131 +664,129 @@ void protobuf_AddDesc_account_5fservice_2eproto() {
     "uest\0229\n\003ref\030\002 \003(\0132,.bgs.protocol.account"
     ".v1.SubscriberReference\"W\n\032SubscriptionU"
     "pdateResponse\0229\n\003ref\030\001 \003(\0132,.bgs.protoco"
-    "l.account.v1.SubscriberReference\"=\n\023IsIg"
-    "rAddressRequest\022\026\n\016client_address\030\001 \001(\t\022"
-    "\016\n\006region\030\002 \001(\r\"\344\001\n\026GetAccountStateReque"
-    "st\0221\n\tentity_id\030\001 \001(\0132\026.bgs.protocol.Ent"
-    "ityIdB\006\202\371+\002\020\001\022\017\n\007program\030\002 \001(\r\022\016\n\006region"
-    "\030\003 \001(\r\022=\n\007options\030\n \001(\0132,.bgs.protocol.a"
-    "ccount.v1.AccountFieldOptions\0227\n\004tags\030\013 "
-    "\001(\0132).bgs.protocol.account.v1.AccountFie"
-    "ldTags\"\210\001\n\027GetAccountStateResponse\0224\n\005st"
-    "ate\030\001 \001(\0132%.bgs.protocol.account.v1.Acco"
-    "untState\0227\n\004tags\030\002 \001(\0132).bgs.protocol.ac"
-    "count.v1.AccountFieldTags\"S\n\034GetSignedAc"
-    "countStateRequest\0223\n\007account\030\001 \001(\0132\".bgs"
-    ".protocol.account.v1.AccountId\".\n\035GetSig"
-    "nedAccountStateResponse\022\r\n\005token\030\001 \001(\t\"\375"
-    "\001\n\032GetGameAccountStateRequest\022.\n\naccount"
-    "_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\002\030\001\022/\n"
-    "\017game_account_id\030\002 \001(\0132\026.bgs.protocol.En"
-    "tityId\022A\n\007options\030\n \001(\01320.bgs.protocol.a"
-    "ccount.v1.GameAccountFieldOptions\022;\n\004tag"
-    "s\030\013 \001(\0132-.bgs.protocol.account.v1.GameAc"
-    "countFieldTags\"\224\001\n\033GetGameAccountStateRe"
-    "sponse\0228\n\005state\030\001 \001(\0132).bgs.protocol.acc"
-    "ount.v1.GameAccountState\022;\n\004tags\030\002 \001(\0132-"
-    ".bgs.protocol.account.v1.GameAccountFiel"
-    "dTags\"\355\001\n\022GetLicensesRequest\0221\n\ttarget_i"
-    "d\030\001 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371+\002\020\001\022"
-    "\036\n\026fetch_account_licenses\030\002 \001(\010\022#\n\033fetch"
-    "_game_account_licenses\030\003 \001(\010\022&\n\036fetch_dy"
-    "namic_account_licenses\030\004 \001(\010\022\017\n\007program\030"
-    "\005 \001(\007\022&\n\027exclude_unknown_program\030\006 \001(\010:\005"
-    "false\"P\n\023GetLicensesResponse\0229\n\010licenses"
-    "\030\001 \003(\0132\'.bgs.protocol.account.v1.Account"
-    "License\"F\n\031GetGameSessionInfoRequest\022)\n\t"
-    "entity_id\030\001 \001(\0132\026.bgs.protocol.EntityId\""
-    "\\\n\032GetGameSessionInfoResponse\022>\n\014session"
-    "_info\030\002 \001(\0132(.bgs.protocol.account.v1.Ga"
-    "meSessionInfo\"~\n\037GetGameTimeRemainingInf"
-    "oRequest\022/\n\017game_account_id\030\001 \001(\0132\026.bgs."
-    "protocol.EntityId\022*\n\naccount_id\030\002 \001(\0132\026."
-    "bgs.protocol.EntityId\"t\n GetGameTimeRema"
-    "iningInfoResponse\022P\n\030game_time_remaining"
-    "_info\030\001 \001(\0132..bgs.protocol.account.v1.Ga"
-    "meTimeRemainingInfo\"\?\n\022GetCAISInfoReques"
-    "t\022)\n\tentity_id\030\001 \001(\0132\026.bgs.protocol.Enti"
-    "tyId\"G\n\023GetCAISInfoResponse\0220\n\tcais_info"
-    "\030\001 \001(\0132\035.bgs.protocol.account.v1.CAIS\"n\n"
-    "\030GetAuthorizedDataRequest\022)\n\tentity_id\030\001"
-    " \001(\0132\026.bgs.protocol.EntityId\022\013\n\003tag\030\002 \003("
-    "\t\022\032\n\022privileged_network\030\003 \001(\010\"R\n\031GetAuth"
-    "orizedDataResponse\0225\n\004data\030\001 \003(\0132\'.bgs.p"
-    "rotocol.account.v1.AuthorizedData\"\324\001\n\030Ac"
-    "countStateNotification\022<\n\raccount_state\030"
-    "\001 \001(\0132%.bgs.protocol.account.v1.AccountS"
-    "tate\022\031\n\rsubscriber_id\030\002 \001(\004B\002\030\001\022\?\n\014accou"
-    "nt_tags\030\003 \001(\0132).bgs.protocol.account.v1."
-    "AccountFieldTags\022\036\n\026subscription_complet"
-    "ed\030\004 \001(\010\"\352\001\n\034GameAccountStateNotificatio"
-    "n\022E\n\022game_account_state\030\001 \001(\0132).bgs.prot"
-    "ocol.account.v1.GameAccountState\022\031\n\rsubs"
-    "criber_id\030\002 \001(\004B\002\030\001\022H\n\021game_account_tags"
-    "\030\003 \001(\0132-.bgs.protocol.account.v1.GameAcc"
-    "ountFieldTags\022\036\n\026subscription_completed\030"
-    "\004 \001(\010\"\262\001\n\027GameAccountNotification\022\?\n\rgam"
-    "e_accounts\030\001 \003(\0132(.bgs.protocol.account."
-    "v1.GameAccountList\022\025\n\rsubscriber_id\030\002 \001("
-    "\004\022\?\n\014account_tags\030\003 \001(\0132).bgs.protocol.a"
-    "ccount.v1.AccountFieldTags\"\250\001\n\036GameAccou"
-    "ntSessionNotification\022@\n\014game_account\030\001 "
-    "\001(\0132*.bgs.protocol.account.v1.GameAccoun"
-    "tHandle\022D\n\014session_info\030\002 \001(\0132..bgs.prot"
-    "ocol.account.v1.GameSessionUpdateInfo2\251\014"
-    "\n\016AccountService\022y\n\016ResolveAccount\022..bgs"
-    ".protocol.account.v1.ResolveAccountReque"
-    "st\032/.bgs.protocol.account.v1.ResolveAcco"
-    "untResponse\"\006\202\371+\002\010\r\022]\n\014IsIgrAddress\022,.bg"
-    "s.protocol.account.v1.IsIgrAddressReques"
-    "t\032\024.bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010\017\022|\n\tSu"
-    "bscribe\0222.bgs.protocol.account.v1.Subscr"
-    "iptionUpdateRequest\0323.bgs.protocol.accou"
-    "nt.v1.SubscriptionUpdateResponse\"\006\202\371+\002\010\031"
-    "\022_\n\013Unsubscribe\0222.bgs.protocol.account.v"
-    "1.SubscriptionUpdateRequest\032\024.bgs.protoc"
-    "ol.NoData\"\006\202\371+\002\010\032\022|\n\017GetAccountState\022/.b"
-    "gs.protocol.account.v1.GetAccountStateRe"
-    "quest\0320.bgs.protocol.account.v1.GetAccou"
-    "ntStateResponse\"\006\202\371+\002\010\036\022\210\001\n\023GetGameAccou"
-    "ntState\0223.bgs.protocol.account.v1.GetGam"
-    "eAccountStateRequest\0324.bgs.protocol.acco"
-    "unt.v1.GetGameAccountStateResponse\"\006\202\371+\002"
-    "\010\037\022p\n\013GetLicenses\022+.bgs.protocol.account"
-    ".v1.GetLicensesRequest\032,.bgs.protocol.ac"
-    "count.v1.GetLicensesResponse\"\006\202\371+\002\010 \022\227\001\n"
-    "\030GetGameTimeRemainingInfo\0228.bgs.protocol"
-    ".account.v1.GetGameTimeRemainingInfoRequ"
-    "est\0329.bgs.protocol.account.v1.GetGameTim"
-    "eRemainingInfoResponse\"\006\202\371+\002\010!\022\205\001\n\022GetGa"
-    "meSessionInfo\0222.bgs.protocol.account.v1."
-    "GetGameSessionInfoRequest\0323.bgs.protocol"
-    ".account.v1.GetGameSessionInfoResponse\"\006"
-    "\202\371+\002\010\"\022p\n\013GetCAISInfo\022+.bgs.protocol.acc"
-    "ount.v1.GetCAISInfoRequest\032,.bgs.protoco"
-    "l.account.v1.GetCAISInfoResponse\"\006\202\371+\002\010#"
-    "\022\202\001\n\021GetAuthorizedData\0221.bgs.protocol.ac"
-    "count.v1.GetAuthorizedDataRequest\0322.bgs."
-    "protocol.account.v1.GetAuthorizedDataRes"
-    "ponse\"\006\202\371+\002\010%\022\216\001\n\025GetSignedAccountState\022"
-    "5.bgs.protocol.account.v1.GetSignedAccou"
-    "ntStateRequest\0326.bgs.protocol.account.v1"
-    ".GetSignedAccountStateResponse\"\006\202\371+\002\010,\0329"
-    "\202\371+/\n$bnet.protocol.account.AccountServi"
-    "ce*\007account\212\371+\002\020\0012\220\004\n\017AccountListener\022m\n"
-    "\025OnAccountStateUpdated\0221.bgs.protocol.ac"
-    "count.v1.AccountStateNotification\032\031.bgs."
-    "protocol.NO_RESPONSE\"\006\202\371+\002\010\001\022u\n\031OnGameAc"
-    "countStateUpdated\0225.bgs.protocol.account"
-    ".v1.GameAccountStateNotification\032\031.bgs.p"
-    "rotocol.NO_RESPONSE\"\006\202\371+\002\010\002\022o\n\025OnGameAcc"
-    "ountsUpdated\0220.bgs.protocol.account.v1.G"
-    "ameAccountNotification\032\031.bgs.protocol.NO"
-    "_RESPONSE\"\t\210\002\001\202\371+\002\010\003\022u\n\024OnGameSessionUpd"
-    "ated\0227.bgs.protocol.account.v1.GameAccou"
-    "ntSessionNotification\032\031.bgs.protocol.NO_"
-    "RESPONSE\"\t\210\002\001\202\371+\002\010\004\032/\202\371+%\n#bnet.protocol"
-    ".account.AccountNotify\212\371+\002\010\001B\005H\001\200\001\000", 5555);
+    "l.account.v1.SubscriberReference\"\344\001\n\026Get"
+    "AccountStateRequest\0221\n\tentity_id\030\001 \001(\0132\026"
+    ".bgs.protocol.EntityIdB\006\202\371+\002\020\001\022\017\n\007progra"
+    "m\030\002 \001(\r\022\016\n\006region\030\003 \001(\r\022=\n\007options\030\n \001(\013"
+    "2,.bgs.protocol.account.v1.AccountFieldO"
+    "ptions\0227\n\004tags\030\013 \001(\0132).bgs.protocol.acco"
+    "unt.v1.AccountFieldTags\"\210\001\n\027GetAccountSt"
+    "ateResponse\0224\n\005state\030\001 \001(\0132%.bgs.protoco"
+    "l.account.v1.AccountState\0227\n\004tags\030\002 \001(\0132"
+    ").bgs.protocol.account.v1.AccountFieldTa"
+    "gs\"[\n\034GetSignedAccountStateRequest\022;\n\007ac"
+    "count\030\001 \001(\0132\".bgs.protocol.account.v1.Ac"
+    "countIdB\006\202\371+\002\020\001\".\n\035GetSignedAccountState"
+    "Response\022\r\n\005token\030\001 \001(\t\"\205\002\n\032GetGameAccou"
+    "ntStateRequest\022.\n\naccount_id\030\001 \001(\0132\026.bgs"
+    ".protocol.EntityIdB\002\030\001\0227\n\017game_account_i"
+    "d\030\002 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371+\002\020\001\022"
+    "A\n\007options\030\n \001(\01320.bgs.protocol.account."
+    "v1.GameAccountFieldOptions\022;\n\004tags\030\013 \001(\013"
+    "2-.bgs.protocol.account.v1.GameAccountFi"
+    "eldTags\"\224\001\n\033GetGameAccountStateResponse\022"
+    "8\n\005state\030\001 \001(\0132).bgs.protocol.account.v1"
+    ".GameAccountState\022;\n\004tags\030\002 \001(\0132-.bgs.pr"
+    "otocol.account.v1.GameAccountFieldTags\"\355"
+    "\001\n\022GetLicensesRequest\0221\n\ttarget_id\030\001 \001(\013"
+    "2\026.bgs.protocol.EntityIdB\006\202\371+\002\020\001\022\036\n\026fetc"
+    "h_account_licenses\030\002 \001(\010\022#\n\033fetch_game_a"
+    "ccount_licenses\030\003 \001(\010\022&\n\036fetch_dynamic_a"
+    "ccount_licenses\030\004 \001(\010\022\017\n\007program\030\005 \001(\007\022&"
+    "\n\027exclude_unknown_program\030\006 \001(\010:\005false\"P"
+    "\n\023GetLicensesResponse\0229\n\010licenses\030\001 \003(\0132"
+    "\'.bgs.protocol.account.v1.AccountLicense"
+    "\"F\n\031GetGameSessionInfoRequest\022)\n\tentity_"
+    "id\030\001 \001(\0132\026.bgs.protocol.EntityId\"\\\n\032GetG"
+    "ameSessionInfoResponse\022>\n\014session_info\030\002"
+    " \001(\0132(.bgs.protocol.account.v1.GameSessi"
+    "onInfo\"\225\001\n\037GetGameTimeRemainingInfoReque"
+    "st\022/\n\017game_account_id\030\001 \001(\0132\026.bgs.protoc"
+    "ol.EntityId\022*\n\naccount_id\030\002 \001(\0132\026.bgs.pr"
+    "otocol.EntityId\022\025\n\rbenefactor_id\030\003 \001(\t\"t"
+    "\n GetGameTimeRemainingInfoResponse\022P\n\030ga"
+    "me_time_remaining_info\030\001 \001(\0132..bgs.proto"
+    "col.account.v1.GameTimeRemainingInfo\"G\n\022"
+    "GetCAISInfoRequest\0221\n\tentity_id\030\001 \001(\0132\026."
+    "bgs.protocol.EntityIdB\006\202\371+\002\020\001\"G\n\023GetCAIS"
+    "InfoResponse\0220\n\tcais_info\030\001 \001(\0132\035.bgs.pr"
+    "otocol.account.v1.CAIS\"v\n\030GetAuthorizedD"
+    "ataRequest\0221\n\tentity_id\030\001 \001(\0132\026.bgs.prot"
+    "ocol.EntityIdB\006\202\371+\002\020\001\022\013\n\003tag\030\002 \003(\t\022\032\n\022pr"
+    "ivileged_network\030\003 \001(\010\"R\n\031GetAuthorizedD"
+    "ataResponse\0225\n\004data\030\001 \003(\0132\'.bgs.protocol"
+    ".account.v1.AuthorizedData\"\324\001\n\030AccountSt"
+    "ateNotification\022<\n\raccount_state\030\001 \001(\0132%"
+    ".bgs.protocol.account.v1.AccountState\022\031\n"
+    "\rsubscriber_id\030\002 \001(\004B\002\030\001\022\?\n\014account_tags"
+    "\030\003 \001(\0132).bgs.protocol.account.v1.Account"
+    "FieldTags\022\036\n\026subscription_completed\030\004 \001("
+    "\010\"\352\001\n\034GameAccountStateNotification\022E\n\022ga"
+    "me_account_state\030\001 \001(\0132).bgs.protocol.ac"
+    "count.v1.GameAccountState\022\031\n\rsubscriber_"
+    "id\030\002 \001(\004B\002\030\001\022H\n\021game_account_tags\030\003 \001(\0132"
+    "-.bgs.protocol.account.v1.GameAccountFie"
+    "ldTags\022\036\n\026subscription_completed\030\004 \001(\010\"\262"
+    "\001\n\027GameAccountNotification\022\?\n\rgame_accou"
+    "nts\030\001 \003(\0132(.bgs.protocol.account.v1.Game"
+    "AccountList\022\025\n\rsubscriber_id\030\002 \001(\004\022\?\n\014ac"
+    "count_tags\030\003 \001(\0132).bgs.protocol.account."
+    "v1.AccountFieldTags\"\250\001\n\036GameAccountSessi"
+    "onNotification\022@\n\014game_account\030\001 \001(\0132*.b"
+    "gs.protocol.account.v1.GameAccountHandle"
+    "\022D\n\014session_info\030\002 \001(\0132..bgs.protocol.ac"
+    "count.v1.GameSessionUpdateInfo2\312\013\n\016Accou"
+    "ntService\022y\n\016ResolveAccount\022..bgs.protoc"
+    "ol.account.v1.ResolveAccountRequest\032/.bg"
+    "s.protocol.account.v1.ResolveAccountResp"
+    "onse\"\006\202\371+\002\010\r\022|\n\tSubscribe\0222.bgs.protocol"
+    ".account.v1.SubscriptionUpdateRequest\0323."
+    "bgs.protocol.account.v1.SubscriptionUpda"
+    "teResponse\"\006\202\371+\002\010\031\022_\n\013Unsubscribe\0222.bgs."
+    "protocol.account.v1.SubscriptionUpdateRe"
+    "quest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\032\022|\n\017G"
+    "etAccountState\022/.bgs.protocol.account.v1"
+    ".GetAccountStateRequest\0320.bgs.protocol.a"
+    "ccount.v1.GetAccountStateResponse\"\006\202\371+\002\010"
+    "\036\022\210\001\n\023GetGameAccountState\0223.bgs.protocol"
+    ".account.v1.GetGameAccountStateRequest\0324"
+    ".bgs.protocol.account.v1.GetGameAccountS"
+    "tateResponse\"\006\202\371+\002\010\037\022p\n\013GetLicenses\022+.bg"
+    "s.protocol.account.v1.GetLicensesRequest"
+    "\032,.bgs.protocol.account.v1.GetLicensesRe"
+    "sponse\"\006\202\371+\002\010 \022\227\001\n\030GetGameTimeRemainingI"
+    "nfo\0228.bgs.protocol.account.v1.GetGameTim"
+    "eRemainingInfoRequest\0329.bgs.protocol.acc"
+    "ount.v1.GetGameTimeRemainingInfoResponse"
+    "\"\006\202\371+\002\010!\022\205\001\n\022GetGameSessionInfo\0222.bgs.pr"
+    "otocol.account.v1.GetGameSessionInfoRequ"
+    "est\0323.bgs.protocol.account.v1.GetGameSes"
+    "sionInfoResponse\"\006\202\371+\002\010\"\022p\n\013GetCAISInfo\022"
+    "+.bgs.protocol.account.v1.GetCAISInfoReq"
+    "uest\032,.bgs.protocol.account.v1.GetCAISIn"
+    "foResponse\"\006\202\371+\002\010#\022\202\001\n\021GetAuthorizedData"
+    "\0221.bgs.protocol.account.v1.GetAuthorized"
+    "DataRequest\0322.bgs.protocol.account.v1.Ge"
+    "tAuthorizedDataResponse\"\006\202\371+\002\010%\022\216\001\n\025GetS"
+    "ignedAccountState\0225.bgs.protocol.account"
+    ".v1.GetSignedAccountStateRequest\0326.bgs.p"
+    "rotocol.account.v1.GetSignedAccountState"
+    "Response\"\006\202\371+\002\010,\0329\202\371+/\n$bnet.protocol.ac"
+    "count.AccountService*\007account\212\371+\002\020\0012\220\004\n\017"
+    "AccountListener\022m\n\025OnAccountStateUpdated"
+    "\0221.bgs.protocol.account.v1.AccountStateN"
+    "otification\032\031.bgs.protocol.NO_RESPONSE\"\006"
+    "\202\371+\002\010\001\022u\n\031OnGameAccountStateUpdated\0225.bg"
+    "s.protocol.account.v1.GameAccountStateNo"
+    "tification\032\031.bgs.protocol.NO_RESPONSE\"\006\202"
+    "\371+\002\010\002\022o\n\025OnGameAccountsUpdated\0220.bgs.pro"
+    "tocol.account.v1.GameAccountNotification"
+    "\032\031.bgs.protocol.NO_RESPONSE\"\t\210\002\001\202\371+\002\010\003\022u"
+    "\n\024OnGameSessionUpdated\0227.bgs.protocol.ac"
+    "count.v1.GameAccountSessionNotification\032"
+    "\031.bgs.protocol.NO_RESPONSE\"\t\210\002\001\202\371+\002\010\004\032/\202"
+    "\371+%\n#bnet.protocol.account.AccountNotify"
+    "\212\371+\002\010\001B\005H\001\200\001\000", 5453);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "account_service.proto", &protobuf_RegisterTypes);
   ResolveAccountRequest::default_instance_ = new ResolveAccountRequest();
@@ -818,7 +794,6 @@ void protobuf_AddDesc_account_5fservice_2eproto() {
   GameAccountFlagUpdateRequest::default_instance_ = new GameAccountFlagUpdateRequest();
   SubscriptionUpdateRequest::default_instance_ = new SubscriptionUpdateRequest();
   SubscriptionUpdateResponse::default_instance_ = new SubscriptionUpdateResponse();
-  IsIgrAddressRequest::default_instance_ = new IsIgrAddressRequest();
   GetAccountStateRequest::default_instance_ = new GetAccountStateRequest();
   GetAccountStateResponse::default_instance_ = new GetAccountStateResponse();
   GetSignedAccountStateRequest::default_instance_ = new GetSignedAccountStateRequest();
@@ -844,7 +819,6 @@ void protobuf_AddDesc_account_5fservice_2eproto() {
   GameAccountFlagUpdateRequest::default_instance_->InitAsDefaultInstance();
   SubscriptionUpdateRequest::default_instance_->InitAsDefaultInstance();
   SubscriptionUpdateResponse::default_instance_->InitAsDefaultInstance();
-  IsIgrAddressRequest::default_instance_->InitAsDefaultInstance();
   GetAccountStateRequest::default_instance_->InitAsDefaultInstance();
   GetAccountStateResponse::default_instance_->InitAsDefaultInstance();
   GetSignedAccountStateRequest::default_instance_->InitAsDefaultInstance();
@@ -2138,290 +2112,6 @@ void SubscriptionUpdateResponse::Swap(SubscriptionUpdateResponse* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int IsIgrAddressRequest::kClientAddressFieldNumber;
-const int IsIgrAddressRequest::kRegionFieldNumber;
-#endif  // !_MSC_VER
-
-IsIgrAddressRequest::IsIgrAddressRequest()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.account.v1.IsIgrAddressRequest)
-}
-
-void IsIgrAddressRequest::InitAsDefaultInstance() {
-}
-
-IsIgrAddressRequest::IsIgrAddressRequest(const IsIgrAddressRequest& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.account.v1.IsIgrAddressRequest)
-}
-
-void IsIgrAddressRequest::SharedCtor() {
-  ::google::protobuf::internal::GetEmptyString();
-  _cached_size_ = 0;
-  client_address_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  region_ = 0u;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-IsIgrAddressRequest::~IsIgrAddressRequest() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.account.v1.IsIgrAddressRequest)
-  SharedDtor();
-}
-
-void IsIgrAddressRequest::SharedDtor() {
-  if (client_address_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    delete client_address_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void IsIgrAddressRequest::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* IsIgrAddressRequest::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return IsIgrAddressRequest_descriptor_;
-}
-
-const IsIgrAddressRequest& IsIgrAddressRequest::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_account_5fservice_2eproto();
-  return *default_instance_;
-}
-
-IsIgrAddressRequest* IsIgrAddressRequest::default_instance_ = NULL;
-
-IsIgrAddressRequest* IsIgrAddressRequest::New() const {
-  return new IsIgrAddressRequest;
-}
-
-void IsIgrAddressRequest::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
-    if (has_client_address()) {
-      if (client_address_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-        client_address_->clear();
-      }
-    }
-    region_ = 0u;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool IsIgrAddressRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.account.v1.IsIgrAddressRequest)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string client_address = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_client_address()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->client_address().data(), this->client_address().length(),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "client_address");
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(16)) goto parse_region;
-        break;
-      }
-
-      // optional uint32 region = 2;
-      case 2: {
-        if (tag == 16) {
-         parse_region:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &region_)));
-          set_has_region();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.account.v1.IsIgrAddressRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.account.v1.IsIgrAddressRequest)
-  return false;
-#undef DO_
-}
-
-void IsIgrAddressRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.account.v1.IsIgrAddressRequest)
-  // optional string client_address = 1;
-  if (has_client_address()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->client_address().data(), this->client_address().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "client_address");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->client_address(), output);
-  }
-
-  // optional uint32 region = 2;
-  if (has_region()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->region(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.account.v1.IsIgrAddressRequest)
-}
-
-::google::protobuf::uint8* IsIgrAddressRequest::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.account.v1.IsIgrAddressRequest)
-  // optional string client_address = 1;
-  if (has_client_address()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->client_address().data(), this->client_address().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "client_address");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->client_address(), target);
-  }
-
-  // optional uint32 region = 2;
-  if (has_region()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->region(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.account.v1.IsIgrAddressRequest)
-  return target;
-}
-
-int IsIgrAddressRequest::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional string client_address = 1;
-    if (has_client_address()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->client_address());
-    }
-
-    // optional uint32 region = 2;
-    if (has_region()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->region());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void IsIgrAddressRequest::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const IsIgrAddressRequest* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const IsIgrAddressRequest*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void IsIgrAddressRequest::MergeFrom(const IsIgrAddressRequest& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_client_address()) {
-      set_client_address(from.client_address());
-    }
-    if (from.has_region()) {
-      set_region(from.region());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void IsIgrAddressRequest::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void IsIgrAddressRequest::CopyFrom(const IsIgrAddressRequest& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool IsIgrAddressRequest::IsInitialized() const {
-
-  return true;
-}
-
-void IsIgrAddressRequest::Swap(IsIgrAddressRequest* other) {
-  if (other != this) {
-    std::swap(client_address_, other->client_address_);
-    std::swap(region_, other->region_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata IsIgrAddressRequest::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = IsIgrAddressRequest_descriptor_;
-  metadata.reflection = IsIgrAddressRequest_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
 const int GetAccountStateRequest::kEntityIdFieldNumber;
 const int GetAccountStateRequest::kProgramFieldNumber;
 const int GetAccountStateRequest::kRegionFieldNumber;
@@ -5334,6 +5024,7 @@ void GetGameSessionInfoResponse::Swap(GetGameSessionInfoResponse* other) {
 #ifndef _MSC_VER
 const int GetGameTimeRemainingInfoRequest::kGameAccountIdFieldNumber;
 const int GetGameTimeRemainingInfoRequest::kAccountIdFieldNumber;
+const int GetGameTimeRemainingInfoRequest::kBenefactorIdFieldNumber;
 #endif  // !_MSC_VER
 
 GetGameTimeRemainingInfoRequest::GetGameTimeRemainingInfoRequest()
@@ -5355,9 +5046,11 @@ GetGameTimeRemainingInfoRequest::GetGameTimeRemainingInfoRequest(const GetGameTi
 }
 
 void GetGameTimeRemainingInfoRequest::SharedCtor() {
+  ::google::protobuf::internal::GetEmptyString();
   _cached_size_ = 0;
   game_account_id_ = NULL;
   account_id_ = NULL;
+  benefactor_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -5367,6 +5060,9 @@ GetGameTimeRemainingInfoRequest::~GetGameTimeRemainingInfoRequest() {
 }
 
 void GetGameTimeRemainingInfoRequest::SharedDtor() {
+  if (benefactor_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete benefactor_id_;
+  }
   if (this != default_instance_) {
     delete game_account_id_;
     delete account_id_;
@@ -5395,13 +5091,18 @@ GetGameTimeRemainingInfoRequest* GetGameTimeRemainingInfoRequest::New() const {
 }
 
 void GetGameTimeRemainingInfoRequest::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
+  if (_has_bits_[0 / 32] & 7) {
     if (has_game_account_id()) {
       if (game_account_id_ != NULL) game_account_id_->::bgs::protocol::EntityId::Clear();
     }
     if (has_account_id()) {
       if (account_id_ != NULL) account_id_->::bgs::protocol::EntityId::Clear();
     }
+    if (has_benefactor_id()) {
+      if (benefactor_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        benefactor_id_->clear();
+      }
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -5438,6 +5139,23 @@ bool GetGameTimeRemainingInfoRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(26)) goto parse_benefactor_id;
+        break;
+      }
+
+      // optional string benefactor_id = 3;
+      case 3: {
+        if (tag == 26) {
+         parse_benefactor_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_benefactor_id()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->benefactor_id().data(), this->benefactor_id().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "benefactor_id");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -5479,6 +5197,16 @@ void GetGameTimeRemainingInfoRequest::SerializeWithCachedSizes(
       2, this->account_id(), output);
   }
 
+  // optional string benefactor_id = 3;
+  if (has_benefactor_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->benefactor_id().data(), this->benefactor_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "benefactor_id");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      3, this->benefactor_id(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -5503,6 +5231,17 @@ void GetGameTimeRemainingInfoRequest::SerializeWithCachedSizes(
         2, this->account_id(), target);
   }
 
+  // optional string benefactor_id = 3;
+  if (has_benefactor_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->benefactor_id().data(), this->benefactor_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "benefactor_id");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->benefactor_id(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -5529,6 +5268,13 @@ int GetGameTimeRemainingInfoRequest::ByteSize() const {
           this->account_id());
     }
 
+    // optional string benefactor_id = 3;
+    if (has_benefactor_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->benefactor_id());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -5562,6 +5308,9 @@ void GetGameTimeRemainingInfoRequest::MergeFrom(const GetGameTimeRemainingInfoRe
     if (from.has_account_id()) {
       mutable_account_id()->::bgs::protocol::EntityId::MergeFrom(from.account_id());
     }
+    if (from.has_benefactor_id()) {
+      set_benefactor_id(from.benefactor_id());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -5593,6 +5342,7 @@ void GetGameTimeRemainingInfoRequest::Swap(GetGameTimeRemainingInfoRequest* othe
   if (other != this) {
     std::swap(game_account_id_, other->game_account_id_);
     std::swap(account_id_, other->account_id_);
+    std::swap(benefactor_id_, other->benefactor_id_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -8161,32 +7911,6 @@ void AccountService::CallServerMethod(uint32 token, uint32 methodId, MessageBuff
         continuation(this, status, &response);
       break;
     }
-    case 15: {
-      ::bgs::protocol::account::v1::IsIgrAddressRequest request;
-      if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
-        TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for AccountService.IsIgrAddress server method call.", GetCallerInfo().c_str());
-        SendResponse(service_hash_, methodId, token, ERROR_RPC_MALFORMED_REQUEST);
-        return;
-      }
-      TC_LOG_DEBUG("service.protobuf", "%s Client called server method AccountService.IsIgrAddress(bgs.protocol.account.v1.IsIgrAddressRequest{ %s }).",
-        GetCallerInfo().c_str(), request.ShortDebugString().c_str());
-      std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token, methodId](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response)
-      {
-        ASSERT(response->GetDescriptor() == ::bgs::protocol::NoData::descriptor());
-        AccountService* self = static_cast<AccountService*>(service);
-        TC_LOG_DEBUG("service.protobuf", "%s Client called server method AccountService.IsIgrAddress() returned bgs.protocol.NoData{ %s } status %u.",
-          self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status);
-        if (!status)
-          self->SendResponse(self->service_hash_, methodId, token, response);
-        else
-          self->SendResponse(self->service_hash_, methodId, token, status);
-      };
-      ::bgs::protocol::NoData response;
-      uint32 status = HandleIsIgrAddress(&request, &response, continuation);
-      if (continuation)
-        continuation(this, status, &response);
-      break;
-    }
     case 25: {
       ::bgs::protocol::account::v1::SubscriptionUpdateRequest request;
       if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
@@ -8460,12 +8184,6 @@ uint32 AccountService::HandleResolveAccount(::bgs::protocol::account::v1::Resolv
   return ERROR_RPC_NOT_IMPLEMENTED;
 }
 
-uint32 AccountService::HandleIsIgrAddress(::bgs::protocol::account::v1::IsIgrAddressRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
-  TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method AccountService.IsIgrAddress({ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
-  return ERROR_RPC_NOT_IMPLEMENTED;
-}
-
 uint32 AccountService::HandleSubscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, ::bgs::protocol::account::v1::SubscriptionUpdateResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
   TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method AccountService.Subscribe({ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
diff --git a/src/server/proto/Client/account_service.pb.h b/src/server/proto/Client/account_service.pb.h
index b9fefb380d5..c2807806126 100644
--- a/src/server/proto/Client/account_service.pb.h
+++ b/src/server/proto/Client/account_service.pb.h
@@ -48,7 +48,6 @@ class ResolveAccountResponse;
 class GameAccountFlagUpdateRequest;
 class SubscriptionUpdateRequest;
 class SubscriptionUpdateResponse;
-class IsIgrAddressRequest;
 class GetAccountStateRequest;
 class GetAccountStateResponse;
 class GetSignedAccountStateRequest;
@@ -509,100 +508,6 @@ class TC_PROTO_API SubscriptionUpdateResponse : public ::google::protobuf::Messa
 };
 // -------------------------------------------------------------------
 
-class TC_PROTO_API IsIgrAddressRequest : public ::google::protobuf::Message {
- public:
-  IsIgrAddressRequest();
-  virtual ~IsIgrAddressRequest();
-
-  IsIgrAddressRequest(const IsIgrAddressRequest& from);
-
-  inline IsIgrAddressRequest& operator=(const IsIgrAddressRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const IsIgrAddressRequest& default_instance();
-
-  void Swap(IsIgrAddressRequest* other);
-
-  // implements Message ----------------------------------------------
-
-  IsIgrAddressRequest* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const IsIgrAddressRequest& from);
-  void MergeFrom(const IsIgrAddressRequest& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional string client_address = 1;
-  inline bool has_client_address() const;
-  inline void clear_client_address();
-  static const int kClientAddressFieldNumber = 1;
-  inline const ::std::string& client_address() const;
-  inline void set_client_address(const ::std::string& value);
-  inline void set_client_address(const char* value);
-  inline void set_client_address(const char* value, size_t size);
-  inline ::std::string* mutable_client_address();
-  inline ::std::string* release_client_address();
-  inline void set_allocated_client_address(::std::string* client_address);
-
-  // optional uint32 region = 2;
-  inline bool has_region() const;
-  inline void clear_region();
-  static const int kRegionFieldNumber = 2;
-  inline ::google::protobuf::uint32 region() const;
-  inline void set_region(::google::protobuf::uint32 value);
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.IsIgrAddressRequest)
- private:
-  inline void set_has_client_address();
-  inline void clear_has_client_address();
-  inline void set_has_region();
-  inline void clear_has_region();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::std::string* client_address_;
-  ::google::protobuf::uint32 region_;
-  friend void TC_PROTO_API protobuf_AddDesc_account_5fservice_2eproto();
-  friend void protobuf_AssignDesc_account_5fservice_2eproto();
-  friend void protobuf_ShutdownFile_account_5fservice_2eproto();
-
-  void InitAsDefaultInstance();
-  static IsIgrAddressRequest* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class TC_PROTO_API GetAccountStateRequest : public ::google::protobuf::Message {
  public:
   GetAccountStateRequest();
@@ -1642,12 +1547,26 @@ class TC_PROTO_API GetGameTimeRemainingInfoRequest : public ::google::protobuf::
   inline ::bgs::protocol::EntityId* release_account_id();
   inline void set_allocated_account_id(::bgs::protocol::EntityId* account_id);
 
+  // optional string benefactor_id = 3;
+  inline bool has_benefactor_id() const;
+  inline void clear_benefactor_id();
+  static const int kBenefactorIdFieldNumber = 3;
+  inline const ::std::string& benefactor_id() const;
+  inline void set_benefactor_id(const ::std::string& value);
+  inline void set_benefactor_id(const char* value);
+  inline void set_benefactor_id(const char* value, size_t size);
+  inline ::std::string* mutable_benefactor_id();
+  inline ::std::string* release_benefactor_id();
+  inline void set_allocated_benefactor_id(::std::string* benefactor_id);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest)
  private:
   inline void set_has_game_account_id();
   inline void clear_has_game_account_id();
   inline void set_has_account_id();
   inline void clear_has_account_id();
+  inline void set_has_benefactor_id();
+  inline void clear_has_benefactor_id();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1655,6 +1574,7 @@ class TC_PROTO_API GetGameTimeRemainingInfoRequest : public ::google::protobuf::
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* game_account_id_;
   ::bgs::protocol::EntityId* account_id_;
+  ::std::string* benefactor_id_;
   friend void TC_PROTO_API protobuf_AddDesc_account_5fservice_2eproto();
   friend void protobuf_AssignDesc_account_5fservice_2eproto();
   friend void protobuf_ShutdownFile_account_5fservice_2eproto();
@@ -2537,7 +2457,6 @@ class TC_PROTO_API AccountService : public ServiceBase
  protected:
   // server methods --------------------------------------------------
   virtual uint32 HandleResolveAccount(::bgs::protocol::account::v1::ResolveAccountRequest const* request, ::bgs::protocol::account::v1::ResolveAccountResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
-  virtual uint32 HandleIsIgrAddress(::bgs::protocol::account::v1::IsIgrAddressRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleSubscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, ::bgs::protocol::account::v1::SubscriptionUpdateResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleUnsubscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleGetAccountState(::bgs::protocol::account::v1::GetAccountStateRequest const* request, ::bgs::protocol::account::v1::GetAccountStateResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
@@ -2863,110 +2782,6 @@ SubscriptionUpdateResponse::mutable_ref() {
 
 // -------------------------------------------------------------------
 
-// IsIgrAddressRequest
-
-// optional string client_address = 1;
-inline bool IsIgrAddressRequest::has_client_address() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void IsIgrAddressRequest::set_has_client_address() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void IsIgrAddressRequest::clear_has_client_address() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void IsIgrAddressRequest::clear_client_address() {
-  if (client_address_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    client_address_->clear();
-  }
-  clear_has_client_address();
-}
-inline const ::std::string& IsIgrAddressRequest::client_address() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.IsIgrAddressRequest.client_address)
-  return *client_address_;
-}
-inline void IsIgrAddressRequest::set_client_address(const ::std::string& value) {
-  set_has_client_address();
-  if (client_address_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    client_address_ = new ::std::string;
-  }
-  client_address_->assign(value);
-  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.IsIgrAddressRequest.client_address)
-}
-inline void IsIgrAddressRequest::set_client_address(const char* value) {
-  set_has_client_address();
-  if (client_address_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    client_address_ = new ::std::string;
-  }
-  client_address_->assign(value);
-  // @@protoc_insertion_point(field_set_char:bgs.protocol.account.v1.IsIgrAddressRequest.client_address)
-}
-inline void IsIgrAddressRequest::set_client_address(const char* value, size_t size) {
-  set_has_client_address();
-  if (client_address_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    client_address_ = new ::std::string;
-  }
-  client_address_->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.account.v1.IsIgrAddressRequest.client_address)
-}
-inline ::std::string* IsIgrAddressRequest::mutable_client_address() {
-  set_has_client_address();
-  if (client_address_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    client_address_ = new ::std::string;
-  }
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.IsIgrAddressRequest.client_address)
-  return client_address_;
-}
-inline ::std::string* IsIgrAddressRequest::release_client_address() {
-  clear_has_client_address();
-  if (client_address_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    return NULL;
-  } else {
-    ::std::string* temp = client_address_;
-    client_address_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-    return temp;
-  }
-}
-inline void IsIgrAddressRequest::set_allocated_client_address(::std::string* client_address) {
-  if (client_address_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    delete client_address_;
-  }
-  if (client_address) {
-    set_has_client_address();
-    client_address_ = client_address;
-  } else {
-    clear_has_client_address();
-    client_address_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.IsIgrAddressRequest.client_address)
-}
-
-// optional uint32 region = 2;
-inline bool IsIgrAddressRequest::has_region() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void IsIgrAddressRequest::set_has_region() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void IsIgrAddressRequest::clear_has_region() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void IsIgrAddressRequest::clear_region() {
-  region_ = 0u;
-  clear_has_region();
-}
-inline ::google::protobuf::uint32 IsIgrAddressRequest::region() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.IsIgrAddressRequest.region)
-  return region_;
-}
-inline void IsIgrAddressRequest::set_region(::google::protobuf::uint32 value) {
-  set_has_region();
-  region_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.IsIgrAddressRequest.region)
-}
-
-// -------------------------------------------------------------------
-
 // GetAccountStateRequest
 
 // optional .bgs.protocol.EntityId entity_id = 1;
@@ -3980,6 +3795,82 @@ inline void GetGameTimeRemainingInfoRequest::set_allocated_account_id(::bgs::pro
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest.account_id)
 }
 
+// optional string benefactor_id = 3;
+inline bool GetGameTimeRemainingInfoRequest::has_benefactor_id() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void GetGameTimeRemainingInfoRequest::set_has_benefactor_id() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void GetGameTimeRemainingInfoRequest::clear_has_benefactor_id() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void GetGameTimeRemainingInfoRequest::clear_benefactor_id() {
+  if (benefactor_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    benefactor_id_->clear();
+  }
+  clear_has_benefactor_id();
+}
+inline const ::std::string& GetGameTimeRemainingInfoRequest::benefactor_id() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest.benefactor_id)
+  return *benefactor_id_;
+}
+inline void GetGameTimeRemainingInfoRequest::set_benefactor_id(const ::std::string& value) {
+  set_has_benefactor_id();
+  if (benefactor_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    benefactor_id_ = new ::std::string;
+  }
+  benefactor_id_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest.benefactor_id)
+}
+inline void GetGameTimeRemainingInfoRequest::set_benefactor_id(const char* value) {
+  set_has_benefactor_id();
+  if (benefactor_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    benefactor_id_ = new ::std::string;
+  }
+  benefactor_id_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest.benefactor_id)
+}
+inline void GetGameTimeRemainingInfoRequest::set_benefactor_id(const char* value, size_t size) {
+  set_has_benefactor_id();
+  if (benefactor_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    benefactor_id_ = new ::std::string;
+  }
+  benefactor_id_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest.benefactor_id)
+}
+inline ::std::string* GetGameTimeRemainingInfoRequest::mutable_benefactor_id() {
+  set_has_benefactor_id();
+  if (benefactor_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    benefactor_id_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest.benefactor_id)
+  return benefactor_id_;
+}
+inline ::std::string* GetGameTimeRemainingInfoRequest::release_benefactor_id() {
+  clear_has_benefactor_id();
+  if (benefactor_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = benefactor_id_;
+    benefactor_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void GetGameTimeRemainingInfoRequest::set_allocated_benefactor_id(::std::string* benefactor_id) {
+  if (benefactor_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete benefactor_id_;
+  }
+  if (benefactor_id) {
+    set_has_benefactor_id();
+    benefactor_id_ = benefactor_id;
+  } else {
+    clear_has_benefactor_id();
+    benefactor_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest.benefactor_id)
+}
+
 // -------------------------------------------------------------------
 
 // GetGameTimeRemainingInfoResponse
diff --git a/src/server/proto/Client/account_types.pb.cc b/src/server/proto/Client/account_types.pb.cc
index 9eab9d474b0..dd23db432f7 100644
--- a/src/server/proto/Client/account_types.pb.cc
+++ b/src/server/proto/Client/account_types.pb.cc
@@ -71,6 +71,9 @@ const ::google::protobuf::EnumDescriptor* PrivacyInfo_GameInfoPrivacy_descriptor
 const ::google::protobuf::Descriptor* ParentalControlInfo_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ParentalControlInfo_reflection_ = NULL;
+const ::google::protobuf::Descriptor* PlayScheduleRestriction_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  PlayScheduleRestriction_reflection_ = NULL;
 const ::google::protobuf::Descriptor* GameLevelInfo_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   GameLevelInfo_reflection_ = NULL;
@@ -101,6 +104,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* GameAccountList_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   GameAccountList_reflection_ = NULL;
+const ::google::protobuf::Descriptor* SecurityStatus_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  SecurityStatus_reflection_ = NULL;
 const ::google::protobuf::Descriptor* AccountState_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   AccountState_reflection_ = NULL;
@@ -122,6 +128,7 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 struct IgrIdOneofInstance {
   const ::bgs::protocol::account::v1::GameAccountHandle* game_account_;
   ::google::protobuf::uint32 external_id_;
+  const ::std::string* uuid_;
 }* IgrId_default_oneof_instance_ = NULL;
 const ::google::protobuf::Descriptor* IgrAddress_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
@@ -186,11 +193,12 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountHandle));
   AccountReference_descriptor_ = file->message_type(3);
-  static const int AccountReference_offsets_[5] = {
+  static const int AccountReference_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountReference, id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountReference, email_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountReference, handle_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountReference, battle_tag_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountReference, phone_number_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountReference, region_),
   };
   AccountReference_reflection_ =
@@ -253,13 +261,14 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RegionTag));
   AccountFieldTags_descriptor_ = file->message_type(7);
-  static const int AccountFieldTags_offsets_[6] = {
+  static const int AccountFieldTags_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldTags, account_level_info_tag_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldTags, privacy_info_tag_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldTags, parental_control_info_tag_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldTags, game_level_info_tags_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldTags, game_status_tags_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldTags, game_account_tags_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldTags, security_status_tag_),
   };
   AccountFieldTags_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -291,7 +300,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountFieldTags));
   AccountFieldOptions_descriptor_ = file->message_type(9);
-  static const int AccountFieldOptions_offsets_[7] = {
+  static const int AccountFieldOptions_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldOptions, all_fields_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldOptions, field_account_level_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldOptions, field_privacy_info_),
@@ -299,6 +308,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldOptions, field_game_level_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldOptions, field_game_status_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldOptions, field_game_accounts_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountFieldOptions, field_security_status_),
   };
   AccountFieldOptions_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -352,7 +362,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SubscriberReference));
   AccountLevelInfo_descriptor_ = file->message_type(12);
-  static const int AccountLevelInfo_offsets_[15] = {
+  static const int AccountLevelInfo_offsets_[16] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, licenses_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, default_currency_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, country_),
@@ -368,6 +378,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, test_account_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, is_sms_protected_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, ratings_board_minimum_age_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, phone_number_),
   };
   AccountLevelInfo_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -422,8 +433,24 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ParentalControlInfo));
-  GameLevelInfo_descriptor_ = file->message_type(15);
-  static const int GameLevelInfo_offsets_[8] = {
+  PlayScheduleRestriction_descriptor_ = file->message_type(15);
+  static const int PlayScheduleRestriction_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlayScheduleRestriction, play_schedule_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlayScheduleRestriction, timezone_),
+  };
+  PlayScheduleRestriction_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      PlayScheduleRestriction_descriptor_,
+      PlayScheduleRestriction::default_instance_,
+      PlayScheduleRestriction_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlayScheduleRestriction, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlayScheduleRestriction, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(PlayScheduleRestriction));
+  GameLevelInfo_descriptor_ = file->message_type(16);
+  static const int GameLevelInfo_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameLevelInfo, is_trial_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameLevelInfo, is_lifetime_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameLevelInfo, is_restricted_),
@@ -432,6 +459,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameLevelInfo, program_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameLevelInfo, licenses_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameLevelInfo, realm_permissions_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameLevelInfo, last_logout_time_ms_),
   };
   GameLevelInfo_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -444,7 +472,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameLevelInfo));
-  GameTimeInfo_descriptor_ = file->message_type(16);
+  GameTimeInfo_descriptor_ = file->message_type(17);
   static const int GameTimeInfo_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameTimeInfo, is_unlimited_play_time_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameTimeInfo, play_time_expires_),
@@ -462,7 +490,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameTimeInfo));
-  GameTimeRemainingInfo_descriptor_ = file->message_type(17);
+  GameTimeRemainingInfo_descriptor_ = file->message_type(18);
   static const int GameTimeRemainingInfo_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameTimeRemainingInfo, minutes_remaining_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameTimeRemainingInfo, parental_daily_minutes_remaining_),
@@ -480,7 +508,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameTimeRemainingInfo));
-  GameStatus_descriptor_ = file->message_type(18);
+  GameStatus_descriptor_ = file->message_type(19);
   static const int GameStatus_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameStatus, is_suspended_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameStatus, is_banned_),
@@ -500,7 +528,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameStatus));
-  RAFInfo_descriptor_ = file->message_type(19);
+  RAFInfo_descriptor_ = file->message_type(20);
   static const int RAFInfo_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RAFInfo, raf_info_),
   };
@@ -515,7 +543,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RAFInfo));
-  GameSessionInfo_descriptor_ = file->message_type(20);
+  GameSessionInfo_descriptor_ = file->message_type(21);
   static const int GameSessionInfo_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameSessionInfo, start_time_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameSessionInfo, location_),
@@ -536,7 +564,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameSessionInfo));
-  GameSessionUpdateInfo_descriptor_ = file->message_type(21);
+  GameSessionUpdateInfo_descriptor_ = file->message_type(22);
   static const int GameSessionUpdateInfo_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameSessionUpdateInfo, cais_),
   };
@@ -551,7 +579,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameSessionUpdateInfo));
-  GameSessionLocation_descriptor_ = file->message_type(22);
+  GameSessionLocation_descriptor_ = file->message_type(23);
   static const int GameSessionLocation_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameSessionLocation, ip_address_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameSessionLocation, country_),
@@ -568,7 +596,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameSessionLocation));
-  CAIS_descriptor_ = file->message_type(23);
+  CAIS_descriptor_ = file->message_type(24);
   static const int CAIS_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CAIS, played_minutes_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CAIS, rested_minutes_),
@@ -585,7 +613,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CAIS));
-  GameAccountList_descriptor_ = file->message_type(24);
+  GameAccountList_descriptor_ = file->message_type(25);
   static const int GameAccountList_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountList, region_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountList, handle_),
@@ -601,14 +629,35 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountList));
-  AccountState_descriptor_ = file->message_type(25);
-  static const int AccountState_offsets_[6] = {
+  SecurityStatus_descriptor_ = file->message_type(26);
+  static const int SecurityStatus_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SecurityStatus, sms_protect_enabled_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SecurityStatus, email_verified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SecurityStatus, authenticator_enabled_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SecurityStatus, sqa_enabled_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SecurityStatus, authenticator_required_),
+  };
+  SecurityStatus_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      SecurityStatus_descriptor_,
+      SecurityStatus::default_instance_,
+      SecurityStatus_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SecurityStatus, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SecurityStatus, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(SecurityStatus));
+  AccountState_descriptor_ = file->message_type(27);
+  static const int AccountState_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, account_level_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, privacy_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, parental_control_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, game_level_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, game_status_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, game_accounts_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, security_status_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountState, government_curfew_),
   };
   AccountState_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -621,7 +670,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AccountState));
-  AccountStateTagged_descriptor_ = file->message_type(26);
+  AccountStateTagged_descriptor_ = file->message_type(28);
   static const int AccountStateTagged_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountStateTagged, account_state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountStateTagged, account_tags_),
@@ -637,7 +686,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AccountStateTagged));
-  GameAccountState_descriptor_ = file->message_type(27);
+  GameAccountState_descriptor_ = file->message_type(29);
   static const int GameAccountState_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountState, game_level_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountState, game_time_info_),
@@ -655,7 +704,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountState));
-  GameAccountStateTagged_descriptor_ = file->message_type(28);
+  GameAccountStateTagged_descriptor_ = file->message_type(30);
   static const int GameAccountStateTagged_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountStateTagged, game_account_state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountStateTagged, game_account_tags_),
@@ -671,7 +720,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountStateTagged));
-  AuthorizedData_descriptor_ = file->message_type(29);
+  AuthorizedData_descriptor_ = file->message_type(31);
   static const int AuthorizedData_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AuthorizedData, data_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AuthorizedData, license_),
@@ -687,10 +736,11 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AuthorizedData));
-  IgrId_descriptor_ = file->message_type(30);
-  static const int IgrId_offsets_[3] = {
+  IgrId_descriptor_ = file->message_type(32);
+  static const int IgrId_offsets_[4] = {
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(IgrId_default_oneof_instance_, game_account_),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(IgrId_default_oneof_instance_, external_id_),
+    PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(IgrId_default_oneof_instance_, uuid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IgrId, type_),
   };
   IgrId_reflection_ =
@@ -706,7 +756,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(IgrId));
-  IgrAddress_descriptor_ = file->message_type(31);
+  IgrAddress_descriptor_ = file->message_type(33);
   static const int IgrAddress_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IgrAddress, client_address_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IgrAddress, region_),
@@ -766,6 +816,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ParentalControlInfo_descriptor_, &ParentalControlInfo::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    PlayScheduleRestriction_descriptor_, &PlayScheduleRestriction::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GameLevelInfo_descriptor_, &GameLevelInfo::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GameTimeInfo_descriptor_, &GameTimeInfo::default_instance());
@@ -786,6 +838,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GameAccountList_descriptor_, &GameAccountList::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    SecurityStatus_descriptor_, &SecurityStatus::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     AccountState_descriptor_, &AccountState::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     AccountStateTagged_descriptor_, &AccountStateTagged::default_instance());
@@ -834,6 +888,8 @@ void protobuf_ShutdownFile_account_5ftypes_2eproto() {
   delete PrivacyInfo_reflection_;
   delete ParentalControlInfo::default_instance_;
   delete ParentalControlInfo_reflection_;
+  delete PlayScheduleRestriction::default_instance_;
+  delete PlayScheduleRestriction_reflection_;
   delete GameLevelInfo::default_instance_;
   delete GameLevelInfo_reflection_;
   delete GameTimeInfo::default_instance_;
@@ -854,6 +910,8 @@ void protobuf_ShutdownFile_account_5ftypes_2eproto() {
   delete CAIS_reflection_;
   delete GameAccountList::default_instance_;
   delete GameAccountList_reflection_;
+  delete SecurityStatus::default_instance_;
+  delete SecurityStatus_reflection_;
   delete AccountState::default_instance_;
   delete AccountState_reflection_;
   delete AccountStateTagged::default_instance_;
@@ -887,139 +945,153 @@ void protobuf_AddDesc_account_5ftypes_2eproto() {
     "expires\030\002 \001(\004\"k\n\021GameAccountHandle\022\024\n\002id"
     "\030\001 \002(\007B\010\212\371+\004\022\002\020\000\022\031\n\007program\030\002 \002(\007B\010\212\371+\004\022"
     "\002\020\000\022\035\n\006region\030\003 \002(\rB\r\212\371+\t\022\007\n\005\010\001\020\377\001:\006\202\371+\002"
-    "\010\001\"\220\001\n\020AccountReference\022\n\n\002id\030\001 \001(\007\022\r\n\005e"
-    "mail\030\002 \001(\t\022:\n\006handle\030\003 \001(\0132*.bgs.protoco"
-    "l.account.v1.GameAccountHandle\022\022\n\nbattle"
-    "_tag\030\004 \001(\t\022\021\n\006region\030\n \001(\r:\0010\"\211\001\n\010Identi"
-    "ty\0223\n\007account\030\001 \001(\0132\".bgs.protocol.accou"
-    "nt.v1.AccountId\022@\n\014game_account\030\002 \001(\0132*."
-    "bgs.protocol.account.v1.GameAccountHandl"
-    "e:\006\202\371+\002\020\001\"*\n\nProgramTag\022\017\n\007program\030\001 \001(\007"
-    "\022\013\n\003tag\030\002 \001(\007\"(\n\tRegionTag\022\016\n\006region\030\001 \001"
-    "(\007\022\013\n\003tag\030\002 \001(\007\"\260\002\n\020AccountFieldTags\022\036\n\026"
-    "account_level_info_tag\030\002 \001(\007\022\030\n\020privacy_"
-    "info_tag\030\003 \001(\007\022!\n\031parental_control_info_"
-    "tag\030\004 \001(\007\022A\n\024game_level_info_tags\030\007 \003(\0132"
-    "#.bgs.protocol.account.v1.ProgramTag\022=\n\020"
-    "game_status_tags\030\t \003(\0132#.bgs.protocol.ac"
-    "count.v1.ProgramTag\022=\n\021game_account_tags"
-    "\030\013 \003(\0132\".bgs.protocol.account.v1.RegionT"
-    "ag\"~\n\024GameAccountFieldTags\022\033\n\023game_level"
-    "_info_tag\030\002 \001(\007\022\032\n\022game_time_info_tag\030\003 "
-    "\001(\007\022\027\n\017game_status_tag\030\004 \001(\007\022\024\n\014raf_info"
-    "_tag\030\005 \001(\007\"\343\001\n\023AccountFieldOptions\022\022\n\nal"
-    "l_fields\030\001 \001(\010\022 \n\030field_account_level_in"
-    "fo\030\002 \001(\010\022\032\n\022field_privacy_info\030\003 \001(\010\022#\n\033"
-    "field_parental_control_info\030\004 \001(\010\022\035\n\025fie"
-    "ld_game_level_info\030\006 \001(\010\022\031\n\021field_game_s"
-    "tatus\030\007 \001(\010\022\033\n\023field_game_accounts\030\010 \001(\010"
-    "\"\235\001\n\027GameAccountFieldOptions\022\022\n\nall_fiel"
-    "ds\030\001 \001(\010\022\035\n\025field_game_level_info\030\002 \001(\010\022"
-    "\034\n\024field_game_time_info\030\003 \001(\010\022\031\n\021field_g"
-    "ame_status\030\004 \001(\010\022\026\n\016field_raf_info\030\005 \001(\010"
-    "\"\222\003\n\023SubscriberReference\022\024\n\tobject_id\030\001 "
-    "\001(\004:\0010\022)\n\tentity_id\030\002 \001(\0132\026.bgs.protocol"
-    ".EntityId\022E\n\017account_options\030\003 \001(\0132,.bgs"
-    ".protocol.account.v1.AccountFieldOptions"
-    "\022\?\n\014account_tags\030\004 \001(\0132).bgs.protocol.ac"
-    "count.v1.AccountFieldTags\022N\n\024game_accoun"
-    "t_options\030\005 \001(\01320.bgs.protocol.account.v"
-    "1.GameAccountFieldOptions\022H\n\021game_accoun"
-    "t_tags\030\006 \001(\0132-.bgs.protocol.account.v1.G"
-    "ameAccountFieldTags\022\030\n\rsubscriber_id\030\007 \001"
-    "(\004:\0010\"\311\003\n\020AccountLevelInfo\0229\n\010licenses\030\003"
-    " \003(\0132\'.bgs.protocol.account.v1.AccountLi"
-    "cense\022\030\n\020default_currency\030\004 \001(\007\022\017\n\007count"
-    "ry\030\005 \001(\t\022\030\n\020preferred_region\030\006 \001(\r\022\021\n\tfu"
-    "ll_name\030\007 \001(\t\022\022\n\nbattle_tag\030\010 \001(\t\022\r\n\005mut"
-    "ed\030\t \001(\010\022\025\n\rmanual_review\030\n \001(\010\022\030\n\020accou"
-    "nt_paid_any\030\013 \001(\010\022R\n\025identity_check_stat"
-    "us\030\014 \001(\01623.bgs.protocol.account.v1.Ident"
-    "ityVerificationStatus\022\r\n\005email\030\r \001(\t\022\030\n\020"
-    "headless_account\030\016 \001(\010\022\024\n\014test_account\030\017"
-    " \001(\010\022\030\n\020is_sms_protected\030\021 \001(\010\022!\n\031rating"
-    "s_board_minimum_age\030\022 \001(\r\"\302\002\n\013PrivacyInf"
-    "o\022\024\n\014is_using_rid\030\003 \001(\010\022#\n\033is_visible_fo"
-    "r_view_friends\030\004 \001(\010\022$\n\034is_hidden_from_f"
-    "riend_finder\030\005 \001(\010\022`\n\021game_info_privacy\030"
-    "\006 \001(\01624.bgs.protocol.account.v1.PrivacyI"
-    "nfo.GameInfoPrivacy:\017PRIVACY_FRIENDS\022\"\n\032"
-    "only_allow_friend_whispers\030\007 \001(\010\"L\n\017Game"
-    "InfoPrivacy\022\016\n\nPRIVACY_ME\020\000\022\023\n\017PRIVACY_F"
-    "RIENDS\020\001\022\024\n\020PRIVACY_EVERYONE\020\002\"\325\001\n\023Paren"
-    "talControlInfo\022\020\n\010timezone\030\003 \001(\t\022\027\n\017minu"
-    "tes_per_day\030\004 \001(\r\022\030\n\020minutes_per_week\030\005 "
-    "\001(\r\022\031\n\021can_receive_voice\030\006 \001(\010\022\026\n\016can_se"
-    "nd_voice\030\007 \001(\010\022\025\n\rplay_schedule\030\010 \003(\010\022\026\n"
-    "\016can_join_group\030\t \001(\010\022\027\n\017can_use_profile"
-    "\030\n \001(\010\"\323\001\n\rGameLevelInfo\022\020\n\010is_trial\030\004 \001"
-    "(\010\022\023\n\013is_lifetime\030\005 \001(\010\022\025\n\ris_restricted"
-    "\030\006 \001(\010\022\017\n\007is_beta\030\007 \001(\010\022\014\n\004name\030\010 \001(\t\022\017\n"
-    "\007program\030\t \001(\007\0229\n\010licenses\030\n \003(\0132\'.bgs.p"
-    "rotocol.account.v1.AccountLicense\022\031\n\021rea"
-    "lm_permissions\030\013 \001(\r\"\205\001\n\014GameTimeInfo\022\036\n"
-    "\026is_unlimited_play_time\030\003 \001(\010\022\031\n\021play_ti"
-    "me_expires\030\005 \001(\004\022\027\n\017is_subscription\030\006 \001("
-    "\010\022!\n\031is_recurring_subscription\030\007 \001(\010\"\261\001\n"
-    "\025GameTimeRemainingInfo\022\031\n\021minutes_remain"
-    "ing\030\001 \001(\r\022(\n parental_daily_minutes_rema"
-    "ining\030\002 \001(\r\022)\n!parental_weekly_minutes_r"
-    "emaining\030\003 \001(\r\022(\n\034seconds_remaining_unti"
-    "l_kick\030\004 \001(\rB\002\030\001\"\220\001\n\nGameStatus\022\024\n\014is_su"
-    "spended\030\004 \001(\010\022\021\n\tis_banned\030\005 \001(\010\022\032\n\022susp"
-    "ension_expires\030\006 \001(\004\022\017\n\007program\030\007 \001(\007\022\021\n"
-    "\tis_locked\030\010 \001(\010\022\031\n\021is_bam_unlockable\030\t "
-    "\001(\010\"\033\n\007RAFInfo\022\020\n\010raf_info\030\001 \001(\014\"\201\002\n\017Gam"
-    "eSessionInfo\022\026\n\nstart_time\030\003 \001(\rB\002\030\001\022>\n\010"
-    "location\030\004 \001(\0132,.bgs.protocol.account.v1"
-    ".GameSessionLocation\022\026\n\016has_benefactor\030\005"
-    " \001(\010\022\024\n\014is_using_igr\030\006 \001(\010\022 \n\030parental_c"
-    "ontrols_active\030\007 \001(\010\022\026\n\016start_time_sec\030\010"
-    " \001(\004\022.\n\006igr_id\030\t \001(\0132\036.bgs.protocol.acco"
-    "unt.v1.IgrId\"D\n\025GameSessionUpdateInfo\022+\n"
-    "\004cais\030\010 \001(\0132\035.bgs.protocol.account.v1.CA"
-    "IS\"H\n\023GameSessionLocation\022\022\n\nip_address\030"
-    "\001 \001(\t\022\017\n\007country\030\002 \001(\r\022\014\n\004city\030\003 \001(\t\"O\n\004"
-    "CAIS\022\026\n\016played_minutes\030\001 \001(\r\022\026\n\016rested_m"
-    "inutes\030\002 \001(\r\022\027\n\017last_heard_time\030\003 \001(\004\"]\n"
-    "\017GameAccountList\022\016\n\006region\030\003 \001(\r\022:\n\006hand"
-    "le\030\004 \003(\0132*.bgs.protocol.account.v1.GameA"
-    "ccountHandle\"\232\003\n\014AccountState\022E\n\022account"
-    "_level_info\030\001 \001(\0132).bgs.protocol.account"
-    ".v1.AccountLevelInfo\022:\n\014privacy_info\030\002 \001"
-    "(\0132$.bgs.protocol.account.v1.PrivacyInfo"
-    "\022K\n\025parental_control_info\030\003 \001(\0132,.bgs.pr"
-    "otocol.account.v1.ParentalControlInfo\022\?\n"
-    "\017game_level_info\030\005 \003(\0132&.bgs.protocol.ac"
-    "count.v1.GameLevelInfo\0228\n\013game_status\030\006 "
-    "\003(\0132#.bgs.protocol.account.v1.GameStatus"
-    "\022\?\n\rgame_accounts\030\007 \003(\0132(.bgs.protocol.a"
-    "ccount.v1.GameAccountList\"\223\001\n\022AccountSta"
-    "teTagged\022<\n\raccount_state\030\001 \001(\0132%.bgs.pr"
-    "otocol.account.v1.AccountState\022\?\n\014accoun"
-    "t_tags\030\002 \001(\0132).bgs.protocol.account.v1.A"
-    "ccountFieldTags\"\200\002\n\020GameAccountState\022\?\n\017"
-    "game_level_info\030\001 \001(\0132&.bgs.protocol.acc"
-    "ount.v1.GameLevelInfo\022=\n\016game_time_info\030"
-    "\002 \001(\0132%.bgs.protocol.account.v1.GameTime"
-    "Info\0228\n\013game_status\030\003 \001(\0132#.bgs.protocol"
-    ".account.v1.GameStatus\0222\n\010raf_info\030\004 \001(\013"
-    "2 .bgs.protocol.account.v1.RAFInfo\"\251\001\n\026G"
-    "ameAccountStateTagged\022E\n\022game_account_st"
-    "ate\030\001 \001(\0132).bgs.protocol.account.v1.Game"
-    "AccountState\022H\n\021game_account_tags\030\002 \001(\0132"
-    "-.bgs.protocol.account.v1.GameAccountFie"
-    "ldTags\"/\n\016AuthorizedData\022\014\n\004data\030\001 \001(\t\022\017"
-    "\n\007license\030\002 \003(\r\"j\n\005IgrId\022B\n\014game_account"
-    "\030\001 \001(\0132*.bgs.protocol.account.v1.GameAcc"
-    "ountHandleH\000\022\025\n\013external_id\030\002 \001(\007H\000B\006\n\004t"
-    "ype\"4\n\nIgrAddress\022\026\n\016client_address\030\001 \001("
-    "\t\022\016\n\006region\030\002 \001(\r*\265\001\n\032IdentityVerificati"
-    "onStatus\022\021\n\rIDENT_NO_DATA\020\000\022\021\n\rIDENT_PEN"
-    "DING\020\001\022\021\n\rIDENT_OVER_18\020\002\022\022\n\016IDENT_UNDER"
-    "_18\020\003\022\020\n\014IDENT_FAILED\020\004\022\021\n\rIDENT_SUCCESS"
-    "\020\005\022\022\n\016IDENT_SUCC_MNL\020\006\022\021\n\rIDENT_UNKNOWN\020"
-    "\007B\002H\001", 5565);
+    "\010\001\"\306\001\n\020AccountReference\022\n\n\002id\030\001 \001(\007\022\025\n\005e"
+    "mail\030\002 \001(\tB\006\202\371+\002\010\001\022:\n\006handle\030\003 \001(\0132*.bgs"
+    ".protocol.account.v1.GameAccountHandle\022\032"
+    "\n\nbattle_tag\030\004 \001(\tB\006\202\371+\002\010\001\022\034\n\014phone_numb"
+    "er\030\005 \001(\tB\006\202\371+\002\010\001\022\021\n\006region\030\n \001(\r:\0010:\006\202\371+"
+    "\002\010\001\"\211\001\n\010Identity\0223\n\007account\030\001 \001(\0132\".bgs."
+    "protocol.account.v1.AccountId\022@\n\014game_ac"
+    "count\030\002 \001(\0132*.bgs.protocol.account.v1.Ga"
+    "meAccountHandle:\006\202\371+\002\020\001\"*\n\nProgramTag\022\017\n"
+    "\007program\030\001 \001(\007\022\013\n\003tag\030\002 \001(\007\"(\n\tRegionTag"
+    "\022\016\n\006region\030\001 \001(\007\022\013\n\003tag\030\002 \001(\007\"\315\002\n\020Accoun"
+    "tFieldTags\022\036\n\026account_level_info_tag\030\002 \001"
+    "(\007\022\030\n\020privacy_info_tag\030\003 \001(\007\022!\n\031parental"
+    "_control_info_tag\030\004 \001(\007\022A\n\024game_level_in"
+    "fo_tags\030\007 \003(\0132#.bgs.protocol.account.v1."
+    "ProgramTag\022=\n\020game_status_tags\030\t \003(\0132#.b"
+    "gs.protocol.account.v1.ProgramTag\022=\n\021gam"
+    "e_account_tags\030\013 \003(\0132\".bgs.protocol.acco"
+    "unt.v1.RegionTag\022\033\n\023security_status_tag\030"
+    "\014 \001(\007\"~\n\024GameAccountFieldTags\022\033\n\023game_le"
+    "vel_info_tag\030\002 \001(\007\022\032\n\022game_time_info_tag"
+    "\030\003 \001(\007\022\027\n\017game_status_tag\030\004 \001(\007\022\024\n\014raf_i"
+    "nfo_tag\030\005 \001(\007\"\202\002\n\023AccountFieldOptions\022\022\n"
+    "\nall_fields\030\001 \001(\010\022 \n\030field_account_level"
+    "_info\030\002 \001(\010\022\032\n\022field_privacy_info\030\003 \001(\010\022"
+    "#\n\033field_parental_control_info\030\004 \001(\010\022\035\n\025"
+    "field_game_level_info\030\006 \001(\010\022\031\n\021field_gam"
+    "e_status\030\007 \001(\010\022\033\n\023field_game_accounts\030\010 "
+    "\001(\010\022\035\n\025field_security_status\030\t \001(\010\"\235\001\n\027G"
+    "ameAccountFieldOptions\022\022\n\nall_fields\030\001 \001"
+    "(\010\022\035\n\025field_game_level_info\030\002 \001(\010\022\034\n\024fie"
+    "ld_game_time_info\030\003 \001(\010\022\031\n\021field_game_st"
+    "atus\030\004 \001(\010\022\026\n\016field_raf_info\030\005 \001(\010\"\222\003\n\023S"
+    "ubscriberReference\022\024\n\tobject_id\030\001 \001(\004:\0010"
+    "\022)\n\tentity_id\030\002 \001(\0132\026.bgs.protocol.Entit"
+    "yId\022E\n\017account_options\030\003 \001(\0132,.bgs.proto"
+    "col.account.v1.AccountFieldOptions\022\?\n\014ac"
+    "count_tags\030\004 \001(\0132).bgs.protocol.account."
+    "v1.AccountFieldTags\022N\n\024game_account_opti"
+    "ons\030\005 \001(\01320.bgs.protocol.account.v1.Game"
+    "AccountFieldOptions\022H\n\021game_account_tags"
+    "\030\006 \001(\0132-.bgs.protocol.account.v1.GameAcc"
+    "ountFieldTags\022\030\n\rsubscriber_id\030\007 \001(\004:\0010\""
+    "\377\003\n\020AccountLevelInfo\0229\n\010licenses\030\003 \003(\0132\'"
+    ".bgs.protocol.account.v1.AccountLicense\022"
+    "\030\n\020default_currency\030\004 \001(\007\022\017\n\007country\030\005 \001"
+    "(\t\022\030\n\020preferred_region\030\006 \001(\r\022\031\n\tfull_nam"
+    "e\030\007 \001(\tB\006\202\371+\002\010\001\022\032\n\nbattle_tag\030\010 \001(\tB\006\202\371+"
+    "\002\010\001\022\r\n\005muted\030\t \001(\010\022\025\n\rmanual_review\030\n \001("
+    "\010\022\030\n\020account_paid_any\030\013 \001(\010\022R\n\025identity_"
+    "check_status\030\014 \001(\01623.bgs.protocol.accoun"
+    "t.v1.IdentityVerificationStatus\022\025\n\005email"
+    "\030\r \001(\tB\006\202\371+\002\010\001\022\030\n\020headless_account\030\016 \001(\010"
+    "\022\024\n\014test_account\030\017 \001(\010\022\030\n\020is_sms_protect"
+    "ed\030\021 \001(\010\022!\n\031ratings_board_minimum_age\030\022 "
+    "\001(\r\022\034\n\014phone_number\030\023 \001(\tB\006\202\371+\002\010\001\"\302\002\n\013Pr"
+    "ivacyInfo\022\024\n\014is_using_rid\030\003 \001(\010\022#\n\033is_vi"
+    "sible_for_view_friends\030\004 \001(\010\022$\n\034is_hidde"
+    "n_from_friend_finder\030\005 \001(\010\022`\n\021game_info_"
+    "privacy\030\006 \001(\01624.bgs.protocol.account.v1."
+    "PrivacyInfo.GameInfoPrivacy:\017PRIVACY_FRI"
+    "ENDS\022\"\n\032only_allow_friend_whispers\030\007 \001(\010"
+    "\"L\n\017GameInfoPrivacy\022\016\n\nPRIVACY_ME\020\000\022\023\n\017P"
+    "RIVACY_FRIENDS\020\001\022\024\n\020PRIVACY_EVERYONE\020\002\"\325"
+    "\001\n\023ParentalControlInfo\022\020\n\010timezone\030\003 \001(\t"
+    "\022\027\n\017minutes_per_day\030\004 \001(\r\022\030\n\020minutes_per"
+    "_week\030\005 \001(\r\022\031\n\021can_receive_voice\030\006 \001(\010\022\026"
+    "\n\016can_send_voice\030\007 \001(\010\022\025\n\rplay_schedule\030"
+    "\010 \003(\010\022\026\n\016can_join_group\030\t \001(\010\022\027\n\017can_use"
+    "_profile\030\n \001(\010\"B\n\027PlayScheduleRestrictio"
+    "n\022\025\n\rplay_schedule\030\001 \003(\010\022\020\n\010timezone\030\002 \001"
+    "(\t\"\370\001\n\rGameLevelInfo\022\020\n\010is_trial\030\004 \001(\010\022\023"
+    "\n\013is_lifetime\030\005 \001(\010\022\025\n\ris_restricted\030\006 \001"
+    "(\010\022\017\n\007is_beta\030\007 \001(\010\022\024\n\004name\030\010 \001(\tB\006\202\371+\002\010"
+    "\001\022\017\n\007program\030\t \001(\007\0229\n\010licenses\030\n \003(\0132\'.b"
+    "gs.protocol.account.v1.AccountLicense\022\031\n"
+    "\021realm_permissions\030\013 \001(\r\022\033\n\023last_logout_"
+    "time_ms\030\014 \001(\004\"\205\001\n\014GameTimeInfo\022\036\n\026is_unl"
+    "imited_play_time\030\003 \001(\010\022\031\n\021play_time_expi"
+    "res\030\005 \001(\004\022\027\n\017is_subscription\030\006 \001(\010\022!\n\031is"
+    "_recurring_subscription\030\007 \001(\010\"\261\001\n\025GameTi"
+    "meRemainingInfo\022\031\n\021minutes_remaining\030\001 \001"
+    "(\r\022(\n parental_daily_minutes_remaining\030\002"
+    " \001(\r\022)\n!parental_weekly_minutes_remainin"
+    "g\030\003 \001(\r\022(\n\034seconds_remaining_until_kick\030"
+    "\004 \001(\rB\002\030\001\"\220\001\n\nGameStatus\022\024\n\014is_suspended"
+    "\030\004 \001(\010\022\021\n\tis_banned\030\005 \001(\010\022\032\n\022suspension_"
+    "expires\030\006 \001(\004\022\017\n\007program\030\007 \001(\007\022\021\n\tis_loc"
+    "ked\030\010 \001(\010\022\031\n\021is_bam_unlockable\030\t \001(\010\"\033\n\007"
+    "RAFInfo\022\020\n\010raf_info\030\001 \001(\014\"\201\002\n\017GameSessio"
+    "nInfo\022\026\n\nstart_time\030\003 \001(\rB\002\030\001\022>\n\010locatio"
+    "n\030\004 \001(\0132,.bgs.protocol.account.v1.GameSe"
+    "ssionLocation\022\026\n\016has_benefactor\030\005 \001(\010\022\024\n"
+    "\014is_using_igr\030\006 \001(\010\022 \n\030parental_controls"
+    "_active\030\007 \001(\010\022\026\n\016start_time_sec\030\010 \001(\004\022.\n"
+    "\006igr_id\030\t \001(\0132\036.bgs.protocol.account.v1."
+    "IgrId\"D\n\025GameSessionUpdateInfo\022+\n\004cais\030\010"
+    " \001(\0132\035.bgs.protocol.account.v1.CAIS\"H\n\023G"
+    "ameSessionLocation\022\022\n\nip_address\030\001 \001(\t\022\017"
+    "\n\007country\030\002 \001(\r\022\014\n\004city\030\003 \001(\t\"O\n\004CAIS\022\026\n"
+    "\016played_minutes\030\001 \001(\r\022\026\n\016rested_minutes\030"
+    "\002 \001(\r\022\027\n\017last_heard_time\030\003 \001(\004\"]\n\017GameAc"
+    "countList\022\016\n\006region\030\003 \001(\r\022:\n\006handle\030\004 \003("
+    "\0132*.bgs.protocol.account.v1.GameAccountH"
+    "andle\"\231\001\n\016SecurityStatus\022\033\n\023sms_protect_"
+    "enabled\030\001 \001(\010\022\026\n\016email_verified\030\002 \001(\010\022\035\n"
+    "\025authenticator_enabled\030\003 \001(\010\022\023\n\013sqa_enab"
+    "led\030\004 \001(\010\022\036\n\026authenticator_required\030\005 \001("
+    "\010\"\251\004\n\014AccountState\022E\n\022account_level_info"
+    "\030\001 \001(\0132).bgs.protocol.account.v1.Account"
+    "LevelInfo\022:\n\014privacy_info\030\002 \001(\0132$.bgs.pr"
+    "otocol.account.v1.PrivacyInfo\022K\n\025parenta"
+    "l_control_info\030\003 \001(\0132,.bgs.protocol.acco"
+    "unt.v1.ParentalControlInfo\022\?\n\017game_level"
+    "_info\030\005 \003(\0132&.bgs.protocol.account.v1.Ga"
+    "meLevelInfo\0228\n\013game_status\030\006 \003(\0132#.bgs.p"
+    "rotocol.account.v1.GameStatus\022\?\n\rgame_ac"
+    "counts\030\007 \003(\0132(.bgs.protocol.account.v1.G"
+    "ameAccountList\022@\n\017security_status\030\010 \001(\0132"
+    "\'.bgs.protocol.account.v1.SecurityStatus"
+    "\022K\n\021government_curfew\030\t \001(\01320.bgs.protoc"
+    "ol.account.v1.PlayScheduleRestriction\"\223\001"
+    "\n\022AccountStateTagged\022<\n\raccount_state\030\001 "
+    "\001(\0132%.bgs.protocol.account.v1.AccountSta"
+    "te\022\?\n\014account_tags\030\002 \001(\0132).bgs.protocol."
+    "account.v1.AccountFieldTags\"\200\002\n\020GameAcco"
+    "untState\022\?\n\017game_level_info\030\001 \001(\0132&.bgs."
+    "protocol.account.v1.GameLevelInfo\022=\n\016gam"
+    "e_time_info\030\002 \001(\0132%.bgs.protocol.account"
+    ".v1.GameTimeInfo\0228\n\013game_status\030\003 \001(\0132#."
+    "bgs.protocol.account.v1.GameStatus\0222\n\010ra"
+    "f_info\030\004 \001(\0132 .bgs.protocol.account.v1.R"
+    "AFInfo\"\251\001\n\026GameAccountStateTagged\022E\n\022gam"
+    "e_account_state\030\001 \001(\0132).bgs.protocol.acc"
+    "ount.v1.GameAccountState\022H\n\021game_account"
+    "_tags\030\002 \001(\0132-.bgs.protocol.account.v1.Ga"
+    "meAccountFieldTags\"/\n\016AuthorizedData\022\014\n\004"
+    "data\030\001 \001(\t\022\017\n\007license\030\002 \003(\r\"z\n\005IgrId\022B\n\014"
+    "game_account\030\001 \001(\0132*.bgs.protocol.accoun"
+    "t.v1.GameAccountHandleH\000\022\025\n\013external_id\030"
+    "\002 \001(\007H\000\022\016\n\004uuid\030\003 \001(\tH\000B\006\n\004type\"4\n\nIgrAd"
+    "dress\022\026\n\016client_address\030\001 \001(\t\022\016\n\006region\030"
+    "\002 \001(\r*\265\001\n\032IdentityVerificationStatus\022\021\n\r"
+    "IDENT_NO_DATA\020\000\022\021\n\rIDENT_PENDING\020\001\022\021\n\rID"
+    "ENT_OVER_18\020\002\022\022\n\016IDENT_UNDER_18\020\003\022\020\n\014IDE"
+    "NT_FAILED\020\004\022\021\n\rIDENT_SUCCESS\020\005\022\022\n\016IDENT_"
+    "SUCC_MNL\020\006\022\021\n\rIDENT_UNKNOWN\020\007B\002H\001", 6153);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "account_types.proto", &protobuf_RegisterTypes);
   AccountId::default_instance_ = new AccountId();
@@ -1037,6 +1109,7 @@ void protobuf_AddDesc_account_5ftypes_2eproto() {
   AccountLevelInfo::default_instance_ = new AccountLevelInfo();
   PrivacyInfo::default_instance_ = new PrivacyInfo();
   ParentalControlInfo::default_instance_ = new ParentalControlInfo();
+  PlayScheduleRestriction::default_instance_ = new PlayScheduleRestriction();
   GameLevelInfo::default_instance_ = new GameLevelInfo();
   GameTimeInfo::default_instance_ = new GameTimeInfo();
   GameTimeRemainingInfo::default_instance_ = new GameTimeRemainingInfo();
@@ -1047,6 +1120,7 @@ void protobuf_AddDesc_account_5ftypes_2eproto() {
   GameSessionLocation::default_instance_ = new GameSessionLocation();
   CAIS::default_instance_ = new CAIS();
   GameAccountList::default_instance_ = new GameAccountList();
+  SecurityStatus::default_instance_ = new SecurityStatus();
   AccountState::default_instance_ = new AccountState();
   AccountStateTagged::default_instance_ = new AccountStateTagged();
   GameAccountState::default_instance_ = new GameAccountState();
@@ -1070,6 +1144,7 @@ void protobuf_AddDesc_account_5ftypes_2eproto() {
   AccountLevelInfo::default_instance_->InitAsDefaultInstance();
   PrivacyInfo::default_instance_->InitAsDefaultInstance();
   ParentalControlInfo::default_instance_->InitAsDefaultInstance();
+  PlayScheduleRestriction::default_instance_->InitAsDefaultInstance();
   GameLevelInfo::default_instance_->InitAsDefaultInstance();
   GameTimeInfo::default_instance_->InitAsDefaultInstance();
   GameTimeRemainingInfo::default_instance_->InitAsDefaultInstance();
@@ -1080,6 +1155,7 @@ void protobuf_AddDesc_account_5ftypes_2eproto() {
   GameSessionLocation::default_instance_->InitAsDefaultInstance();
   CAIS::default_instance_->InitAsDefaultInstance();
   GameAccountList::default_instance_->InitAsDefaultInstance();
+  SecurityStatus::default_instance_->InitAsDefaultInstance();
   AccountState::default_instance_->InitAsDefaultInstance();
   AccountStateTagged::default_instance_->InitAsDefaultInstance();
   GameAccountState::default_instance_->InitAsDefaultInstance();
@@ -1929,6 +2005,7 @@ const int AccountReference::kIdFieldNumber;
 const int AccountReference::kEmailFieldNumber;
 const int AccountReference::kHandleFieldNumber;
 const int AccountReference::kBattleTagFieldNumber;
+const int AccountReference::kPhoneNumberFieldNumber;
 const int AccountReference::kRegionFieldNumber;
 #endif  // !_MSC_VER
 
@@ -1956,6 +2033,7 @@ void AccountReference::SharedCtor() {
   email_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   handle_ = NULL;
   battle_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   region_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -1972,6 +2050,9 @@ void AccountReference::SharedDtor() {
   if (battle_tag_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete battle_tag_;
   }
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete phone_number_;
+  }
   if (this != default_instance_) {
     delete handle_;
   }
@@ -2009,7 +2090,7 @@ void AccountReference::Clear() {
     ::memset(&first, 0, n);                                \
   } while (0)
 
-  if (_has_bits_[0 / 32] & 31) {
+  if (_has_bits_[0 / 32] & 63) {
     ZR_(id_, region_);
     if (has_email()) {
       if (email_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
@@ -2024,6 +2105,11 @@ void AccountReference::Clear() {
         battle_tag_->clear();
       }
     }
+    if (has_phone_number()) {
+      if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        phone_number_->clear();
+      }
+    }
   }
 
 #undef OFFSET_OF_FIELD_
@@ -2100,6 +2186,23 @@ bool AccountReference::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(42)) goto parse_phone_number;
+        break;
+      }
+
+      // optional string phone_number = 5;
+      case 5: {
+        if (tag == 42) {
+         parse_phone_number:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_phone_number()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->phone_number().data(), this->phone_number().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "phone_number");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectTag(80)) goto parse_region;
         break;
       }
@@ -2175,6 +2278,16 @@ void AccountReference::SerializeWithCachedSizes(
       4, this->battle_tag(), output);
   }
 
+  // optional string phone_number = 5;
+  if (has_phone_number()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->phone_number().data(), this->phone_number().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "phone_number");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      5, this->phone_number(), output);
+  }
+
   // optional uint32 region = 10 [default = 0];
   if (has_region()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(10, this->region(), output);
@@ -2224,6 +2337,17 @@ void AccountReference::SerializeWithCachedSizes(
         4, this->battle_tag(), target);
   }
 
+  // optional string phone_number = 5;
+  if (has_phone_number()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->phone_number().data(), this->phone_number().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "phone_number");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        5, this->phone_number(), target);
+  }
+
   // optional uint32 region = 10 [default = 0];
   if (has_region()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(10, this->region(), target);
@@ -2267,6 +2391,13 @@ int AccountReference::ByteSize() const {
           this->battle_tag());
     }
 
+    // optional string phone_number = 5;
+    if (has_phone_number()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->phone_number());
+    }
+
     // optional uint32 region = 10 [default = 0];
     if (has_region()) {
       total_size += 1 +
@@ -2313,6 +2444,9 @@ void AccountReference::MergeFrom(const AccountReference& from) {
     if (from.has_battle_tag()) {
       set_battle_tag(from.battle_tag());
     }
+    if (from.has_phone_number()) {
+      set_phone_number(from.phone_number());
+    }
     if (from.has_region()) {
       set_region(from.region());
     }
@@ -2346,6 +2480,7 @@ void AccountReference::Swap(AccountReference* other) {
     std::swap(email_, other->email_);
     std::swap(handle_, other->handle_);
     std::swap(battle_tag_, other->battle_tag_);
+    std::swap(phone_number_, other->phone_number_);
     std::swap(region_, other->region_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
@@ -3190,6 +3325,7 @@ const int AccountFieldTags::kParentalControlInfoTagFieldNumber;
 const int AccountFieldTags::kGameLevelInfoTagsFieldNumber;
 const int AccountFieldTags::kGameStatusTagsFieldNumber;
 const int AccountFieldTags::kGameAccountTagsFieldNumber;
+const int AccountFieldTags::kSecurityStatusTagFieldNumber;
 #endif  // !_MSC_VER
 
 AccountFieldTags::AccountFieldTags()
@@ -3213,6 +3349,7 @@ void AccountFieldTags::SharedCtor() {
   account_level_info_tag_ = 0u;
   privacy_info_tag_ = 0u;
   parental_control_info_tag_ = 0u;
+  security_status_tag_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -3258,10 +3395,8 @@ void AccountFieldTags::Clear() {
     ::memset(&first, 0, n);                                \
   } while (0)
 
-  if (_has_bits_[0 / 32] & 7) {
-    ZR_(account_level_info_tag_, privacy_info_tag_);
-    parental_control_info_tag_ = 0u;
-  }
+  ZR_(account_level_info_tag_, privacy_info_tag_);
+  ZR_(parental_control_info_tag_, security_status_tag_);
 
 #undef OFFSET_OF_FIELD_
 #undef ZR_
@@ -3365,6 +3500,21 @@ bool AccountFieldTags::MergePartialFromCodedStream(
           goto handle_unusual;
         }
         if (input->ExpectTag(90)) goto parse_game_account_tags;
+        if (input->ExpectTag(101)) goto parse_security_status_tag;
+        break;
+      }
+
+      // optional fixed32 security_status_tag = 12;
+      case 12: {
+        if (tag == 101) {
+         parse_security_status_tag:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>(
+                 input, &security_status_tag_)));
+          set_has_security_status_tag();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -3427,6 +3577,11 @@ void AccountFieldTags::SerializeWithCachedSizes(
       11, this->game_account_tags(i), output);
   }
 
+  // optional fixed32 security_status_tag = 12;
+  if (has_security_status_tag()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFixed32(12, this->security_status_tag(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -3473,6 +3628,11 @@ void AccountFieldTags::SerializeWithCachedSizes(
         11, this->game_account_tags(i), target);
   }
 
+  // optional fixed32 security_status_tag = 12;
+  if (has_security_status_tag()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(12, this->security_status_tag(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -3500,6 +3660,11 @@ int AccountFieldTags::ByteSize() const {
       total_size += 1 + 4;
     }
 
+    // optional fixed32 security_status_tag = 12;
+    if (has_security_status_tag()) {
+      total_size += 1 + 4;
+    }
+
   }
   // repeated .bgs.protocol.account.v1.ProgramTag game_level_info_tags = 7;
   total_size += 1 * this->game_level_info_tags_size();
@@ -3563,6 +3728,9 @@ void AccountFieldTags::MergeFrom(const AccountFieldTags& from) {
     if (from.has_parental_control_info_tag()) {
       set_parental_control_info_tag(from.parental_control_info_tag());
     }
+    if (from.has_security_status_tag()) {
+      set_security_status_tag(from.security_status_tag());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -3592,6 +3760,7 @@ void AccountFieldTags::Swap(AccountFieldTags* other) {
     game_level_info_tags_.Swap(&other->game_level_info_tags_);
     game_status_tags_.Swap(&other->game_status_tags_);
     game_account_tags_.Swap(&other->game_account_tags_);
+    std::swap(security_status_tag_, other->security_status_tag_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -3959,6 +4128,7 @@ const int AccountFieldOptions::kFieldParentalControlInfoFieldNumber;
 const int AccountFieldOptions::kFieldGameLevelInfoFieldNumber;
 const int AccountFieldOptions::kFieldGameStatusFieldNumber;
 const int AccountFieldOptions::kFieldGameAccountsFieldNumber;
+const int AccountFieldOptions::kFieldSecurityStatusFieldNumber;
 #endif  // !_MSC_VER
 
 AccountFieldOptions::AccountFieldOptions()
@@ -3986,6 +4156,7 @@ void AccountFieldOptions::SharedCtor() {
   field_game_level_info_ = false;
   field_game_status_ = false;
   field_game_accounts_ = false;
+  field_security_status_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -4031,8 +4202,8 @@ void AccountFieldOptions::Clear() {
     ::memset(&first, 0, n);                                \
   } while (0)
 
-  if (_has_bits_[0 / 32] & 127) {
-    ZR_(all_fields_, field_game_accounts_);
+  if (_has_bits_[0 / 32] & 255) {
+    ZR_(all_fields_, field_security_status_);
   }
 
 #undef OFFSET_OF_FIELD_
@@ -4152,6 +4323,21 @@ bool AccountFieldOptions::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(72)) goto parse_field_security_status;
+        break;
+      }
+
+      // optional bool field_security_status = 9;
+      case 9: {
+        if (tag == 72) {
+         parse_field_security_status:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &field_security_status_)));
+          set_has_field_security_status();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -4216,6 +4402,11 @@ void AccountFieldOptions::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->field_game_accounts(), output);
   }
 
+  // optional bool field_security_status = 9;
+  if (has_field_security_status()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(9, this->field_security_status(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -4261,6 +4452,11 @@ void AccountFieldOptions::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->field_game_accounts(), target);
   }
 
+  // optional bool field_security_status = 9;
+  if (has_field_security_status()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(9, this->field_security_status(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -4308,6 +4504,11 @@ int AccountFieldOptions::ByteSize() const {
       total_size += 1 + 1;
     }
 
+    // optional bool field_security_status = 9;
+    if (has_field_security_status()) {
+      total_size += 1 + 1;
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -4356,6 +4557,9 @@ void AccountFieldOptions::MergeFrom(const AccountFieldOptions& from) {
     if (from.has_field_game_accounts()) {
       set_field_game_accounts(from.field_game_accounts());
     }
+    if (from.has_field_security_status()) {
+      set_field_security_status(from.field_security_status());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -4386,6 +4590,7 @@ void AccountFieldOptions::Swap(AccountFieldOptions* other) {
     std::swap(field_game_level_info_, other->field_game_level_info_);
     std::swap(field_game_status_, other->field_game_status_);
     std::swap(field_game_accounts_, other->field_game_accounts_);
+    std::swap(field_security_status_, other->field_security_status_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -5285,6 +5490,7 @@ const int AccountLevelInfo::kHeadlessAccountFieldNumber;
 const int AccountLevelInfo::kTestAccountFieldNumber;
 const int AccountLevelInfo::kIsSmsProtectedFieldNumber;
 const int AccountLevelInfo::kRatingsBoardMinimumAgeFieldNumber;
+const int AccountLevelInfo::kPhoneNumberFieldNumber;
 #endif  // !_MSC_VER
 
 AccountLevelInfo::AccountLevelInfo()
@@ -5320,6 +5526,7 @@ void AccountLevelInfo::SharedCtor() {
   test_account_ = false;
   is_sms_protected_ = false;
   ratings_board_minimum_age_ = 0u;
+  phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -5341,6 +5548,9 @@ void AccountLevelInfo::SharedDtor() {
   if (email_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete email_;
   }
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete phone_number_;
+  }
   if (this != default_instance_) {
   }
 }
@@ -5396,7 +5606,7 @@ void AccountLevelInfo::Clear() {
       }
     }
   }
-  if (_has_bits_[8 / 32] & 32512) {
+  if (_has_bits_[8 / 32] & 65280) {
     ZR_(account_paid_any_, identity_check_status_);
     ZR_(test_account_, ratings_board_minimum_age_);
     if (has_email()) {
@@ -5404,6 +5614,11 @@ void AccountLevelInfo::Clear() {
         email_->clear();
       }
     }
+    if (has_phone_number()) {
+      if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        phone_number_->clear();
+      }
+    }
   }
 
 #undef OFFSET_OF_FIELD_
@@ -5657,6 +5872,23 @@ bool AccountLevelInfo::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(154)) goto parse_phone_number;
+        break;
+      }
+
+      // optional string phone_number = 19;
+      case 19: {
+        if (tag == 154) {
+         parse_phone_number:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_phone_number()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->phone_number().data(), this->phone_number().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "phone_number");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -5783,6 +6015,16 @@ void AccountLevelInfo::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(18, this->ratings_board_minimum_age(), output);
   }
 
+  // optional string phone_number = 19;
+  if (has_phone_number()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->phone_number().data(), this->phone_number().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "phone_number");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      19, this->phone_number(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -5895,6 +6137,17 @@ void AccountLevelInfo::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(18, this->ratings_board_minimum_age(), target);
   }
 
+  // optional string phone_number = 19;
+  if (has_phone_number()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->phone_number().data(), this->phone_number().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "phone_number");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        19, this->phone_number(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -5992,6 +6245,13 @@ int AccountLevelInfo::ByteSize() const {
           this->ratings_board_minimum_age());
     }
 
+    // optional string phone_number = 19;
+    if (has_phone_number()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->phone_number());
+    }
+
   }
   // repeated .bgs.protocol.account.v1.AccountLicense licenses = 3;
   total_size += 1 * this->licenses_size();
@@ -6072,6 +6332,9 @@ void AccountLevelInfo::MergeFrom(const AccountLevelInfo& from) {
     if (from.has_ratings_board_minimum_age()) {
       set_ratings_board_minimum_age(from.ratings_board_minimum_age());
     }
+    if (from.has_phone_number()) {
+      set_phone_number(from.phone_number());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -6111,6 +6374,7 @@ void AccountLevelInfo::Swap(AccountLevelInfo* other) {
     std::swap(test_account_, other->test_account_);
     std::swap(is_sms_protected_, other->is_sms_protected_);
     std::swap(ratings_board_minimum_age_, other->ratings_board_minimum_age_);
+    std::swap(phone_number_, other->phone_number_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -7064,6 +7328,292 @@ void ParentalControlInfo::Swap(ParentalControlInfo* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int PlayScheduleRestriction::kPlayScheduleFieldNumber;
+const int PlayScheduleRestriction::kTimezoneFieldNumber;
+#endif  // !_MSC_VER
+
+PlayScheduleRestriction::PlayScheduleRestriction()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:bgs.protocol.account.v1.PlayScheduleRestriction)
+}
+
+void PlayScheduleRestriction::InitAsDefaultInstance() {
+}
+
+PlayScheduleRestriction::PlayScheduleRestriction(const PlayScheduleRestriction& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+  // @@protoc_insertion_point(copy_constructor:bgs.protocol.account.v1.PlayScheduleRestriction)
+}
+
+void PlayScheduleRestriction::SharedCtor() {
+  ::google::protobuf::internal::GetEmptyString();
+  _cached_size_ = 0;
+  timezone_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+PlayScheduleRestriction::~PlayScheduleRestriction() {
+  // @@protoc_insertion_point(destructor:bgs.protocol.account.v1.PlayScheduleRestriction)
+  SharedDtor();
+}
+
+void PlayScheduleRestriction::SharedDtor() {
+  if (timezone_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete timezone_;
+  }
+  if (this != default_instance_) {
+  }
+}
+
+void PlayScheduleRestriction::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* PlayScheduleRestriction::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return PlayScheduleRestriction_descriptor_;
+}
+
+const PlayScheduleRestriction& PlayScheduleRestriction::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_account_5ftypes_2eproto();
+  return *default_instance_;
+}
+
+PlayScheduleRestriction* PlayScheduleRestriction::default_instance_ = NULL;
+
+PlayScheduleRestriction* PlayScheduleRestriction::New() const {
+  return new PlayScheduleRestriction;
+}
+
+void PlayScheduleRestriction::Clear() {
+  if (has_timezone()) {
+    if (timezone_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+      timezone_->clear();
+    }
+  }
+  play_schedule_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool PlayScheduleRestriction::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:bgs.protocol.account.v1.PlayScheduleRestriction)
+  for (;;) {
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated bool play_schedule = 1;
+      case 1: {
+        if (tag == 8) {
+         parse_play_schedule:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 1, 8, input, this->mutable_play_schedule())));
+        } else if (tag == 10) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, this->mutable_play_schedule())));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(8)) goto parse_play_schedule;
+        if (input->ExpectTag(18)) goto parse_timezone;
+        break;
+      }
+
+      // optional string timezone = 2;
+      case 2: {
+        if (tag == 18) {
+         parse_timezone:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_timezone()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->timezone().data(), this->timezone().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "timezone");
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectAtEnd()) goto success;
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0 ||
+            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:bgs.protocol.account.v1.PlayScheduleRestriction)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:bgs.protocol.account.v1.PlayScheduleRestriction)
+  return false;
+#undef DO_
+}
+
+void PlayScheduleRestriction::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:bgs.protocol.account.v1.PlayScheduleRestriction)
+  // repeated bool play_schedule = 1;
+  for (int i = 0; i < this->play_schedule_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(
+      1, this->play_schedule(i), output);
+  }
+
+  // optional string timezone = 2;
+  if (has_timezone()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->timezone().data(), this->timezone().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "timezone");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      2, this->timezone(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:bgs.protocol.account.v1.PlayScheduleRestriction)
+}
+
+::google::protobuf::uint8* PlayScheduleRestriction::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.account.v1.PlayScheduleRestriction)
+  // repeated bool play_schedule = 1;
+  for (int i = 0; i < this->play_schedule_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteBoolToArray(1, this->play_schedule(i), target);
+  }
+
+  // optional string timezone = 2;
+  if (has_timezone()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->timezone().data(), this->timezone().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "timezone");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->timezone(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.account.v1.PlayScheduleRestriction)
+  return target;
+}
+
+int PlayScheduleRestriction::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
+    // optional string timezone = 2;
+    if (has_timezone()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->timezone());
+    }
+
+  }
+  // repeated bool play_schedule = 1;
+  {
+    int data_size = 0;
+    data_size = 1 * this->play_schedule_size();
+    total_size += 1 * this->play_schedule_size() + data_size;
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void PlayScheduleRestriction::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const PlayScheduleRestriction* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const PlayScheduleRestriction*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void PlayScheduleRestriction::MergeFrom(const PlayScheduleRestriction& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  play_schedule_.MergeFrom(from.play_schedule_);
+  if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) {
+    if (from.has_timezone()) {
+      set_timezone(from.timezone());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void PlayScheduleRestriction::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void PlayScheduleRestriction::CopyFrom(const PlayScheduleRestriction& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool PlayScheduleRestriction::IsInitialized() const {
+
+  return true;
+}
+
+void PlayScheduleRestriction::Swap(PlayScheduleRestriction* other) {
+  if (other != this) {
+    play_schedule_.Swap(&other->play_schedule_);
+    std::swap(timezone_, other->timezone_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata PlayScheduleRestriction::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = PlayScheduleRestriction_descriptor_;
+  metadata.reflection = PlayScheduleRestriction_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int GameLevelInfo::kIsTrialFieldNumber;
 const int GameLevelInfo::kIsLifetimeFieldNumber;
 const int GameLevelInfo::kIsRestrictedFieldNumber;
@@ -7072,6 +7622,7 @@ const int GameLevelInfo::kNameFieldNumber;
 const int GameLevelInfo::kProgramFieldNumber;
 const int GameLevelInfo::kLicensesFieldNumber;
 const int GameLevelInfo::kRealmPermissionsFieldNumber;
+const int GameLevelInfo::kLastLogoutTimeMsFieldNumber;
 #endif  // !_MSC_VER
 
 GameLevelInfo::GameLevelInfo()
@@ -7100,6 +7651,7 @@ void GameLevelInfo::SharedCtor() {
   name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   program_ = 0u;
   realm_permissions_ = 0u;
+  last_logout_time_ms_ = GOOGLE_ULONGLONG(0);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -7157,6 +7709,7 @@ void GameLevelInfo::Clear() {
     }
     realm_permissions_ = 0u;
   }
+  last_logout_time_ms_ = GOOGLE_ULONGLONG(0);
 
 #undef OFFSET_OF_FIELD_
 #undef ZR_
@@ -7292,6 +7845,21 @@ bool GameLevelInfo::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(96)) goto parse_last_logout_time_ms;
+        break;
+      }
+
+      // optional uint64 last_logout_time_ms = 12;
+      case 12: {
+        if (tag == 96) {
+         parse_last_logout_time_ms:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &last_logout_time_ms_)));
+          set_has_last_logout_time_ms();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -7367,6 +7935,11 @@ void GameLevelInfo::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(11, this->realm_permissions(), output);
   }
 
+  // optional uint64 last_logout_time_ms = 12;
+  if (has_last_logout_time_ms()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(12, this->last_logout_time_ms(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -7425,6 +7998,11 @@ void GameLevelInfo::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(11, this->realm_permissions(), target);
   }
 
+  // optional uint64 last_logout_time_ms = 12;
+  if (has_last_logout_time_ms()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(12, this->last_logout_time_ms(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -7477,6 +8055,15 @@ int GameLevelInfo::ByteSize() const {
     }
 
   }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional uint64 last_logout_time_ms = 12;
+    if (has_last_logout_time_ms()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->last_logout_time_ms());
+    }
+
+  }
   // repeated .bgs.protocol.account.v1.AccountLicense licenses = 10;
   total_size += 1 * this->licenses_size();
   for (int i = 0; i < this->licenses_size(); i++) {
@@ -7534,6 +8121,11 @@ void GameLevelInfo::MergeFrom(const GameLevelInfo& from) {
       set_realm_permissions(from.realm_permissions());
     }
   }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_last_logout_time_ms()) {
+      set_last_logout_time_ms(from.last_logout_time_ms());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
@@ -7565,6 +8157,7 @@ void GameLevelInfo::Swap(GameLevelInfo* other) {
     std::swap(program_, other->program_);
     licenses_.Swap(&other->licenses_);
     std::swap(realm_permissions_, other->realm_permissions_);
+    std::swap(last_logout_time_ms_, other->last_logout_time_ms_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -10545,12 +11138,394 @@ void GameAccountList::Swap(GameAccountList* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int SecurityStatus::kSmsProtectEnabledFieldNumber;
+const int SecurityStatus::kEmailVerifiedFieldNumber;
+const int SecurityStatus::kAuthenticatorEnabledFieldNumber;
+const int SecurityStatus::kSqaEnabledFieldNumber;
+const int SecurityStatus::kAuthenticatorRequiredFieldNumber;
+#endif  // !_MSC_VER
+
+SecurityStatus::SecurityStatus()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:bgs.protocol.account.v1.SecurityStatus)
+}
+
+void SecurityStatus::InitAsDefaultInstance() {
+}
+
+SecurityStatus::SecurityStatus(const SecurityStatus& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+  // @@protoc_insertion_point(copy_constructor:bgs.protocol.account.v1.SecurityStatus)
+}
+
+void SecurityStatus::SharedCtor() {
+  _cached_size_ = 0;
+  sms_protect_enabled_ = false;
+  email_verified_ = false;
+  authenticator_enabled_ = false;
+  sqa_enabled_ = false;
+  authenticator_required_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+SecurityStatus::~SecurityStatus() {
+  // @@protoc_insertion_point(destructor:bgs.protocol.account.v1.SecurityStatus)
+  SharedDtor();
+}
+
+void SecurityStatus::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void SecurityStatus::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* SecurityStatus::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return SecurityStatus_descriptor_;
+}
+
+const SecurityStatus& SecurityStatus::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_account_5ftypes_2eproto();
+  return *default_instance_;
+}
+
+SecurityStatus* SecurityStatus::default_instance_ = NULL;
+
+SecurityStatus* SecurityStatus::New() const {
+  return new SecurityStatus;
+}
+
+void SecurityStatus::Clear() {
+#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
+  &reinterpret_cast<SecurityStatus*>(16)->f) - \
+   reinterpret_cast<char*>(16))
+
+#define ZR_(first, last) do {                              \
+    size_t f = OFFSET_OF_FIELD_(first);                    \
+    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
+    ::memset(&first, 0, n);                                \
+  } while (0)
+
+  if (_has_bits_[0 / 32] & 31) {
+    ZR_(sms_protect_enabled_, authenticator_required_);
+  }
+
+#undef OFFSET_OF_FIELD_
+#undef ZR_
+
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool SecurityStatus::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:bgs.protocol.account.v1.SecurityStatus)
+  for (;;) {
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional bool sms_protect_enabled = 1;
+      case 1: {
+        if (tag == 8) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &sms_protect_enabled_)));
+          set_has_sms_protect_enabled();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(16)) goto parse_email_verified;
+        break;
+      }
+
+      // optional bool email_verified = 2;
+      case 2: {
+        if (tag == 16) {
+         parse_email_verified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &email_verified_)));
+          set_has_email_verified();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(24)) goto parse_authenticator_enabled;
+        break;
+      }
+
+      // optional bool authenticator_enabled = 3;
+      case 3: {
+        if (tag == 24) {
+         parse_authenticator_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &authenticator_enabled_)));
+          set_has_authenticator_enabled();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(32)) goto parse_sqa_enabled;
+        break;
+      }
+
+      // optional bool sqa_enabled = 4;
+      case 4: {
+        if (tag == 32) {
+         parse_sqa_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &sqa_enabled_)));
+          set_has_sqa_enabled();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(40)) goto parse_authenticator_required;
+        break;
+      }
+
+      // optional bool authenticator_required = 5;
+      case 5: {
+        if (tag == 40) {
+         parse_authenticator_required:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &authenticator_required_)));
+          set_has_authenticator_required();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectAtEnd()) goto success;
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0 ||
+            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:bgs.protocol.account.v1.SecurityStatus)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:bgs.protocol.account.v1.SecurityStatus)
+  return false;
+#undef DO_
+}
+
+void SecurityStatus::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:bgs.protocol.account.v1.SecurityStatus)
+  // optional bool sms_protect_enabled = 1;
+  if (has_sms_protect_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->sms_protect_enabled(), output);
+  }
+
+  // optional bool email_verified = 2;
+  if (has_email_verified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->email_verified(), output);
+  }
+
+  // optional bool authenticator_enabled = 3;
+  if (has_authenticator_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->authenticator_enabled(), output);
+  }
+
+  // optional bool sqa_enabled = 4;
+  if (has_sqa_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->sqa_enabled(), output);
+  }
+
+  // optional bool authenticator_required = 5;
+  if (has_authenticator_required()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->authenticator_required(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:bgs.protocol.account.v1.SecurityStatus)
+}
+
+::google::protobuf::uint8* SecurityStatus::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.account.v1.SecurityStatus)
+  // optional bool sms_protect_enabled = 1;
+  if (has_sms_protect_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->sms_protect_enabled(), target);
+  }
+
+  // optional bool email_verified = 2;
+  if (has_email_verified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->email_verified(), target);
+  }
+
+  // optional bool authenticator_enabled = 3;
+  if (has_authenticator_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->authenticator_enabled(), target);
+  }
+
+  // optional bool sqa_enabled = 4;
+  if (has_sqa_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->sqa_enabled(), target);
+  }
+
+  // optional bool authenticator_required = 5;
+  if (has_authenticator_required()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->authenticator_required(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.account.v1.SecurityStatus)
+  return target;
+}
+
+int SecurityStatus::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional bool sms_protect_enabled = 1;
+    if (has_sms_protect_enabled()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool email_verified = 2;
+    if (has_email_verified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool authenticator_enabled = 3;
+    if (has_authenticator_enabled()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool sqa_enabled = 4;
+    if (has_sqa_enabled()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool authenticator_required = 5;
+    if (has_authenticator_required()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void SecurityStatus::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const SecurityStatus* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const SecurityStatus*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void SecurityStatus::MergeFrom(const SecurityStatus& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_sms_protect_enabled()) {
+      set_sms_protect_enabled(from.sms_protect_enabled());
+    }
+    if (from.has_email_verified()) {
+      set_email_verified(from.email_verified());
+    }
+    if (from.has_authenticator_enabled()) {
+      set_authenticator_enabled(from.authenticator_enabled());
+    }
+    if (from.has_sqa_enabled()) {
+      set_sqa_enabled(from.sqa_enabled());
+    }
+    if (from.has_authenticator_required()) {
+      set_authenticator_required(from.authenticator_required());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void SecurityStatus::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void SecurityStatus::CopyFrom(const SecurityStatus& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool SecurityStatus::IsInitialized() const {
+
+  return true;
+}
+
+void SecurityStatus::Swap(SecurityStatus* other) {
+  if (other != this) {
+    std::swap(sms_protect_enabled_, other->sms_protect_enabled_);
+    std::swap(email_verified_, other->email_verified_);
+    std::swap(authenticator_enabled_, other->authenticator_enabled_);
+    std::swap(sqa_enabled_, other->sqa_enabled_);
+    std::swap(authenticator_required_, other->authenticator_required_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata SecurityStatus::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = SecurityStatus_descriptor_;
+  metadata.reflection = SecurityStatus_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int AccountState::kAccountLevelInfoFieldNumber;
 const int AccountState::kPrivacyInfoFieldNumber;
 const int AccountState::kParentalControlInfoFieldNumber;
 const int AccountState::kGameLevelInfoFieldNumber;
 const int AccountState::kGameStatusFieldNumber;
 const int AccountState::kGameAccountsFieldNumber;
+const int AccountState::kSecurityStatusFieldNumber;
+const int AccountState::kGovernmentCurfewFieldNumber;
 #endif  // !_MSC_VER
 
 AccountState::AccountState()
@@ -10563,6 +11538,8 @@ void AccountState::InitAsDefaultInstance() {
   account_level_info_ = const_cast< ::bgs::protocol::account::v1::AccountLevelInfo*>(&::bgs::protocol::account::v1::AccountLevelInfo::default_instance());
   privacy_info_ = const_cast< ::bgs::protocol::account::v1::PrivacyInfo*>(&::bgs::protocol::account::v1::PrivacyInfo::default_instance());
   parental_control_info_ = const_cast< ::bgs::protocol::account::v1::ParentalControlInfo*>(&::bgs::protocol::account::v1::ParentalControlInfo::default_instance());
+  security_status_ = const_cast< ::bgs::protocol::account::v1::SecurityStatus*>(&::bgs::protocol::account::v1::SecurityStatus::default_instance());
+  government_curfew_ = const_cast< ::bgs::protocol::account::v1::PlayScheduleRestriction*>(&::bgs::protocol::account::v1::PlayScheduleRestriction::default_instance());
 }
 
 AccountState::AccountState(const AccountState& from)
@@ -10577,6 +11554,8 @@ void AccountState::SharedCtor() {
   account_level_info_ = NULL;
   privacy_info_ = NULL;
   parental_control_info_ = NULL;
+  security_status_ = NULL;
+  government_curfew_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -10590,6 +11569,8 @@ void AccountState::SharedDtor() {
     delete account_level_info_;
     delete privacy_info_;
     delete parental_control_info_;
+    delete security_status_;
+    delete government_curfew_;
   }
 }
 
@@ -10615,7 +11596,7 @@ AccountState* AccountState::New() const {
 }
 
 void AccountState::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 199) {
     if (has_account_level_info()) {
       if (account_level_info_ != NULL) account_level_info_->::bgs::protocol::account::v1::AccountLevelInfo::Clear();
     }
@@ -10625,6 +11606,12 @@ void AccountState::Clear() {
     if (has_parental_control_info()) {
       if (parental_control_info_ != NULL) parental_control_info_->::bgs::protocol::account::v1::ParentalControlInfo::Clear();
     }
+    if (has_security_status()) {
+      if (security_status_ != NULL) security_status_->::bgs::protocol::account::v1::SecurityStatus::Clear();
+    }
+    if (has_government_curfew()) {
+      if (government_curfew_ != NULL) government_curfew_->::bgs::protocol::account::v1::PlayScheduleRestriction::Clear();
+    }
   }
   game_level_info_.Clear();
   game_status_.Clear();
@@ -10719,6 +11706,32 @@ bool AccountState::MergePartialFromCodedStream(
           goto handle_unusual;
         }
         if (input->ExpectTag(58)) goto parse_game_accounts;
+        if (input->ExpectTag(66)) goto parse_security_status;
+        break;
+      }
+
+      // optional .bgs.protocol.account.v1.SecurityStatus security_status = 8;
+      case 8: {
+        if (tag == 66) {
+         parse_security_status:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_security_status()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(74)) goto parse_government_curfew;
+        break;
+      }
+
+      // optional .bgs.protocol.account.v1.PlayScheduleRestriction government_curfew = 9;
+      case 9: {
+        if (tag == 74) {
+         parse_government_curfew:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_government_curfew()));
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -10784,6 +11797,18 @@ void AccountState::SerializeWithCachedSizes(
       7, this->game_accounts(i), output);
   }
 
+  // optional .bgs.protocol.account.v1.SecurityStatus security_status = 8;
+  if (has_security_status()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->security_status(), output);
+  }
+
+  // optional .bgs.protocol.account.v1.PlayScheduleRestriction government_curfew = 9;
+  if (has_government_curfew()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->government_curfew(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -10836,6 +11861,20 @@ void AccountState::SerializeWithCachedSizes(
         7, this->game_accounts(i), target);
   }
 
+  // optional .bgs.protocol.account.v1.SecurityStatus security_status = 8;
+  if (has_security_status()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->security_status(), target);
+  }
+
+  // optional .bgs.protocol.account.v1.PlayScheduleRestriction government_curfew = 9;
+  if (has_government_curfew()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->government_curfew(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -10869,6 +11908,20 @@ int AccountState::ByteSize() const {
           this->parental_control_info());
     }
 
+    // optional .bgs.protocol.account.v1.SecurityStatus security_status = 8;
+    if (has_security_status()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->security_status());
+    }
+
+    // optional .bgs.protocol.account.v1.PlayScheduleRestriction government_curfew = 9;
+    if (has_government_curfew()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->government_curfew());
+    }
+
   }
   // repeated .bgs.protocol.account.v1.GameLevelInfo game_level_info = 5;
   total_size += 1 * this->game_level_info_size();
@@ -10932,6 +11985,12 @@ void AccountState::MergeFrom(const AccountState& from) {
     if (from.has_parental_control_info()) {
       mutable_parental_control_info()->::bgs::protocol::account::v1::ParentalControlInfo::MergeFrom(from.parental_control_info());
     }
+    if (from.has_security_status()) {
+      mutable_security_status()->::bgs::protocol::account::v1::SecurityStatus::MergeFrom(from.security_status());
+    }
+    if (from.has_government_curfew()) {
+      mutable_government_curfew()->::bgs::protocol::account::v1::PlayScheduleRestriction::MergeFrom(from.government_curfew());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -10966,6 +12025,8 @@ void AccountState::Swap(AccountState* other) {
     game_level_info_.Swap(&other->game_level_info_);
     game_status_.Swap(&other->game_status_);
     game_accounts_.Swap(&other->game_accounts_);
+    std::swap(security_status_, other->security_status_);
+    std::swap(government_curfew_, other->government_curfew_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -12190,6 +13251,7 @@ void AuthorizedData::Swap(AuthorizedData* other) {
 #ifndef _MSC_VER
 const int IgrId::kGameAccountFieldNumber;
 const int IgrId::kExternalIdFieldNumber;
+const int IgrId::kUuidFieldNumber;
 #endif  // !_MSC_VER
 
 IgrId::IgrId()
@@ -12201,6 +13263,7 @@ IgrId::IgrId()
 void IgrId::InitAsDefaultInstance() {
   IgrId_default_oneof_instance_->game_account_ = const_cast< ::bgs::protocol::account::v1::GameAccountHandle*>(&::bgs::protocol::account::v1::GameAccountHandle::default_instance());
   IgrId_default_oneof_instance_->external_id_ = 0u;
+  IgrId_default_oneof_instance_->uuid_ = &::google::protobuf::internal::GetEmptyStringAlreadyInited();
 }
 
 IgrId::IgrId(const IgrId& from)
@@ -12211,6 +13274,7 @@ IgrId::IgrId(const IgrId& from)
 }
 
 void IgrId::SharedCtor() {
+  ::google::protobuf::internal::GetEmptyString();
   _cached_size_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   clear_has_type();
@@ -12260,6 +13324,10 @@ void IgrId::clear_type() {
       // No need to clear
       break;
     }
+    case kUuid: {
+      delete type_.uuid_;
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -12308,6 +13376,23 @@ bool IgrId::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(26)) goto parse_uuid;
+        break;
+      }
+
+      // optional string uuid = 3;
+      case 3: {
+        if (tag == 26) {
+         parse_uuid:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_uuid()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->uuid().data(), this->uuid().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "uuid");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -12348,6 +13433,16 @@ void IgrId::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteFixed32(2, this->external_id(), output);
   }
 
+  // optional string uuid = 3;
+  if (has_uuid()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->uuid().data(), this->uuid().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "uuid");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      3, this->uuid(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -12370,6 +13465,17 @@ void IgrId::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(2, this->external_id(), target);
   }
 
+  // optional string uuid = 3;
+  if (has_uuid()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->uuid().data(), this->uuid().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "uuid");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->uuid(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -12394,6 +13500,13 @@ int IgrId::ByteSize() const {
       total_size += 1 + 4;
       break;
     }
+    // optional string uuid = 3;
+    case kUuid: {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->uuid());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -12432,6 +13545,10 @@ void IgrId::MergeFrom(const IgrId& from) {
       set_external_id(from.external_id());
       break;
     }
+    case kUuid: {
+      set_uuid(from.uuid());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
diff --git a/src/server/proto/Client/account_types.pb.h b/src/server/proto/Client/account_types.pb.h
index 6723f063e9b..628f27e4a7b 100644
--- a/src/server/proto/Client/account_types.pb.h
+++ b/src/server/proto/Client/account_types.pb.h
@@ -55,6 +55,7 @@ class SubscriberReference;
 class AccountLevelInfo;
 class PrivacyInfo;
 class ParentalControlInfo;
+class PlayScheduleRestriction;
 class GameLevelInfo;
 class GameTimeInfo;
 class GameTimeRemainingInfo;
@@ -65,6 +66,7 @@ class GameSessionUpdateInfo;
 class GameSessionLocation;
 class CAIS;
 class GameAccountList;
+class SecurityStatus;
 class AccountState;
 class AccountStateTagged;
 class GameAccountState;
@@ -480,6 +482,18 @@ class TC_PROTO_API AccountReference : public ::google::protobuf::Message {
   inline ::std::string* release_battle_tag();
   inline void set_allocated_battle_tag(::std::string* battle_tag);
 
+  // optional string phone_number = 5;
+  inline bool has_phone_number() const;
+  inline void clear_phone_number();
+  static const int kPhoneNumberFieldNumber = 5;
+  inline const ::std::string& phone_number() const;
+  inline void set_phone_number(const ::std::string& value);
+  inline void set_phone_number(const char* value);
+  inline void set_phone_number(const char* value, size_t size);
+  inline ::std::string* mutable_phone_number();
+  inline ::std::string* release_phone_number();
+  inline void set_allocated_phone_number(::std::string* phone_number);
+
   // optional uint32 region = 10 [default = 0];
   inline bool has_region() const;
   inline void clear_region();
@@ -497,6 +511,8 @@ class TC_PROTO_API AccountReference : public ::google::protobuf::Message {
   inline void clear_has_handle();
   inline void set_has_battle_tag();
   inline void clear_has_battle_tag();
+  inline void set_has_phone_number();
+  inline void clear_has_phone_number();
   inline void set_has_region();
   inline void clear_has_region();
 
@@ -509,6 +525,7 @@ class TC_PROTO_API AccountReference : public ::google::protobuf::Message {
   ::google::protobuf::uint32 id_;
   ::google::protobuf::uint32 region_;
   ::std::string* battle_tag_;
+  ::std::string* phone_number_;
   friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
   friend void protobuf_AssignDesc_account_5ftypes_2eproto();
   friend void protobuf_ShutdownFile_account_5ftypes_2eproto();
@@ -899,6 +916,13 @@ class TC_PROTO_API AccountFieldTags : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::RegionTag >*
       mutable_game_account_tags();
 
+  // optional fixed32 security_status_tag = 12;
+  inline bool has_security_status_tag() const;
+  inline void clear_security_status_tag();
+  static const int kSecurityStatusTagFieldNumber = 12;
+  inline ::google::protobuf::uint32 security_status_tag() const;
+  inline void set_security_status_tag(::google::protobuf::uint32 value);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.AccountFieldTags)
  private:
   inline void set_has_account_level_info_tag();
@@ -907,6 +931,8 @@ class TC_PROTO_API AccountFieldTags : public ::google::protobuf::Message {
   inline void clear_has_privacy_info_tag();
   inline void set_has_parental_control_info_tag();
   inline void clear_has_parental_control_info_tag();
+  inline void set_has_security_status_tag();
+  inline void clear_has_security_status_tag();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -916,8 +942,9 @@ class TC_PROTO_API AccountFieldTags : public ::google::protobuf::Message {
   ::google::protobuf::uint32 privacy_info_tag_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::ProgramTag > game_level_info_tags_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::ProgramTag > game_status_tags_;
-  ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::RegionTag > game_account_tags_;
   ::google::protobuf::uint32 parental_control_info_tag_;
+  ::google::protobuf::uint32 security_status_tag_;
+  ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::RegionTag > game_account_tags_;
   friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
   friend void protobuf_AssignDesc_account_5ftypes_2eproto();
   friend void protobuf_ShutdownFile_account_5ftypes_2eproto();
@@ -1138,6 +1165,13 @@ class TC_PROTO_API AccountFieldOptions : public ::google::protobuf::Message {
   inline bool field_game_accounts() const;
   inline void set_field_game_accounts(bool value);
 
+  // optional bool field_security_status = 9;
+  inline bool has_field_security_status() const;
+  inline void clear_field_security_status();
+  static const int kFieldSecurityStatusFieldNumber = 9;
+  inline bool field_security_status() const;
+  inline void set_field_security_status(bool value);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.AccountFieldOptions)
  private:
   inline void set_has_all_fields();
@@ -1154,6 +1188,8 @@ class TC_PROTO_API AccountFieldOptions : public ::google::protobuf::Message {
   inline void clear_has_field_game_status();
   inline void set_has_field_game_accounts();
   inline void clear_has_field_game_accounts();
+  inline void set_has_field_security_status();
+  inline void clear_has_field_security_status();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1166,6 +1202,7 @@ class TC_PROTO_API AccountFieldOptions : public ::google::protobuf::Message {
   bool field_game_level_info_;
   bool field_game_status_;
   bool field_game_accounts_;
+  bool field_security_status_;
   friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
   friend void protobuf_AssignDesc_account_5ftypes_2eproto();
   friend void protobuf_ShutdownFile_account_5ftypes_2eproto();
@@ -1626,6 +1663,18 @@ class TC_PROTO_API AccountLevelInfo : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 ratings_board_minimum_age() const;
   inline void set_ratings_board_minimum_age(::google::protobuf::uint32 value);
 
+  // optional string phone_number = 19;
+  inline bool has_phone_number() const;
+  inline void clear_phone_number();
+  static const int kPhoneNumberFieldNumber = 19;
+  inline const ::std::string& phone_number() const;
+  inline void set_phone_number(const ::std::string& value);
+  inline void set_phone_number(const char* value);
+  inline void set_phone_number(const char* value, size_t size);
+  inline ::std::string* mutable_phone_number();
+  inline ::std::string* release_phone_number();
+  inline void set_allocated_phone_number(::std::string* phone_number);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.AccountLevelInfo)
  private:
   inline void set_has_default_currency();
@@ -1656,6 +1705,8 @@ class TC_PROTO_API AccountLevelInfo : public ::google::protobuf::Message {
   inline void clear_has_is_sms_protected();
   inline void set_has_ratings_board_minimum_age();
   inline void clear_has_ratings_board_minimum_age();
+  inline void set_has_phone_number();
+  inline void clear_has_phone_number();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1676,6 +1727,7 @@ class TC_PROTO_API AccountLevelInfo : public ::google::protobuf::Message {
   bool test_account_;
   bool is_sms_protected_;
   ::google::protobuf::uint32 ratings_board_minimum_age_;
+  ::std::string* phone_number_;
   friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
   friend void protobuf_AssignDesc_account_5ftypes_2eproto();
   friend void protobuf_ShutdownFile_account_5ftypes_2eproto();
@@ -1986,6 +2038,103 @@ class TC_PROTO_API ParentalControlInfo : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class TC_PROTO_API PlayScheduleRestriction : public ::google::protobuf::Message {
+ public:
+  PlayScheduleRestriction();
+  virtual ~PlayScheduleRestriction();
+
+  PlayScheduleRestriction(const PlayScheduleRestriction& from);
+
+  inline PlayScheduleRestriction& operator=(const PlayScheduleRestriction& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const PlayScheduleRestriction& default_instance();
+
+  void Swap(PlayScheduleRestriction* other);
+
+  // implements Message ----------------------------------------------
+
+  PlayScheduleRestriction* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const PlayScheduleRestriction& from);
+  void MergeFrom(const PlayScheduleRestriction& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // repeated bool play_schedule = 1;
+  inline int play_schedule_size() const;
+  inline void clear_play_schedule();
+  static const int kPlayScheduleFieldNumber = 1;
+  inline bool play_schedule(int index) const;
+  inline void set_play_schedule(int index, bool value);
+  inline void add_play_schedule(bool value);
+  inline const ::google::protobuf::RepeatedField< bool >&
+      play_schedule() const;
+  inline ::google::protobuf::RepeatedField< bool >*
+      mutable_play_schedule();
+
+  // optional string timezone = 2;
+  inline bool has_timezone() const;
+  inline void clear_timezone();
+  static const int kTimezoneFieldNumber = 2;
+  inline const ::std::string& timezone() const;
+  inline void set_timezone(const ::std::string& value);
+  inline void set_timezone(const char* value);
+  inline void set_timezone(const char* value, size_t size);
+  inline ::std::string* mutable_timezone();
+  inline ::std::string* release_timezone();
+  inline void set_allocated_timezone(::std::string* timezone);
+
+  // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.PlayScheduleRestriction)
+ private:
+  inline void set_has_timezone();
+  inline void clear_has_timezone();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
+  ::google::protobuf::RepeatedField< bool > play_schedule_;
+  ::std::string* timezone_;
+  friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
+  friend void protobuf_AssignDesc_account_5ftypes_2eproto();
+  friend void protobuf_ShutdownFile_account_5ftypes_2eproto();
+
+  void InitAsDefaultInstance();
+  static PlayScheduleRestriction* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class TC_PROTO_API GameLevelInfo : public ::google::protobuf::Message {
  public:
   GameLevelInfo();
@@ -2105,6 +2254,13 @@ class TC_PROTO_API GameLevelInfo : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 realm_permissions() const;
   inline void set_realm_permissions(::google::protobuf::uint32 value);
 
+  // optional uint64 last_logout_time_ms = 12;
+  inline bool has_last_logout_time_ms() const;
+  inline void clear_last_logout_time_ms();
+  static const int kLastLogoutTimeMsFieldNumber = 12;
+  inline ::google::protobuf::uint64 last_logout_time_ms() const;
+  inline void set_last_logout_time_ms(::google::protobuf::uint64 value);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.GameLevelInfo)
  private:
   inline void set_has_is_trial();
@@ -2121,6 +2277,8 @@ class TC_PROTO_API GameLevelInfo : public ::google::protobuf::Message {
   inline void clear_has_program();
   inline void set_has_realm_permissions();
   inline void clear_has_realm_permissions();
+  inline void set_has_last_logout_time_ms();
+  inline void clear_has_last_logout_time_ms();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -2133,6 +2291,7 @@ class TC_PROTO_API GameLevelInfo : public ::google::protobuf::Message {
   ::google::protobuf::uint32 program_;
   ::std::string* name_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::AccountLicense > licenses_;
+  ::google::protobuf::uint64 last_logout_time_ms_;
   ::google::protobuf::uint32 realm_permissions_;
   friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
   friend void protobuf_AssignDesc_account_5ftypes_2eproto();
@@ -3098,6 +3257,125 @@ class TC_PROTO_API GameAccountList : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class TC_PROTO_API SecurityStatus : public ::google::protobuf::Message {
+ public:
+  SecurityStatus();
+  virtual ~SecurityStatus();
+
+  SecurityStatus(const SecurityStatus& from);
+
+  inline SecurityStatus& operator=(const SecurityStatus& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const SecurityStatus& default_instance();
+
+  void Swap(SecurityStatus* other);
+
+  // implements Message ----------------------------------------------
+
+  SecurityStatus* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const SecurityStatus& from);
+  void MergeFrom(const SecurityStatus& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional bool sms_protect_enabled = 1;
+  inline bool has_sms_protect_enabled() const;
+  inline void clear_sms_protect_enabled();
+  static const int kSmsProtectEnabledFieldNumber = 1;
+  inline bool sms_protect_enabled() const;
+  inline void set_sms_protect_enabled(bool value);
+
+  // optional bool email_verified = 2;
+  inline bool has_email_verified() const;
+  inline void clear_email_verified();
+  static const int kEmailVerifiedFieldNumber = 2;
+  inline bool email_verified() const;
+  inline void set_email_verified(bool value);
+
+  // optional bool authenticator_enabled = 3;
+  inline bool has_authenticator_enabled() const;
+  inline void clear_authenticator_enabled();
+  static const int kAuthenticatorEnabledFieldNumber = 3;
+  inline bool authenticator_enabled() const;
+  inline void set_authenticator_enabled(bool value);
+
+  // optional bool sqa_enabled = 4;
+  inline bool has_sqa_enabled() const;
+  inline void clear_sqa_enabled();
+  static const int kSqaEnabledFieldNumber = 4;
+  inline bool sqa_enabled() const;
+  inline void set_sqa_enabled(bool value);
+
+  // optional bool authenticator_required = 5;
+  inline bool has_authenticator_required() const;
+  inline void clear_authenticator_required();
+  static const int kAuthenticatorRequiredFieldNumber = 5;
+  inline bool authenticator_required() const;
+  inline void set_authenticator_required(bool value);
+
+  // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.SecurityStatus)
+ private:
+  inline void set_has_sms_protect_enabled();
+  inline void clear_has_sms_protect_enabled();
+  inline void set_has_email_verified();
+  inline void clear_has_email_verified();
+  inline void set_has_authenticator_enabled();
+  inline void clear_has_authenticator_enabled();
+  inline void set_has_sqa_enabled();
+  inline void clear_has_sqa_enabled();
+  inline void set_has_authenticator_required();
+  inline void clear_has_authenticator_required();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
+  bool sms_protect_enabled_;
+  bool email_verified_;
+  bool authenticator_enabled_;
+  bool sqa_enabled_;
+  bool authenticator_required_;
+  friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
+  friend void protobuf_AssignDesc_account_5ftypes_2eproto();
+  friend void protobuf_ShutdownFile_account_5ftypes_2eproto();
+
+  void InitAsDefaultInstance();
+  static SecurityStatus* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class TC_PROTO_API AccountState : public ::google::protobuf::Message {
  public:
   AccountState();
@@ -3214,6 +3492,24 @@ class TC_PROTO_API AccountState : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::GameAccountList >*
       mutable_game_accounts();
 
+  // optional .bgs.protocol.account.v1.SecurityStatus security_status = 8;
+  inline bool has_security_status() const;
+  inline void clear_security_status();
+  static const int kSecurityStatusFieldNumber = 8;
+  inline const ::bgs::protocol::account::v1::SecurityStatus& security_status() const;
+  inline ::bgs::protocol::account::v1::SecurityStatus* mutable_security_status();
+  inline ::bgs::protocol::account::v1::SecurityStatus* release_security_status();
+  inline void set_allocated_security_status(::bgs::protocol::account::v1::SecurityStatus* security_status);
+
+  // optional .bgs.protocol.account.v1.PlayScheduleRestriction government_curfew = 9;
+  inline bool has_government_curfew() const;
+  inline void clear_government_curfew();
+  static const int kGovernmentCurfewFieldNumber = 9;
+  inline const ::bgs::protocol::account::v1::PlayScheduleRestriction& government_curfew() const;
+  inline ::bgs::protocol::account::v1::PlayScheduleRestriction* mutable_government_curfew();
+  inline ::bgs::protocol::account::v1::PlayScheduleRestriction* release_government_curfew();
+  inline void set_allocated_government_curfew(::bgs::protocol::account::v1::PlayScheduleRestriction* government_curfew);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.AccountState)
  private:
   inline void set_has_account_level_info();
@@ -3222,6 +3518,10 @@ class TC_PROTO_API AccountState : public ::google::protobuf::Message {
   inline void clear_has_privacy_info();
   inline void set_has_parental_control_info();
   inline void clear_has_parental_control_info();
+  inline void set_has_security_status();
+  inline void clear_has_security_status();
+  inline void set_has_government_curfew();
+  inline void clear_has_government_curfew();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -3233,6 +3533,8 @@ class TC_PROTO_API AccountState : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::GameLevelInfo > game_level_info_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::GameStatus > game_status_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::GameAccountList > game_accounts_;
+  ::bgs::protocol::account::v1::SecurityStatus* security_status_;
+  ::bgs::protocol::account::v1::PlayScheduleRestriction* government_curfew_;
   friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto();
   friend void protobuf_AssignDesc_account_5ftypes_2eproto();
   friend void protobuf_ShutdownFile_account_5ftypes_2eproto();
@@ -3668,6 +3970,7 @@ class TC_PROTO_API IgrId : public ::google::protobuf::Message {
   enum TypeCase {
     kGameAccount = 1,
     kExternalId = 2,
+    kUuid = 3,
     TYPE_NOT_SET = 0,
   };
 
@@ -3717,11 +4020,24 @@ class TC_PROTO_API IgrId : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 external_id() const;
   inline void set_external_id(::google::protobuf::uint32 value);
 
+  // optional string uuid = 3;
+  inline bool has_uuid() const;
+  inline void clear_uuid();
+  static const int kUuidFieldNumber = 3;
+  inline const ::std::string& uuid() const;
+  inline void set_uuid(const ::std::string& value);
+  inline void set_uuid(const char* value);
+  inline void set_uuid(const char* value, size_t size);
+  inline ::std::string* mutable_uuid();
+  inline ::std::string* release_uuid();
+  inline void set_allocated_uuid(::std::string* uuid);
+
   inline TypeCase type_case() const;
   // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.IgrId)
  private:
   inline void set_has_game_account();
   inline void set_has_external_id();
+  inline void set_has_uuid();
 
   inline bool has_type();
   void clear_type();
@@ -3734,6 +4050,7 @@ class TC_PROTO_API IgrId : public ::google::protobuf::Message {
   union TypeUnion {
     ::bgs::protocol::account::v1::GameAccountHandle* game_account_;
     ::google::protobuf::uint32 external_id_;
+    ::std::string* uuid_;
   } type_;
   ::google::protobuf::uint32 _oneof_case_[1];
 
@@ -4221,15 +4538,91 @@ inline void AccountReference::set_allocated_battle_tag(::std::string* battle_tag
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.AccountReference.battle_tag)
 }
 
+// optional string phone_number = 5;
+inline bool AccountReference::has_phone_number() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void AccountReference::set_has_phone_number() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void AccountReference::clear_has_phone_number() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void AccountReference::clear_phone_number() {
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_->clear();
+  }
+  clear_has_phone_number();
+}
+inline const ::std::string& AccountReference::phone_number() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountReference.phone_number)
+  return *phone_number_;
+}
+inline void AccountReference::set_phone_number(const ::std::string& value) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountReference.phone_number)
+}
+inline void AccountReference::set_phone_number(const char* value) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.account.v1.AccountReference.phone_number)
+}
+inline void AccountReference::set_phone_number(const char* value, size_t size) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.account.v1.AccountReference.phone_number)
+}
+inline ::std::string* AccountReference::mutable_phone_number() {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.AccountReference.phone_number)
+  return phone_number_;
+}
+inline ::std::string* AccountReference::release_phone_number() {
+  clear_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = phone_number_;
+    phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void AccountReference::set_allocated_phone_number(::std::string* phone_number) {
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete phone_number_;
+  }
+  if (phone_number) {
+    set_has_phone_number();
+    phone_number_ = phone_number;
+  } else {
+    clear_has_phone_number();
+    phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.AccountReference.phone_number)
+}
+
 // optional uint32 region = 10 [default = 0];
 inline bool AccountReference::has_region() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
 inline void AccountReference::set_has_region() {
-  _has_bits_[0] |= 0x00000010u;
+  _has_bits_[0] |= 0x00000020u;
 }
 inline void AccountReference::clear_has_region() {
-  _has_bits_[0] &= ~0x00000010u;
+  _has_bits_[0] &= ~0x00000020u;
 }
 inline void AccountReference::clear_region() {
   region_ = 0u;
@@ -4601,6 +4994,30 @@ AccountFieldTags::mutable_game_account_tags() {
   return &game_account_tags_;
 }
 
+// optional fixed32 security_status_tag = 12;
+inline bool AccountFieldTags::has_security_status_tag() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void AccountFieldTags::set_has_security_status_tag() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void AccountFieldTags::clear_has_security_status_tag() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void AccountFieldTags::clear_security_status_tag() {
+  security_status_tag_ = 0u;
+  clear_has_security_status_tag();
+}
+inline ::google::protobuf::uint32 AccountFieldTags::security_status_tag() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountFieldTags.security_status_tag)
+  return security_status_tag_;
+}
+inline void AccountFieldTags::set_security_status_tag(::google::protobuf::uint32 value) {
+  set_has_security_status_tag();
+  security_status_tag_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountFieldTags.security_status_tag)
+}
+
 // -------------------------------------------------------------------
 
 // GameAccountFieldTags
@@ -4873,6 +5290,30 @@ inline void AccountFieldOptions::set_field_game_accounts(bool value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountFieldOptions.field_game_accounts)
 }
 
+// optional bool field_security_status = 9;
+inline bool AccountFieldOptions::has_field_security_status() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void AccountFieldOptions::set_has_field_security_status() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void AccountFieldOptions::clear_has_field_security_status() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void AccountFieldOptions::clear_field_security_status() {
+  field_security_status_ = false;
+  clear_has_field_security_status();
+}
+inline bool AccountFieldOptions::field_security_status() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountFieldOptions.field_security_status)
+  return field_security_status_;
+}
+inline void AccountFieldOptions::set_field_security_status(bool value) {
+  set_has_field_security_status();
+  field_security_status_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountFieldOptions.field_security_status)
+}
+
 // -------------------------------------------------------------------
 
 // GameAccountFieldOptions
@@ -5833,6 +6274,82 @@ inline void AccountLevelInfo::set_ratings_board_minimum_age(::google::protobuf::
   // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountLevelInfo.ratings_board_minimum_age)
 }
 
+// optional string phone_number = 19;
+inline bool AccountLevelInfo::has_phone_number() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void AccountLevelInfo::set_has_phone_number() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void AccountLevelInfo::clear_has_phone_number() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void AccountLevelInfo::clear_phone_number() {
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_->clear();
+  }
+  clear_has_phone_number();
+}
+inline const ::std::string& AccountLevelInfo::phone_number() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountLevelInfo.phone_number)
+  return *phone_number_;
+}
+inline void AccountLevelInfo::set_phone_number(const ::std::string& value) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountLevelInfo.phone_number)
+}
+inline void AccountLevelInfo::set_phone_number(const char* value) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.account.v1.AccountLevelInfo.phone_number)
+}
+inline void AccountLevelInfo::set_phone_number(const char* value, size_t size) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.account.v1.AccountLevelInfo.phone_number)
+}
+inline ::std::string* AccountLevelInfo::mutable_phone_number() {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.AccountLevelInfo.phone_number)
+  return phone_number_;
+}
+inline ::std::string* AccountLevelInfo::release_phone_number() {
+  clear_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = phone_number_;
+    phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void AccountLevelInfo::set_allocated_phone_number(::std::string* phone_number) {
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete phone_number_;
+  }
+  if (phone_number) {
+    set_has_phone_number();
+    phone_number_ = phone_number;
+  } else {
+    clear_has_phone_number();
+    phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.AccountLevelInfo.phone_number)
+}
+
 // -------------------------------------------------------------------
 
 // PrivacyInfo
@@ -6214,6 +6731,116 @@ inline void ParentalControlInfo::set_can_use_profile(bool value) {
 
 // -------------------------------------------------------------------
 
+// PlayScheduleRestriction
+
+// repeated bool play_schedule = 1;
+inline int PlayScheduleRestriction::play_schedule_size() const {
+  return play_schedule_.size();
+}
+inline void PlayScheduleRestriction::clear_play_schedule() {
+  play_schedule_.Clear();
+}
+inline bool PlayScheduleRestriction::play_schedule(int index) const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.PlayScheduleRestriction.play_schedule)
+  return play_schedule_.Get(index);
+}
+inline void PlayScheduleRestriction::set_play_schedule(int index, bool value) {
+  play_schedule_.Set(index, value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.PlayScheduleRestriction.play_schedule)
+}
+inline void PlayScheduleRestriction::add_play_schedule(bool value) {
+  play_schedule_.Add(value);
+  // @@protoc_insertion_point(field_add:bgs.protocol.account.v1.PlayScheduleRestriction.play_schedule)
+}
+inline const ::google::protobuf::RepeatedField< bool >&
+PlayScheduleRestriction::play_schedule() const {
+  // @@protoc_insertion_point(field_list:bgs.protocol.account.v1.PlayScheduleRestriction.play_schedule)
+  return play_schedule_;
+}
+inline ::google::protobuf::RepeatedField< bool >*
+PlayScheduleRestriction::mutable_play_schedule() {
+  // @@protoc_insertion_point(field_mutable_list:bgs.protocol.account.v1.PlayScheduleRestriction.play_schedule)
+  return &play_schedule_;
+}
+
+// optional string timezone = 2;
+inline bool PlayScheduleRestriction::has_timezone() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void PlayScheduleRestriction::set_has_timezone() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void PlayScheduleRestriction::clear_has_timezone() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void PlayScheduleRestriction::clear_timezone() {
+  if (timezone_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    timezone_->clear();
+  }
+  clear_has_timezone();
+}
+inline const ::std::string& PlayScheduleRestriction::timezone() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.PlayScheduleRestriction.timezone)
+  return *timezone_;
+}
+inline void PlayScheduleRestriction::set_timezone(const ::std::string& value) {
+  set_has_timezone();
+  if (timezone_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    timezone_ = new ::std::string;
+  }
+  timezone_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.PlayScheduleRestriction.timezone)
+}
+inline void PlayScheduleRestriction::set_timezone(const char* value) {
+  set_has_timezone();
+  if (timezone_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    timezone_ = new ::std::string;
+  }
+  timezone_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.account.v1.PlayScheduleRestriction.timezone)
+}
+inline void PlayScheduleRestriction::set_timezone(const char* value, size_t size) {
+  set_has_timezone();
+  if (timezone_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    timezone_ = new ::std::string;
+  }
+  timezone_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.account.v1.PlayScheduleRestriction.timezone)
+}
+inline ::std::string* PlayScheduleRestriction::mutable_timezone() {
+  set_has_timezone();
+  if (timezone_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    timezone_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.PlayScheduleRestriction.timezone)
+  return timezone_;
+}
+inline ::std::string* PlayScheduleRestriction::release_timezone() {
+  clear_has_timezone();
+  if (timezone_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = timezone_;
+    timezone_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void PlayScheduleRestriction::set_allocated_timezone(::std::string* timezone) {
+  if (timezone_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete timezone_;
+  }
+  if (timezone) {
+    set_has_timezone();
+    timezone_ = timezone;
+  } else {
+    clear_has_timezone();
+    timezone_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.PlayScheduleRestriction.timezone)
+}
+
+// -------------------------------------------------------------------
+
 // GameLevelInfo
 
 // optional bool is_trial = 4;
@@ -6466,6 +7093,30 @@ inline void GameLevelInfo::set_realm_permissions(::google::protobuf::uint32 valu
   // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.GameLevelInfo.realm_permissions)
 }
 
+// optional uint64 last_logout_time_ms = 12;
+inline bool GameLevelInfo::has_last_logout_time_ms() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void GameLevelInfo::set_has_last_logout_time_ms() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void GameLevelInfo::clear_has_last_logout_time_ms() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void GameLevelInfo::clear_last_logout_time_ms() {
+  last_logout_time_ms_ = GOOGLE_ULONGLONG(0);
+  clear_has_last_logout_time_ms();
+}
+inline ::google::protobuf::uint64 GameLevelInfo::last_logout_time_ms() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.GameLevelInfo.last_logout_time_ms)
+  return last_logout_time_ms_;
+}
+inline void GameLevelInfo::set_last_logout_time_ms(::google::protobuf::uint64 value) {
+  set_has_last_logout_time_ms();
+  last_logout_time_ms_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.GameLevelInfo.last_logout_time_ms)
+}
+
 // -------------------------------------------------------------------
 
 // GameTimeInfo
@@ -7461,6 +8112,130 @@ GameAccountList::mutable_handle() {
 
 // -------------------------------------------------------------------
 
+// SecurityStatus
+
+// optional bool sms_protect_enabled = 1;
+inline bool SecurityStatus::has_sms_protect_enabled() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void SecurityStatus::set_has_sms_protect_enabled() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void SecurityStatus::clear_has_sms_protect_enabled() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void SecurityStatus::clear_sms_protect_enabled() {
+  sms_protect_enabled_ = false;
+  clear_has_sms_protect_enabled();
+}
+inline bool SecurityStatus::sms_protect_enabled() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.SecurityStatus.sms_protect_enabled)
+  return sms_protect_enabled_;
+}
+inline void SecurityStatus::set_sms_protect_enabled(bool value) {
+  set_has_sms_protect_enabled();
+  sms_protect_enabled_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.SecurityStatus.sms_protect_enabled)
+}
+
+// optional bool email_verified = 2;
+inline bool SecurityStatus::has_email_verified() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void SecurityStatus::set_has_email_verified() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void SecurityStatus::clear_has_email_verified() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void SecurityStatus::clear_email_verified() {
+  email_verified_ = false;
+  clear_has_email_verified();
+}
+inline bool SecurityStatus::email_verified() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.SecurityStatus.email_verified)
+  return email_verified_;
+}
+inline void SecurityStatus::set_email_verified(bool value) {
+  set_has_email_verified();
+  email_verified_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.SecurityStatus.email_verified)
+}
+
+// optional bool authenticator_enabled = 3;
+inline bool SecurityStatus::has_authenticator_enabled() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void SecurityStatus::set_has_authenticator_enabled() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void SecurityStatus::clear_has_authenticator_enabled() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void SecurityStatus::clear_authenticator_enabled() {
+  authenticator_enabled_ = false;
+  clear_has_authenticator_enabled();
+}
+inline bool SecurityStatus::authenticator_enabled() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.SecurityStatus.authenticator_enabled)
+  return authenticator_enabled_;
+}
+inline void SecurityStatus::set_authenticator_enabled(bool value) {
+  set_has_authenticator_enabled();
+  authenticator_enabled_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.SecurityStatus.authenticator_enabled)
+}
+
+// optional bool sqa_enabled = 4;
+inline bool SecurityStatus::has_sqa_enabled() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void SecurityStatus::set_has_sqa_enabled() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void SecurityStatus::clear_has_sqa_enabled() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void SecurityStatus::clear_sqa_enabled() {
+  sqa_enabled_ = false;
+  clear_has_sqa_enabled();
+}
+inline bool SecurityStatus::sqa_enabled() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.SecurityStatus.sqa_enabled)
+  return sqa_enabled_;
+}
+inline void SecurityStatus::set_sqa_enabled(bool value) {
+  set_has_sqa_enabled();
+  sqa_enabled_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.SecurityStatus.sqa_enabled)
+}
+
+// optional bool authenticator_required = 5;
+inline bool SecurityStatus::has_authenticator_required() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void SecurityStatus::set_has_authenticator_required() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void SecurityStatus::clear_has_authenticator_required() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void SecurityStatus::clear_authenticator_required() {
+  authenticator_required_ = false;
+  clear_has_authenticator_required();
+}
+inline bool SecurityStatus::authenticator_required() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.SecurityStatus.authenticator_required)
+  return authenticator_required_;
+}
+inline void SecurityStatus::set_authenticator_required(bool value) {
+  set_has_authenticator_required();
+  authenticator_required_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.SecurityStatus.authenticator_required)
+}
+
+// -------------------------------------------------------------------
+
 // AccountState
 
 // optional .bgs.protocol.account.v1.AccountLevelInfo account_level_info = 1;
@@ -7676,6 +8451,88 @@ AccountState::mutable_game_accounts() {
   return &game_accounts_;
 }
 
+// optional .bgs.protocol.account.v1.SecurityStatus security_status = 8;
+inline bool AccountState::has_security_status() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void AccountState::set_has_security_status() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void AccountState::clear_has_security_status() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void AccountState::clear_security_status() {
+  if (security_status_ != NULL) security_status_->::bgs::protocol::account::v1::SecurityStatus::Clear();
+  clear_has_security_status();
+}
+inline const ::bgs::protocol::account::v1::SecurityStatus& AccountState::security_status() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountState.security_status)
+  return security_status_ != NULL ? *security_status_ : *default_instance_->security_status_;
+}
+inline ::bgs::protocol::account::v1::SecurityStatus* AccountState::mutable_security_status() {
+  set_has_security_status();
+  if (security_status_ == NULL) security_status_ = new ::bgs::protocol::account::v1::SecurityStatus;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.AccountState.security_status)
+  return security_status_;
+}
+inline ::bgs::protocol::account::v1::SecurityStatus* AccountState::release_security_status() {
+  clear_has_security_status();
+  ::bgs::protocol::account::v1::SecurityStatus* temp = security_status_;
+  security_status_ = NULL;
+  return temp;
+}
+inline void AccountState::set_allocated_security_status(::bgs::protocol::account::v1::SecurityStatus* security_status) {
+  delete security_status_;
+  security_status_ = security_status;
+  if (security_status) {
+    set_has_security_status();
+  } else {
+    clear_has_security_status();
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.AccountState.security_status)
+}
+
+// optional .bgs.protocol.account.v1.PlayScheduleRestriction government_curfew = 9;
+inline bool AccountState::has_government_curfew() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void AccountState::set_has_government_curfew() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void AccountState::clear_has_government_curfew() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void AccountState::clear_government_curfew() {
+  if (government_curfew_ != NULL) government_curfew_->::bgs::protocol::account::v1::PlayScheduleRestriction::Clear();
+  clear_has_government_curfew();
+}
+inline const ::bgs::protocol::account::v1::PlayScheduleRestriction& AccountState::government_curfew() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountState.government_curfew)
+  return government_curfew_ != NULL ? *government_curfew_ : *default_instance_->government_curfew_;
+}
+inline ::bgs::protocol::account::v1::PlayScheduleRestriction* AccountState::mutable_government_curfew() {
+  set_has_government_curfew();
+  if (government_curfew_ == NULL) government_curfew_ = new ::bgs::protocol::account::v1::PlayScheduleRestriction;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.AccountState.government_curfew)
+  return government_curfew_;
+}
+inline ::bgs::protocol::account::v1::PlayScheduleRestriction* AccountState::release_government_curfew() {
+  clear_has_government_curfew();
+  ::bgs::protocol::account::v1::PlayScheduleRestriction* temp = government_curfew_;
+  government_curfew_ = NULL;
+  return temp;
+}
+inline void AccountState::set_allocated_government_curfew(::bgs::protocol::account::v1::PlayScheduleRestriction* government_curfew) {
+  delete government_curfew_;
+  government_curfew_ = government_curfew;
+  if (government_curfew) {
+    set_has_government_curfew();
+  } else {
+    clear_has_government_curfew();
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.AccountState.government_curfew)
+}
+
 // -------------------------------------------------------------------
 
 // AccountStateTagged
@@ -8200,6 +9057,76 @@ inline void IgrId::set_external_id(::google::protobuf::uint32 value) {
   type_.external_id_ = value;
 }
 
+// optional string uuid = 3;
+inline bool IgrId::has_uuid() const {
+  return type_case() == kUuid;
+}
+inline void IgrId::set_has_uuid() {
+  _oneof_case_[0] = kUuid;
+}
+inline void IgrId::clear_uuid() {
+  if (has_uuid()) {
+    delete type_.uuid_;
+    clear_has_type();
+  }
+}
+inline const ::std::string& IgrId::uuid() const {
+  if (has_uuid()) {
+    return *type_.uuid_;
+  }
+  return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
+}
+inline void IgrId::set_uuid(const ::std::string& value) {
+  if (!has_uuid()) {
+    clear_type();
+    set_has_uuid();
+    type_.uuid_ = new ::std::string;
+  }
+  type_.uuid_->assign(value);
+}
+inline void IgrId::set_uuid(const char* value) {
+  if (!has_uuid()) {
+    clear_type();
+    set_has_uuid();
+    type_.uuid_ = new ::std::string;
+  }
+  type_.uuid_->assign(value);
+}
+inline void IgrId::set_uuid(const char* value, size_t size) {
+  if (!has_uuid()) {
+    clear_type();
+    set_has_uuid();
+    type_.uuid_ = new ::std::string;
+  }
+  type_.uuid_->assign(
+      reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* IgrId::mutable_uuid() {
+  if (!has_uuid()) {
+    clear_type();
+    set_has_uuid();
+    type_.uuid_ = new ::std::string;
+  }
+  return type_.uuid_;
+}
+inline ::std::string* IgrId::release_uuid() {
+  if (has_uuid()) {
+    clear_has_type();
+    ::std::string* temp = type_.uuid_;
+    type_.uuid_ = NULL;
+    return temp;
+  } else {
+    return NULL;
+  }
+}
+inline void IgrId::set_allocated_uuid(::std::string* uuid) {
+  clear_type();
+  if (uuid) {
+    set_has_uuid();
+    type_.uuid_ = uuid;
+  }
+}
+
 inline bool IgrId::has_type() {
   return type_case() != TYPE_NOT_SET;
 }
diff --git a/src/server/proto/Client/api/client/v2/report_service.pb.cc b/src/server/proto/Client/api/client/v2/report_service.pb.cc
index fcb131ba79c..ac5f7bb4b44 100644
--- a/src/server/proto/Client/api/client/v2/report_service.pb.cc
+++ b/src/server/proto/Client/api/client/v2/report_service.pb.cc
@@ -33,6 +33,7 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 struct SubmitReportRequestOneofInstance {
   const ::bgs::protocol::report::v2::UserOptions* user_options_;
   const ::bgs::protocol::report::v2::ClubOptions* club_options_;
+  const ::bgs::protocol::report::v2::EntityOptions* entity_options_;
 }* SubmitReportRequest_default_oneof_instance_ = NULL;
 const ::google::protobuf::ServiceDescriptor* ReportService_descriptor_ = NULL;
 
@@ -49,9 +50,9 @@ void protobuf_AssignDesc_api_2fclient_2fv2_2freport_5fservice_2eproto() {
   static const int SubmitReportRequest_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubmitReportRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubmitReportRequest, user_description_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubmitReportRequest, program_),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(SubmitReportRequest_default_oneof_instance_, user_options_),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(SubmitReportRequest_default_oneof_instance_, club_options_),
+    PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(SubmitReportRequest_default_oneof_instance_, entity_options_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubmitReportRequest, type_),
   };
   SubmitReportRequest_reflection_ =
@@ -105,18 +106,19 @@ void protobuf_AddDesc_api_2fclient_2fv2_2freport_5fservice_2eproto() {
     "\n\"api/client/v2/report_service.proto\022\026bg"
     "s.protocol.report.v2\032\023account_types.prot"
     "o\032 api/client/v2/report_types.proto\032\017rpc"
-    "_types.proto\"\200\002\n\023SubmitReportRequest\0224\n\010"
+    "_types.proto\"\250\002\n\023SubmitReportRequest\0224\n\010"
     "agent_id\030\001 \001(\0132\".bgs.protocol.account.v1"
-    ".AccountId\022\030\n\020user_description\030\002 \001(\t\022\017\n\007"
-    "program\030\003 \001(\r\022;\n\014user_options\030\n \001(\0132#.bg"
-    "s.protocol.report.v2.UserOptionsH\000\022;\n\014cl"
-    "ub_options\030\013 \001(\0132#.bgs.protocol.report.v"
-    "2.ClubOptionsH\000:\006\202\371+\002\020\001B\006\n\004type2\245\001\n\rRepo"
+    ".AccountId\022\030\n\020user_description\030\002 \001(\t\022;\n\014"
+    "user_options\030\n \001(\0132#.bgs.protocol.report"
+    ".v2.UserOptionsH\000\022;\n\014club_options\030\013 \001(\0132"
+    "#.bgs.protocol.report.v2.ClubOptionsH\000\022\?"
+    "\n\016entity_options\030\024 \001(\0132%.bgs.protocol.re"
+    "port.v2.EntityOptionsH\000B\006\n\004type2\245\001\n\rRepo"
     "rtService\022Y\n\014SubmitReport\022+.bgs.protocol"
     ".report.v2.SubmitReportRequest\032\024.bgs.pro"
     "tocol.NoData\"\006\202\371+\002\010\001\0329\202\371+/\n%bnet.protoco"
     "l.report.v2.ReportService*\006report\212\371+\002\020\001B"
-    "\005H\001\200\001\000", 566);
+    "\005H\001\200\001\000", 606);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "api/client/v2/report_service.proto", &protobuf_RegisterTypes);
   SubmitReportRequest::default_instance_ = new SubmitReportRequest();
@@ -137,9 +139,9 @@ struct StaticDescriptorInitializer_api_2fclient_2fv2_2freport_5fservice_2eproto
 #ifndef _MSC_VER
 const int SubmitReportRequest::kAgentIdFieldNumber;
 const int SubmitReportRequest::kUserDescriptionFieldNumber;
-const int SubmitReportRequest::kProgramFieldNumber;
 const int SubmitReportRequest::kUserOptionsFieldNumber;
 const int SubmitReportRequest::kClubOptionsFieldNumber;
+const int SubmitReportRequest::kEntityOptionsFieldNumber;
 #endif  // !_MSC_VER
 
 SubmitReportRequest::SubmitReportRequest()
@@ -152,6 +154,7 @@ void SubmitReportRequest::InitAsDefaultInstance() {
   agent_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance());
   SubmitReportRequest_default_oneof_instance_->user_options_ = const_cast< ::bgs::protocol::report::v2::UserOptions*>(&::bgs::protocol::report::v2::UserOptions::default_instance());
   SubmitReportRequest_default_oneof_instance_->club_options_ = const_cast< ::bgs::protocol::report::v2::ClubOptions*>(&::bgs::protocol::report::v2::ClubOptions::default_instance());
+  SubmitReportRequest_default_oneof_instance_->entity_options_ = const_cast< ::bgs::protocol::report::v2::EntityOptions*>(&::bgs::protocol::report::v2::EntityOptions::default_instance());
 }
 
 SubmitReportRequest::SubmitReportRequest(const SubmitReportRequest& from)
@@ -166,7 +169,6 @@ void SubmitReportRequest::SharedCtor() {
   _cached_size_ = 0;
   agent_id_ = NULL;
   user_description_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  program_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   clear_has_type();
 }
@@ -219,6 +221,10 @@ void SubmitReportRequest::clear_type() {
       delete type_.club_options_;
       break;
     }
+    case kEntityOptions: {
+      delete type_.entity_options_;
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -228,7 +234,7 @@ void SubmitReportRequest::clear_type() {
 
 
 void SubmitReportRequest::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear();
     }
@@ -237,7 +243,6 @@ void SubmitReportRequest::Clear() {
         user_description_->clear();
       }
     }
-    program_ = 0u;
   }
   clear_type();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -250,7 +255,7 @@ bool SubmitReportRequest::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:bgs.protocol.report.v2.SubmitReportRequest)
   for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
@@ -279,21 +284,6 @@ bool SubmitReportRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(24)) goto parse_program;
-        break;
-      }
-
-      // optional uint32 program = 3;
-      case 3: {
-        if (tag == 24) {
-         parse_program:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &program_)));
-          set_has_program();
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectTag(82)) goto parse_user_options;
         break;
       }
@@ -320,6 +310,19 @@ bool SubmitReportRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(162)) goto parse_entity_options;
+        break;
+      }
+
+      // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
+      case 20: {
+        if (tag == 162) {
+         parse_entity_options:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_entity_options()));
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -365,11 +368,6 @@ void SubmitReportRequest::SerializeWithCachedSizes(
       2, this->user_description(), output);
   }
 
-  // optional uint32 program = 3;
-  if (has_program()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->program(), output);
-  }
-
   // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
   if (has_user_options()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
@@ -382,6 +380,12 @@ void SubmitReportRequest::SerializeWithCachedSizes(
       11, this->club_options(), output);
   }
 
+  // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
+  if (has_entity_options()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      20, this->entity_options(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -410,11 +414,6 @@ void SubmitReportRequest::SerializeWithCachedSizes(
         2, this->user_description(), target);
   }
 
-  // optional uint32 program = 3;
-  if (has_program()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->program(), target);
-  }
-
   // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
   if (has_user_options()) {
     target = ::google::protobuf::internal::WireFormatLite::
@@ -429,6 +428,13 @@ void SubmitReportRequest::SerializeWithCachedSizes(
         11, this->club_options(), target);
   }
 
+  // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
+  if (has_entity_options()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        20, this->entity_options(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -455,13 +461,6 @@ int SubmitReportRequest::ByteSize() const {
           this->user_description());
     }
 
-    // optional uint32 program = 3;
-    if (has_program()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->program());
-    }
-
   }
   switch (type_case()) {
     // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
@@ -478,6 +477,13 @@ int SubmitReportRequest::ByteSize() const {
           this->club_options());
       break;
     }
+    // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
+    case kEntityOptions: {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->entity_options());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -516,6 +522,10 @@ void SubmitReportRequest::MergeFrom(const SubmitReportRequest& from) {
       mutable_club_options()->::bgs::protocol::report::v2::ClubOptions::MergeFrom(from.club_options());
       break;
     }
+    case kEntityOptions: {
+      mutable_entity_options()->::bgs::protocol::report::v2::EntityOptions::MergeFrom(from.entity_options());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -527,9 +537,6 @@ void SubmitReportRequest::MergeFrom(const SubmitReportRequest& from) {
     if (from.has_user_description()) {
       set_user_description(from.user_description());
     }
-    if (from.has_program()) {
-      set_program(from.program());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -561,7 +568,6 @@ void SubmitReportRequest::Swap(SubmitReportRequest* other) {
   if (other != this) {
     std::swap(agent_id_, other->agent_id_);
     std::swap(user_description_, other->user_description_);
-    std::swap(program_, other->program_);
     std::swap(type_, other->type_);
     std::swap(_oneof_case_[0], other->_oneof_case_[0]);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
diff --git a/src/server/proto/Client/api/client/v2/report_service.pb.h b/src/server/proto/Client/api/client/v2/report_service.pb.h
index 97a7f9ab57c..05f57e2ce00 100644
--- a/src/server/proto/Client/api/client/v2/report_service.pb.h
+++ b/src/server/proto/Client/api/client/v2/report_service.pb.h
@@ -73,6 +73,7 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   enum TypeCase {
     kUserOptions = 10,
     kClubOptions = 11,
+    kEntityOptions = 20,
     TYPE_NOT_SET = 0,
   };
 
@@ -127,13 +128,6 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   inline ::std::string* release_user_description();
   inline void set_allocated_user_description(::std::string* user_description);
 
-  // optional uint32 program = 3;
-  inline bool has_program() const;
-  inline void clear_program();
-  static const int kProgramFieldNumber = 3;
-  inline ::google::protobuf::uint32 program() const;
-  inline void set_program(::google::protobuf::uint32 value);
-
   // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
   inline bool has_user_options() const;
   inline void clear_user_options();
@@ -152,6 +146,15 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   inline ::bgs::protocol::report::v2::ClubOptions* release_club_options();
   inline void set_allocated_club_options(::bgs::protocol::report::v2::ClubOptions* club_options);
 
+  // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
+  inline bool has_entity_options() const;
+  inline void clear_entity_options();
+  static const int kEntityOptionsFieldNumber = 20;
+  inline const ::bgs::protocol::report::v2::EntityOptions& entity_options() const;
+  inline ::bgs::protocol::report::v2::EntityOptions* mutable_entity_options();
+  inline ::bgs::protocol::report::v2::EntityOptions* release_entity_options();
+  inline void set_allocated_entity_options(::bgs::protocol::report::v2::EntityOptions* entity_options);
+
   inline TypeCase type_case() const;
   // @@protoc_insertion_point(class_scope:bgs.protocol.report.v2.SubmitReportRequest)
  private:
@@ -159,10 +162,9 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   inline void clear_has_agent_id();
   inline void set_has_user_description();
   inline void clear_has_user_description();
-  inline void set_has_program();
-  inline void clear_has_program();
   inline void set_has_user_options();
   inline void set_has_club_options();
+  inline void set_has_entity_options();
 
   inline bool has_type();
   void clear_type();
@@ -174,10 +176,10 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::bgs::protocol::account::v1::AccountId* agent_id_;
   ::std::string* user_description_;
-  ::google::protobuf::uint32 program_;
   union TypeUnion {
     ::bgs::protocol::report::v2::UserOptions* user_options_;
     ::bgs::protocol::report::v2::ClubOptions* club_options_;
+    ::bgs::protocol::report::v2::EntityOptions* entity_options_;
   } type_;
   ::google::protobuf::uint32 _oneof_case_[1];
 
@@ -338,30 +340,6 @@ inline void SubmitReportRequest::set_allocated_user_description(::std::string* u
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.report.v2.SubmitReportRequest.user_description)
 }
 
-// optional uint32 program = 3;
-inline bool SubmitReportRequest::has_program() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void SubmitReportRequest::set_has_program() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void SubmitReportRequest::clear_has_program() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void SubmitReportRequest::clear_program() {
-  program_ = 0u;
-  clear_has_program();
-}
-inline ::google::protobuf::uint32 SubmitReportRequest::program() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.report.v2.SubmitReportRequest.program)
-  return program_;
-}
-inline void SubmitReportRequest::set_program(::google::protobuf::uint32 value) {
-  set_has_program();
-  program_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.report.v2.SubmitReportRequest.program)
-}
-
 // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
 inline bool SubmitReportRequest::has_user_options() const {
   return type_case() == kUserOptions;
@@ -448,6 +426,49 @@ inline void SubmitReportRequest::set_allocated_club_options(::bgs::protocol::rep
   }
 }
 
+// optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
+inline bool SubmitReportRequest::has_entity_options() const {
+  return type_case() == kEntityOptions;
+}
+inline void SubmitReportRequest::set_has_entity_options() {
+  _oneof_case_[0] = kEntityOptions;
+}
+inline void SubmitReportRequest::clear_entity_options() {
+  if (has_entity_options()) {
+    delete type_.entity_options_;
+    clear_has_type();
+  }
+}
+inline const ::bgs::protocol::report::v2::EntityOptions& SubmitReportRequest::entity_options() const {
+  return has_entity_options() ? *type_.entity_options_
+                      : ::bgs::protocol::report::v2::EntityOptions::default_instance();
+}
+inline ::bgs::protocol::report::v2::EntityOptions* SubmitReportRequest::mutable_entity_options() {
+  if (!has_entity_options()) {
+    clear_type();
+    set_has_entity_options();
+    type_.entity_options_ = new ::bgs::protocol::report::v2::EntityOptions;
+  }
+  return type_.entity_options_;
+}
+inline ::bgs::protocol::report::v2::EntityOptions* SubmitReportRequest::release_entity_options() {
+  if (has_entity_options()) {
+    clear_has_type();
+    ::bgs::protocol::report::v2::EntityOptions* temp = type_.entity_options_;
+    type_.entity_options_ = NULL;
+    return temp;
+  } else {
+    return NULL;
+  }
+}
+inline void SubmitReportRequest::set_allocated_entity_options(::bgs::protocol::report::v2::EntityOptions* entity_options) {
+  clear_type();
+  if (entity_options) {
+    set_has_entity_options();
+    type_.entity_options_ = entity_options;
+  }
+}
+
 inline bool SubmitReportRequest::has_type() {
   return type_case() != TYPE_NOT_SET;
 }
diff --git a/src/server/proto/Client/api/client/v2/report_types.pb.cc b/src/server/proto/Client/api/client/v2/report_types.pb.cc
index 5e25efc4973..fd4da47ea2b 100644
--- a/src/server/proto/Client/api/client/v2/report_types.pb.cc
+++ b/src/server/proto/Client/api/client/v2/report_types.pb.cc
@@ -37,6 +37,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* ClubOptions_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ClubOptions_reflection_ = NULL;
+const ::google::protobuf::Descriptor* EntityOptions_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  EntityOptions_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* IssueType_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* UserSource_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* ClubSource_descriptor_ = NULL;
@@ -105,6 +108,23 @@ void protobuf_AssignDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ClubOptions));
+  EntityOptions_descriptor_ = file->message_type(3);
+  static const int EntityOptions_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EntityOptions, entity_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EntityOptions, entity_type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EntityOptions, attribute_),
+  };
+  EntityOptions_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      EntityOptions_descriptor_,
+      EntityOptions::default_instance_,
+      EntityOptions_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EntityOptions, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EntityOptions, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(EntityOptions));
   IssueType_descriptor_ = file->enum_type(0);
   UserSource_descriptor_ = file->enum_type(1);
   ClubSource_descriptor_ = file->enum_type(2);
@@ -126,6 +146,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
     UserOptions_descriptor_, &UserOptions::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ClubOptions_descriptor_, &ClubOptions::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    EntityOptions_descriptor_, &EntityOptions::default_instance());
 }
 
 }  // namespace
@@ -138,6 +160,8 @@ void protobuf_ShutdownFile_api_2fclient_2fv2_2freport_5ftypes_2eproto() {
   delete UserOptions_reflection_;
   delete ClubOptions::default_instance_;
   delete ClubOptions_reflection_;
+  delete EntityOptions::default_instance_;
+  delete EntityOptions_reflection_;
 }
 
 void protobuf_AddDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto() {
@@ -146,46 +170,54 @@ void protobuf_AddDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto() {
   already_here = true;
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
+  ::bgs::protocol::v2::protobuf_AddDesc_api_2fclient_2fv2_2fattribute_5ftypes_2eproto();
   ::bgs::protocol::account::v1::protobuf_AddDesc_account_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_message_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n api/client/v2/report_types.proto\022\026bgs."
-    "protocol.report.v2\032\023account_types.proto\032"
-    "\017rpc_types.proto\032\023message_types.proto\"C\n"
-    "\nReportItem\022-\n\nmessage_id\030\001 \001(\0132\027.bgs.pr"
-    "otocol.MessageIdH\000B\006\n\004type\"\333\001\n\013UserOptio"
-    "ns\0225\n\ttarget_id\030\001 \001(\0132\".bgs.protocol.acc"
-    "ount.v1.AccountId\022/\n\004type\030\002 \001(\0162!.bgs.pr"
-    "otocol.report.v2.IssueType\0222\n\006source\030\003 \001"
-    "(\0162\".bgs.protocol.report.v2.UserSource\0220"
-    "\n\004item\030\004 \001(\0132\".bgs.protocol.report.v2.Re"
-    "portItem\"\310\001\n\013ClubOptions\022\017\n\007club_id\030\001 \001("
-    "\004\022\021\n\tstream_id\030\002 \001(\004\022/\n\004type\030\003 \001(\0162!.bgs"
-    ".protocol.report.v2.IssueType\0222\n\006source\030"
-    "\004 \001(\0162\".bgs.protocol.report.v2.ClubSourc"
-    "e\0220\n\004item\030\005 \001(\0132\".bgs.protocol.report.v2"
-    ".ReportItem*\215\001\n\tIssueType\022\023\n\017ISSUE_TYPE_"
-    "SPAM\020\000\022\031\n\025ISSUE_TYPE_HARASSMENT\020\001\022 \n\034ISS"
-    "UE_TYPE_OFFENSIVE_CONTENT\020\003\022\026\n\022ISSUE_TYP"
-    "E_HACKING\020\004\022\026\n\022ISSUE_TYPE_BOTTING\020\005*\301\001\n\n"
-    "UserSource\022\025\n\021USER_SOURCE_OTHER\020\000\022\027\n\023USE"
-    "R_SOURCE_WHISPER\020\001\022\027\n\023USER_SOURCE_PROFIL"
-    "E\020\002\022\032\n\026USER_SOURCE_BATTLE_TAG\020\003\022\024\n\020USER_"
-    "SOURCE_CHAT\020\004\022!\n\035USER_SOURCE_FRIEND_INVI"
-    "TATION\020\005\022\025\n\021USER_SOURCE_VOICE\020\006*t\n\nClubS"
-    "ource\022\025\n\021CLUB_SOURCE_OTHER\020\000\022\027\n\023CLUB_SOU"
-    "RCE_MESSAGE\020\001\022\031\n\025CLUB_SOURCE_CLUB_NAME\020\002"
-    "\022\033\n\027CLUB_SOURCE_STREAM_NAME\020\003B\005H\001\200\001\000", 1076);
+    "protocol.report.v2\032#api/client/v2/attrib"
+    "ute_types.proto\032\023account_types.proto\032\017rp"
+    "c_types.proto\032\023message_types.proto\"C\n\nRe"
+    "portItem\022-\n\nmessage_id\030\001 \001(\0132\027.bgs.proto"
+    "col.MessageIdH\000B\006\n\004type\"\333\001\n\013UserOptions\022"
+    "5\n\ttarget_id\030\001 \001(\0132\".bgs.protocol.accoun"
+    "t.v1.AccountId\022/\n\004type\030\002 \001(\0162!.bgs.proto"
+    "col.report.v2.IssueType\0222\n\006source\030\003 \001(\0162"
+    "\".bgs.protocol.report.v2.UserSource\0220\n\004i"
+    "tem\030\004 \001(\0132\".bgs.protocol.report.v2.Repor"
+    "tItem\"\310\001\n\013ClubOptions\022\017\n\007club_id\030\001 \001(\004\022\021"
+    "\n\tstream_id\030\002 \001(\004\022/\n\004type\030\003 \001(\0162!.bgs.pr"
+    "otocol.report.v2.IssueType\0222\n\006source\030\004 \001"
+    "(\0162\".bgs.protocol.report.v2.ClubSource\0220"
+    "\n\004item\030\005 \001(\0132\".bgs.protocol.report.v2.Re"
+    "portItem\"\203\001\n\rEntityOptions\022 \n\tentity_id\030"
+    "\001 \001(\tB\r\212\371+\t\"\007\n\005\010\001\020\310\001\022!\n\013entity_type\030\002 \001("
+    "\tB\014\212\371+\010\"\006\n\004\010\001\020d\022-\n\tattribute\030\005 \003(\0132\032.bgs"
+    ".protocol.v2.Attribute*\215\001\n\tIssueType\022\023\n\017"
+    "ISSUE_TYPE_SPAM\020\000\022\031\n\025ISSUE_TYPE_HARASSME"
+    "NT\020\001\022 \n\034ISSUE_TYPE_OFFENSIVE_CONTENT\020\003\022\026"
+    "\n\022ISSUE_TYPE_HACKING\020\004\022\026\n\022ISSUE_TYPE_BOT"
+    "TING\020\005*\301\001\n\nUserSource\022\025\n\021USER_SOURCE_OTH"
+    "ER\020\000\022\027\n\023USER_SOURCE_WHISPER\020\001\022\027\n\023USER_SO"
+    "URCE_PROFILE\020\002\022\032\n\026USER_SOURCE_BATTLE_TAG"
+    "\020\003\022\024\n\020USER_SOURCE_CHAT\020\004\022!\n\035USER_SOURCE_"
+    "FRIEND_INVITATION\020\005\022\025\n\021USER_SOURCE_VOICE"
+    "\020\006*t\n\nClubSource\022\025\n\021CLUB_SOURCE_OTHER\020\000\022"
+    "\027\n\023CLUB_SOURCE_MESSAGE\020\001\022\031\n\025CLUB_SOURCE_"
+    "CLUB_NAME\020\002\022\033\n\027CLUB_SOURCE_STREAM_NAME\020\003"
+    "B\005H\001\200\001\000", 1247);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "api/client/v2/report_types.proto", &protobuf_RegisterTypes);
   ReportItem::default_instance_ = new ReportItem();
   ReportItem_default_oneof_instance_ = new ReportItemOneofInstance;
   UserOptions::default_instance_ = new UserOptions();
   ClubOptions::default_instance_ = new ClubOptions();
+  EntityOptions::default_instance_ = new EntityOptions();
   ReportItem::default_instance_->InitAsDefaultInstance();
   UserOptions::default_instance_->InitAsDefaultInstance();
   ClubOptions::default_instance_->InitAsDefaultInstance();
+  EntityOptions::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_api_2fclient_2fv2_2freport_5ftypes_2eproto);
 }
 
@@ -1284,6 +1316,349 @@ void ClubOptions::Swap(ClubOptions* other) {
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int EntityOptions::kEntityIdFieldNumber;
+const int EntityOptions::kEntityTypeFieldNumber;
+const int EntityOptions::kAttributeFieldNumber;
+#endif  // !_MSC_VER
+
+EntityOptions::EntityOptions()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:bgs.protocol.report.v2.EntityOptions)
+}
+
+void EntityOptions::InitAsDefaultInstance() {
+}
+
+EntityOptions::EntityOptions(const EntityOptions& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+  // @@protoc_insertion_point(copy_constructor:bgs.protocol.report.v2.EntityOptions)
+}
+
+void EntityOptions::SharedCtor() {
+  ::google::protobuf::internal::GetEmptyString();
+  _cached_size_ = 0;
+  entity_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  entity_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+EntityOptions::~EntityOptions() {
+  // @@protoc_insertion_point(destructor:bgs.protocol.report.v2.EntityOptions)
+  SharedDtor();
+}
+
+void EntityOptions::SharedDtor() {
+  if (entity_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete entity_id_;
+  }
+  if (entity_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete entity_type_;
+  }
+  if (this != default_instance_) {
+  }
+}
+
+void EntityOptions::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* EntityOptions::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return EntityOptions_descriptor_;
+}
+
+const EntityOptions& EntityOptions::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto();
+  return *default_instance_;
+}
+
+EntityOptions* EntityOptions::default_instance_ = NULL;
+
+EntityOptions* EntityOptions::New() const {
+  return new EntityOptions;
+}
+
+void EntityOptions::Clear() {
+  if (_has_bits_[0 / 32] & 3) {
+    if (has_entity_id()) {
+      if (entity_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        entity_id_->clear();
+      }
+    }
+    if (has_entity_type()) {
+      if (entity_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        entity_type_->clear();
+      }
+    }
+  }
+  attribute_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool EntityOptions::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:bgs.protocol.report.v2.EntityOptions)
+  for (;;) {
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional string entity_id = 1;
+      case 1: {
+        if (tag == 10) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_entity_id()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->entity_id().data(), this->entity_id().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "entity_id");
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(18)) goto parse_entity_type;
+        break;
+      }
+
+      // optional string entity_type = 2;
+      case 2: {
+        if (tag == 18) {
+         parse_entity_type:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_entity_type()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->entity_type().data(), this->entity_type().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "entity_type");
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(42)) goto parse_attribute;
+        break;
+      }
+
+      // repeated .bgs.protocol.v2.Attribute attribute = 5;
+      case 5: {
+        if (tag == 42) {
+         parse_attribute:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_attribute()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(42)) goto parse_attribute;
+        if (input->ExpectAtEnd()) goto success;
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0 ||
+            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:bgs.protocol.report.v2.EntityOptions)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:bgs.protocol.report.v2.EntityOptions)
+  return false;
+#undef DO_
+}
+
+void EntityOptions::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:bgs.protocol.report.v2.EntityOptions)
+  // optional string entity_id = 1;
+  if (has_entity_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->entity_id().data(), this->entity_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "entity_id");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      1, this->entity_id(), output);
+  }
+
+  // optional string entity_type = 2;
+  if (has_entity_type()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->entity_type().data(), this->entity_type().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "entity_type");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      2, this->entity_type(), output);
+  }
+
+  // repeated .bgs.protocol.v2.Attribute attribute = 5;
+  for (int i = 0; i < this->attribute_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->attribute(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:bgs.protocol.report.v2.EntityOptions)
+}
+
+::google::protobuf::uint8* EntityOptions::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.report.v2.EntityOptions)
+  // optional string entity_id = 1;
+  if (has_entity_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->entity_id().data(), this->entity_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "entity_id");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->entity_id(), target);
+  }
+
+  // optional string entity_type = 2;
+  if (has_entity_type()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->entity_type().data(), this->entity_type().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "entity_type");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->entity_type(), target);
+  }
+
+  // repeated .bgs.protocol.v2.Attribute attribute = 5;
+  for (int i = 0; i < this->attribute_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->attribute(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.report.v2.EntityOptions)
+  return target;
+}
+
+int EntityOptions::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional string entity_id = 1;
+    if (has_entity_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->entity_id());
+    }
+
+    // optional string entity_type = 2;
+    if (has_entity_type()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->entity_type());
+    }
+
+  }
+  // repeated .bgs.protocol.v2.Attribute attribute = 5;
+  total_size += 1 * this->attribute_size();
+  for (int i = 0; i < this->attribute_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->attribute(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void EntityOptions::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const EntityOptions* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const EntityOptions*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void EntityOptions::MergeFrom(const EntityOptions& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  attribute_.MergeFrom(from.attribute_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_entity_id()) {
+      set_entity_id(from.entity_id());
+    }
+    if (from.has_entity_type()) {
+      set_entity_type(from.entity_type());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void EntityOptions::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void EntityOptions::CopyFrom(const EntityOptions& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool EntityOptions::IsInitialized() const {
+
+  return true;
+}
+
+void EntityOptions::Swap(EntityOptions* other) {
+  if (other != this) {
+    std::swap(entity_id_, other->entity_id_);
+    std::swap(entity_type_, other->entity_type_);
+    attribute_.Swap(&other->attribute_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata EntityOptions::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = EntityOptions_descriptor_;
+  metadata.reflection = EntityOptions_reflection_;
+  return metadata;
+}
+
+
 // @@protoc_insertion_point(namespace_scope)
 
 }  // namespace v2
diff --git a/src/server/proto/Client/api/client/v2/report_types.pb.h b/src/server/proto/Client/api/client/v2/report_types.pb.h
index 3dbc57aab68..d0fbfe2b936 100644
--- a/src/server/proto/Client/api/client/v2/report_types.pb.h
+++ b/src/server/proto/Client/api/client/v2/report_types.pb.h
@@ -25,6 +25,7 @@
 #include <google/protobuf/extension_set.h>
 #include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
+#include "api/client/v2/attribute_types.pb.h"
 #include "account_types.pb.h"
 #include "rpc_types.pb.h"
 #include "message_types.pb.h"
@@ -44,6 +45,7 @@ void protobuf_ShutdownFile_api_2fclient_2fv2_2freport_5ftypes_2eproto();
 class ReportItem;
 class UserOptions;
 class ClubOptions;
+class EntityOptions;
 
 enum IssueType {
   ISSUE_TYPE_SPAM = 0,
@@ -440,6 +442,118 @@ class TC_PROTO_API ClubOptions : public ::google::protobuf::Message {
   void InitAsDefaultInstance();
   static ClubOptions* default_instance_;
 };
+// -------------------------------------------------------------------
+
+class TC_PROTO_API EntityOptions : public ::google::protobuf::Message {
+ public:
+  EntityOptions();
+  virtual ~EntityOptions();
+
+  EntityOptions(const EntityOptions& from);
+
+  inline EntityOptions& operator=(const EntityOptions& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const EntityOptions& default_instance();
+
+  void Swap(EntityOptions* other);
+
+  // implements Message ----------------------------------------------
+
+  EntityOptions* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const EntityOptions& from);
+  void MergeFrom(const EntityOptions& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional string entity_id = 1;
+  inline bool has_entity_id() const;
+  inline void clear_entity_id();
+  static const int kEntityIdFieldNumber = 1;
+  inline const ::std::string& entity_id() const;
+  inline void set_entity_id(const ::std::string& value);
+  inline void set_entity_id(const char* value);
+  inline void set_entity_id(const char* value, size_t size);
+  inline ::std::string* mutable_entity_id();
+  inline ::std::string* release_entity_id();
+  inline void set_allocated_entity_id(::std::string* entity_id);
+
+  // optional string entity_type = 2;
+  inline bool has_entity_type() const;
+  inline void clear_entity_type();
+  static const int kEntityTypeFieldNumber = 2;
+  inline const ::std::string& entity_type() const;
+  inline void set_entity_type(const ::std::string& value);
+  inline void set_entity_type(const char* value);
+  inline void set_entity_type(const char* value, size_t size);
+  inline ::std::string* mutable_entity_type();
+  inline ::std::string* release_entity_type();
+  inline void set_allocated_entity_type(::std::string* entity_type);
+
+  // repeated .bgs.protocol.v2.Attribute attribute = 5;
+  inline int attribute_size() const;
+  inline void clear_attribute();
+  static const int kAttributeFieldNumber = 5;
+  inline const ::bgs::protocol::v2::Attribute& attribute(int index) const;
+  inline ::bgs::protocol::v2::Attribute* mutable_attribute(int index);
+  inline ::bgs::protocol::v2::Attribute* add_attribute();
+  inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::v2::Attribute >&
+      attribute() const;
+  inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::v2::Attribute >*
+      mutable_attribute();
+
+  // @@protoc_insertion_point(class_scope:bgs.protocol.report.v2.EntityOptions)
+ private:
+  inline void set_has_entity_id();
+  inline void clear_has_entity_id();
+  inline void set_has_entity_type();
+  inline void clear_has_entity_type();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
+  ::std::string* entity_id_;
+  ::std::string* entity_type_;
+  ::google::protobuf::RepeatedPtrField< ::bgs::protocol::v2::Attribute > attribute_;
+  friend void TC_PROTO_API protobuf_AddDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto();
+  friend void protobuf_AssignDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto();
+  friend void protobuf_ShutdownFile_api_2fclient_2fv2_2freport_5ftypes_2eproto();
+
+  void InitAsDefaultInstance();
+  static EntityOptions* default_instance_;
+};
 // ===================================================================
 
 
@@ -781,6 +895,192 @@ inline void ClubOptions::set_allocated_item(::bgs::protocol::report::v2::ReportI
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.report.v2.ClubOptions.item)
 }
 
+// -------------------------------------------------------------------
+
+// EntityOptions
+
+// optional string entity_id = 1;
+inline bool EntityOptions::has_entity_id() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void EntityOptions::set_has_entity_id() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void EntityOptions::clear_has_entity_id() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void EntityOptions::clear_entity_id() {
+  if (entity_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_id_->clear();
+  }
+  clear_has_entity_id();
+}
+inline const ::std::string& EntityOptions::entity_id() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.report.v2.EntityOptions.entity_id)
+  return *entity_id_;
+}
+inline void EntityOptions::set_entity_id(const ::std::string& value) {
+  set_has_entity_id();
+  if (entity_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_id_ = new ::std::string;
+  }
+  entity_id_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.report.v2.EntityOptions.entity_id)
+}
+inline void EntityOptions::set_entity_id(const char* value) {
+  set_has_entity_id();
+  if (entity_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_id_ = new ::std::string;
+  }
+  entity_id_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.report.v2.EntityOptions.entity_id)
+}
+inline void EntityOptions::set_entity_id(const char* value, size_t size) {
+  set_has_entity_id();
+  if (entity_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_id_ = new ::std::string;
+  }
+  entity_id_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.report.v2.EntityOptions.entity_id)
+}
+inline ::std::string* EntityOptions::mutable_entity_id() {
+  set_has_entity_id();
+  if (entity_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_id_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.report.v2.EntityOptions.entity_id)
+  return entity_id_;
+}
+inline ::std::string* EntityOptions::release_entity_id() {
+  clear_has_entity_id();
+  if (entity_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = entity_id_;
+    entity_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void EntityOptions::set_allocated_entity_id(::std::string* entity_id) {
+  if (entity_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete entity_id_;
+  }
+  if (entity_id) {
+    set_has_entity_id();
+    entity_id_ = entity_id;
+  } else {
+    clear_has_entity_id();
+    entity_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.report.v2.EntityOptions.entity_id)
+}
+
+// optional string entity_type = 2;
+inline bool EntityOptions::has_entity_type() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void EntityOptions::set_has_entity_type() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void EntityOptions::clear_has_entity_type() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void EntityOptions::clear_entity_type() {
+  if (entity_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_type_->clear();
+  }
+  clear_has_entity_type();
+}
+inline const ::std::string& EntityOptions::entity_type() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.report.v2.EntityOptions.entity_type)
+  return *entity_type_;
+}
+inline void EntityOptions::set_entity_type(const ::std::string& value) {
+  set_has_entity_type();
+  if (entity_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_type_ = new ::std::string;
+  }
+  entity_type_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.report.v2.EntityOptions.entity_type)
+}
+inline void EntityOptions::set_entity_type(const char* value) {
+  set_has_entity_type();
+  if (entity_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_type_ = new ::std::string;
+  }
+  entity_type_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.report.v2.EntityOptions.entity_type)
+}
+inline void EntityOptions::set_entity_type(const char* value, size_t size) {
+  set_has_entity_type();
+  if (entity_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_type_ = new ::std::string;
+  }
+  entity_type_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.report.v2.EntityOptions.entity_type)
+}
+inline ::std::string* EntityOptions::mutable_entity_type() {
+  set_has_entity_type();
+  if (entity_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    entity_type_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.report.v2.EntityOptions.entity_type)
+  return entity_type_;
+}
+inline ::std::string* EntityOptions::release_entity_type() {
+  clear_has_entity_type();
+  if (entity_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = entity_type_;
+    entity_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void EntityOptions::set_allocated_entity_type(::std::string* entity_type) {
+  if (entity_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete entity_type_;
+  }
+  if (entity_type) {
+    set_has_entity_type();
+    entity_type_ = entity_type;
+  } else {
+    clear_has_entity_type();
+    entity_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.report.v2.EntityOptions.entity_type)
+}
+
+// repeated .bgs.protocol.v2.Attribute attribute = 5;
+inline int EntityOptions::attribute_size() const {
+  return attribute_.size();
+}
+inline void EntityOptions::clear_attribute() {
+  attribute_.Clear();
+}
+inline const ::bgs::protocol::v2::Attribute& EntityOptions::attribute(int index) const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.report.v2.EntityOptions.attribute)
+  return attribute_.Get(index);
+}
+inline ::bgs::protocol::v2::Attribute* EntityOptions::mutable_attribute(int index) {
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.report.v2.EntityOptions.attribute)
+  return attribute_.Mutable(index);
+}
+inline ::bgs::protocol::v2::Attribute* EntityOptions::add_attribute() {
+  // @@protoc_insertion_point(field_add:bgs.protocol.report.v2.EntityOptions.attribute)
+  return attribute_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::v2::Attribute >&
+EntityOptions::attribute() const {
+  // @@protoc_insertion_point(field_list:bgs.protocol.report.v2.EntityOptions.attribute)
+  return attribute_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::v2::Attribute >*
+EntityOptions::mutable_attribute() {
+  // @@protoc_insertion_point(field_mutable_list:bgs.protocol.report.v2.EntityOptions.attribute)
+  return &attribute_;
+}
+
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/src/server/proto/Client/authentication_service.pb.cc b/src/server/proto/Client/authentication_service.pb.cc
index 34cb995e1ee..112bb107f67 100644
--- a/src/server/proto/Client/authentication_service.pb.cc
+++ b/src/server/proto/Client/authentication_service.pb.cc
@@ -148,7 +148,7 @@ void protobuf_AssignDesc_authentication_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ModuleMessageRequest));
   LogonRequest_descriptor_ = file->message_type(3);
-  static const int LogonRequest_offsets_[11] = {
+  static const int LogonRequest_offsets_[12] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonRequest, program_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonRequest, platform_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonRequest, locale_),
@@ -160,6 +160,7 @@ void protobuf_AssignDesc_authentication_5fservice_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonRequest, cached_web_credentials_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonRequest, user_agent_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonRequest, device_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonRequest, phone_number_),
   };
   LogonRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -556,106 +557,107 @@ void protobuf_AddDesc_authentication_5fservice_2eproto() {
     "rotocol.ContentHandle\022\017\n\007message\030\002 \001(\014\"7"
     "\n\022ModuleNotification\022\021\n\tmodule_id\030\002 \001(\005\022"
     "\016\n\006result\030\003 \001(\r\":\n\024ModuleMessageRequest\022"
-    "\021\n\tmodule_id\030\001 \002(\005\022\017\n\007message\030\002 \001(\014\"\216\002\n\014"
+    "\021\n\tmodule_id\030\001 \002(\005\022\017\n\007message\030\002 \001(\014\"\264\002\n\014"
     "LogonRequest\022\017\n\007program\030\001 \001(\t\022\020\n\010platfor"
-    "m\030\002 \001(\t\022\016\n\006locale\030\003 \001(\t\022\r\n\005email\030\004 \001(\t\022\017"
-    "\n\007version\030\005 \001(\t\022\033\n\023application_version\030\006"
-    " \001(\005\022\027\n\017public_computer\030\007 \001(\010\022.\n\037allow_l"
-    "ogon_queue_notifications\030\n \001(\010:\005false\022\036\n"
-    "\026cached_web_credentials\030\014 \001(\014\022\022\n\nuser_ag"
-    "ent\030\016 \001(\t\022\021\n\tdevice_id\030\017 \001(\t\"\255\002\n\013LogonRe"
-    "sult\022\022\n\nerror_code\030\001 \002(\r\022*\n\naccount_id\030\002"
-    " \001(\0132\026.bgs.protocol.EntityId\022/\n\017game_acc"
-    "ount_id\030\003 \003(\0132\026.bgs.protocol.EntityId\022\r\n"
-    "\005email\030\004 \001(\t\022\030\n\020available_region\030\005 \003(\r\022\030"
-    "\n\020connected_region\030\006 \001(\r\022\022\n\nbattle_tag\030\007"
-    " \001(\t\022\025\n\rgeoip_country\030\010 \001(\t\022\023\n\013session_k"
-    "ey\030\t \001(\014\022\027\n\017restricted_mode\030\n \001(\010\022\021\n\tcli"
-    "ent_id\030\013 \001(\t\"*\n\027GenerateSSOTokenRequest\022"
-    "\017\n\007program\030\001 \001(\007\">\n\030GenerateSSOTokenResp"
-    "onse\022\016\n\006sso_id\030\001 \001(\014\022\022\n\nsso_secret\030\002 \001(\014"
-    "\"(\n\022LogonUpdateRequest\022\022\n\nerror_code\030\001 \002"
-    "(\r\"a\n\027LogonQueueUpdateRequest\022\020\n\010positio"
-    "n\030\001 \002(\r\022\026\n\016estimated_time\030\002 \002(\004\022\034\n\024eta_d"
-    "eviation_in_sec\030\003 \002(\004\"\276\001\n\033AccountSetting"
-    "sNotification\0229\n\010licenses\030\001 \003(\0132\'.bgs.pr"
-    "otocol.account.v1.AccountLicense\022\024\n\014is_u"
-    "sing_rid\030\002 \001(\010\022\033\n\023is_playing_from_igr\030\003 "
-    "\001(\010\022\031\n\021can_receive_voice\030\004 \001(\010\022\026\n\016can_se"
-    "nd_voice\030\005 \001(\010\"=\n\030ServerStateChangeReque"
-    "st\022\r\n\005state\030\001 \002(\r\022\022\n\nevent_time\030\002 \002(\004\"T\n"
-    "\013VersionInfo\022\016\n\006number\030\001 \001(\r\022\r\n\005patch\030\002 "
-    "\001(\t\022\023\n\013is_optional\030\003 \001(\010\022\021\n\tkick_time\030\004 "
-    "\001(\004\"\\\n\027VersionInfoNotification\022A\n\014versio"
-    "n_info\030\001 \001(\0132+.bgs.protocol.authenticati"
-    "on.v1.VersionInfo\"_\n\024MemModuleLoadReques"
-    "t\022+\n\006handle\030\001 \002(\0132\033.bgs.protocol.Content"
-    "Handle\022\013\n\003key\030\002 \002(\014\022\r\n\005input\030\003 \002(\014\"%\n\025Me"
-    "mModuleLoadResponse\022\014\n\004data\030\001 \002(\014\"K\n\030Sel"
-    "ectGameAccountRequest\022/\n\017game_account_id"
-    "\030\001 \002(\0132\026.bgs.protocol.EntityId\"]\n\032GameAc"
-    "countSelectedRequest\022\016\n\006result\030\001 \002(\r\022/\n\017"
-    "game_account_id\030\002 \001(\0132\026.bgs.protocol.Ent"
-    "ityId\"0\n\035GenerateWebCredentialsRequest\022\017"
-    "\n\007program\030\001 \001(\007\"9\n\036GenerateWebCredential"
-    "sResponse\022\027\n\017web_credentials\030\001 \001(\014\"6\n\033Ve"
-    "rifyWebCredentialsRequest\022\027\n\017web_credent"
-    "ials\030\001 \001(\0142\237\t\n\026AuthenticationListener\022g\n"
-    "\014OnModuleLoad\0221.bgs.protocol.authenticat"
-    "ion.v1.ModuleLoadRequest\032\031.bgs.protocol."
-    "NO_RESPONSE\"\t\210\002\001\202\371+\002\010\001\022h\n\017OnModuleMessag"
-    "e\0224.bgs.protocol.authentication.v1.Modul"
-    "eMessageRequest\032\024.bgs.protocol.NoData\"\t\210"
-    "\002\001\202\371+\002\010\002\022r\n\023OnServerStateChange\0228.bgs.pr"
-    "otocol.authentication.v1.ServerStateChan"
-    "geRequest\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371"
-    "+\002\010\004\022a\n\017OnLogonComplete\022+.bgs.protocol.a"
-    "uthentication.v1.LogonResult\032\031.bgs.proto"
-    "col.NO_RESPONSE\"\006\202\371+\002\010\005\022\206\001\n\017OnMemModuleL"
-    "oad\0224.bgs.protocol.authentication.v1.Mem"
-    "ModuleLoadRequest\0325.bgs.protocol.authent"
-    "ication.v1.MemModuleLoadResponse\"\006\202\371+\002\010\006"
-    "\022f\n\rOnLogonUpdate\0222.bgs.protocol.authent"
-    "ication.v1.LogonUpdateRequest\032\031.bgs.prot"
-    "ocol.NO_RESPONSE\"\006\202\371+\002\010\n\022r\n\024OnVersionInf"
-    "oUpdated\0227.bgs.protocol.authentication.v"
-    "1.VersionInfoNotification\032\031.bgs.protocol"
-    ".NO_RESPONSE\"\006\202\371+\002\010\013\022p\n\022OnLogonQueueUpda"
-    "te\0227.bgs.protocol.authentication.v1.Logo"
-    "nQueueUpdateRequest\032\031.bgs.protocol.NO_RE"
-    "SPONSE\"\006\202\371+\002\010\014\022J\n\017OnLogonQueueEnd\022\024.bgs."
-    "protocol.NoData\032\031.bgs.protocol.NO_RESPON"
-    "SE\"\006\202\371+\002\010\r\022y\n\025OnGameAccountSelected\022:.bg"
-    "s.protocol.authentication.v1.GameAccount"
-    "SelectedRequest\032\031.bgs.protocol.NO_RESPON"
-    "SE\"\t\210\002\001\202\371+\002\010\016\032=\202\371+3\n1bnet.protocol.authe"
-    "ntication.AuthenticationClient\212\371+\002\010\0012\366\007\n"
-    "\025AuthenticationService\022S\n\005Logon\022,.bgs.pr"
-    "otocol.authentication.v1.LogonRequest\032\024."
-    "bgs.protocol.NoData\"\006\202\371+\002\010\001\022c\n\014ModuleNot"
-    "ify\0222.bgs.protocol.authentication.v1.Mod"
-    "uleNotification\032\024.bgs.protocol.NoData\"\t\210"
-    "\002\001\202\371+\002\010\002\022f\n\rModuleMessage\0224.bgs.protocol"
-    ".authentication.v1.ModuleMessageRequest\032"
-    "\024.bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010\003\022W\n\034Sele"
-    "ctGameAccount_DEPRECATED\022\026.bgs.protocol."
-    "EntityId\032\024.bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010"
-    "\004\022\215\001\n\020GenerateSSOToken\0227.bgs.protocol.au"
-    "thentication.v1.GenerateSSOTokenRequest\032"
-    "8.bgs.protocol.authentication.v1.Generat"
-    "eSSOTokenResponse\"\006\202\371+\002\010\005\022n\n\021SelectGameA"
-    "ccount\0228.bgs.protocol.authentication.v1."
-    "SelectGameAccountRequest\032\024.bgs.protocol."
-    "NoData\"\t\210\002\001\202\371+\002\010\006\022q\n\024VerifyWebCredential"
-    "s\022;.bgs.protocol.authentication.v1.Verif"
-    "yWebCredentialsRequest\032\024.bgs.protocol.No"
-    "Data\"\006\202\371+\002\010\007\022\237\001\n\026GenerateWebCredentials\022"
-    "=.bgs.protocol.authentication.v1.Generat"
-    "eWebCredentialsRequest\032>.bgs.protocol.au"
-    "thentication.v1.GenerateWebCredentialsRe"
-    "sponse\"\006\202\371+\002\010\010\032M\202\371+C\n1bnet.protocol.auth"
-    "entication.AuthenticationServer*\016authent"
-    "ication\212\371+\002\020\001B\005H\001\200\001\000", 4300);
+    "m\030\002 \001(\t\022\016\n\006locale\030\003 \001(\t\022\025\n\005email\030\004 \001(\tB\006"
+    "\202\371+\002\010\001\022\017\n\007version\030\005 \001(\t\022\033\n\023application_v"
+    "ersion\030\006 \001(\005\022\027\n\017public_computer\030\007 \001(\010\022.\n"
+    "\037allow_logon_queue_notifications\030\n \001(\010:\005"
+    "false\022\036\n\026cached_web_credentials\030\014 \001(\014\022\022\n"
+    "\nuser_agent\030\016 \001(\t\022\021\n\tdevice_id\030\017 \001(\t\022\034\n\014"
+    "phone_number\030\020 \001(\tB\006\202\371+\002\010\001\"\275\002\n\013LogonResu"
+    "lt\022\022\n\nerror_code\030\001 \002(\r\022*\n\naccount_id\030\002 \001"
+    "(\0132\026.bgs.protocol.EntityId\022/\n\017game_accou"
+    "nt_id\030\003 \003(\0132\026.bgs.protocol.EntityId\022\025\n\005e"
+    "mail\030\004 \001(\tB\006\202\371+\002\010\001\022\030\n\020available_region\030\005"
+    " \003(\r\022\030\n\020connected_region\030\006 \001(\r\022\032\n\nbattle"
+    "_tag\030\007 \001(\tB\006\202\371+\002\010\001\022\025\n\rgeoip_country\030\010 \001("
+    "\t\022\023\n\013session_key\030\t \001(\014\022\027\n\017restricted_mod"
+    "e\030\n \001(\010\022\021\n\tclient_id\030\013 \001(\t\"*\n\027GenerateSS"
+    "OTokenRequest\022\017\n\007program\030\001 \001(\007\">\n\030Genera"
+    "teSSOTokenResponse\022\016\n\006sso_id\030\001 \001(\014\022\022\n\nss"
+    "o_secret\030\002 \001(\014\"(\n\022LogonUpdateRequest\022\022\n\n"
+    "error_code\030\001 \002(\r\"a\n\027LogonQueueUpdateRequ"
+    "est\022\020\n\010position\030\001 \002(\r\022\026\n\016estimated_time\030"
+    "\002 \002(\004\022\034\n\024eta_deviation_in_sec\030\003 \002(\004\"\276\001\n\033"
+    "AccountSettingsNotification\0229\n\010licenses\030"
+    "\001 \003(\0132\'.bgs.protocol.account.v1.AccountL"
+    "icense\022\024\n\014is_using_rid\030\002 \001(\010\022\033\n\023is_playi"
+    "ng_from_igr\030\003 \001(\010\022\031\n\021can_receive_voice\030\004"
+    " \001(\010\022\026\n\016can_send_voice\030\005 \001(\010\"=\n\030ServerSt"
+    "ateChangeRequest\022\r\n\005state\030\001 \002(\r\022\022\n\nevent"
+    "_time\030\002 \002(\004\"T\n\013VersionInfo\022\016\n\006number\030\001 \001"
+    "(\r\022\r\n\005patch\030\002 \001(\t\022\023\n\013is_optional\030\003 \001(\010\022\021"
+    "\n\tkick_time\030\004 \001(\004\"\\\n\027VersionInfoNotifica"
+    "tion\022A\n\014version_info\030\001 \001(\0132+.bgs.protoco"
+    "l.authentication.v1.VersionInfo\"_\n\024MemMo"
+    "duleLoadRequest\022+\n\006handle\030\001 \002(\0132\033.bgs.pr"
+    "otocol.ContentHandle\022\013\n\003key\030\002 \002(\014\022\r\n\005inp"
+    "ut\030\003 \002(\014\"%\n\025MemModuleLoadResponse\022\014\n\004dat"
+    "a\030\001 \002(\014\"K\n\030SelectGameAccountRequest\022/\n\017g"
+    "ame_account_id\030\001 \002(\0132\026.bgs.protocol.Enti"
+    "tyId\"]\n\032GameAccountSelectedRequest\022\016\n\006re"
+    "sult\030\001 \002(\r\022/\n\017game_account_id\030\002 \001(\0132\026.bg"
+    "s.protocol.EntityId\"0\n\035GenerateWebCreden"
+    "tialsRequest\022\017\n\007program\030\001 \001(\007\"9\n\036Generat"
+    "eWebCredentialsResponse\022\027\n\017web_credentia"
+    "ls\030\001 \001(\014\"6\n\033VerifyWebCredentialsRequest\022"
+    "\027\n\017web_credentials\030\001 \001(\0142\237\t\n\026Authenticat"
+    "ionListener\022g\n\014OnModuleLoad\0221.bgs.protoc"
+    "ol.authentication.v1.ModuleLoadRequest\032\031"
+    ".bgs.protocol.NO_RESPONSE\"\t\210\002\001\202\371+\002\010\001\022h\n\017"
+    "OnModuleMessage\0224.bgs.protocol.authentic"
+    "ation.v1.ModuleMessageRequest\032\024.bgs.prot"
+    "ocol.NoData\"\t\210\002\001\202\371+\002\010\002\022r\n\023OnServerStateC"
+    "hange\0228.bgs.protocol.authentication.v1.S"
+    "erverStateChangeRequest\032\031.bgs.protocol.N"
+    "O_RESPONSE\"\006\202\371+\002\010\004\022a\n\017OnLogonComplete\022+."
+    "bgs.protocol.authentication.v1.LogonResu"
+    "lt\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\005\022\206\001"
+    "\n\017OnMemModuleLoad\0224.bgs.protocol.authent"
+    "ication.v1.MemModuleLoadRequest\0325.bgs.pr"
+    "otocol.authentication.v1.MemModuleLoadRe"
+    "sponse\"\006\202\371+\002\010\006\022f\n\rOnLogonUpdate\0222.bgs.pr"
+    "otocol.authentication.v1.LogonUpdateRequ"
+    "est\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\n\022r"
+    "\n\024OnVersionInfoUpdated\0227.bgs.protocol.au"
+    "thentication.v1.VersionInfoNotification\032"
+    "\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\013\022p\n\022On"
+    "LogonQueueUpdate\0227.bgs.protocol.authenti"
+    "cation.v1.LogonQueueUpdateRequest\032\031.bgs."
+    "protocol.NO_RESPONSE\"\006\202\371+\002\010\014\022J\n\017OnLogonQ"
+    "ueueEnd\022\024.bgs.protocol.NoData\032\031.bgs.prot"
+    "ocol.NO_RESPONSE\"\006\202\371+\002\010\r\022y\n\025OnGameAccoun"
+    "tSelected\022:.bgs.protocol.authentication."
+    "v1.GameAccountSelectedRequest\032\031.bgs.prot"
+    "ocol.NO_RESPONSE\"\t\210\002\001\202\371+\002\010\016\032=\202\371+3\n1bnet."
+    "protocol.authentication.AuthenticationCl"
+    "ient\212\371+\002\010\0012\366\007\n\025AuthenticationService\022S\n\005"
+    "Logon\022,.bgs.protocol.authentication.v1.L"
+    "ogonRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010"
+    "\001\022c\n\014ModuleNotify\0222.bgs.protocol.authent"
+    "ication.v1.ModuleNotification\032\024.bgs.prot"
+    "ocol.NoData\"\t\210\002\001\202\371+\002\010\002\022f\n\rModuleMessage\022"
+    "4.bgs.protocol.authentication.v1.ModuleM"
+    "essageRequest\032\024.bgs.protocol.NoData\"\t\210\002\001"
+    "\202\371+\002\010\003\022W\n\034SelectGameAccount_DEPRECATED\022\026"
+    ".bgs.protocol.EntityId\032\024.bgs.protocol.No"
+    "Data\"\t\210\002\001\202\371+\002\010\004\022\215\001\n\020GenerateSSOToken\0227.b"
+    "gs.protocol.authentication.v1.GenerateSS"
+    "OTokenRequest\0328.bgs.protocol.authenticat"
+    "ion.v1.GenerateSSOTokenResponse\"\006\202\371+\002\010\005\022"
+    "n\n\021SelectGameAccount\0228.bgs.protocol.auth"
+    "entication.v1.SelectGameAccountRequest\032\024"
+    ".bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010\006\022q\n\024Verif"
+    "yWebCredentials\022;.bgs.protocol.authentic"
+    "ation.v1.VerifyWebCredentialsRequest\032\024.b"
+    "gs.protocol.NoData\"\006\202\371+\002\010\007\022\237\001\n\026GenerateW"
+    "ebCredentials\022=.bgs.protocol.authenticat"
+    "ion.v1.GenerateWebCredentialsRequest\032>.b"
+    "gs.protocol.authentication.v1.GenerateWe"
+    "bCredentialsResponse\"\006\202\371+\002\010\010\032M\202\371+C\n1bnet"
+    ".protocol.authentication.AuthenticationS"
+    "erver*\016authentication\212\371+\002\020\001B\005H\001\200\001\000", 4354);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "authentication_service.proto", &protobuf_RegisterTypes);
   ModuleLoadRequest::default_instance_ = new ModuleLoadRequest();
@@ -1550,6 +1552,7 @@ const int LogonRequest::kAllowLogonQueueNotificationsFieldNumber;
 const int LogonRequest::kCachedWebCredentialsFieldNumber;
 const int LogonRequest::kUserAgentFieldNumber;
 const int LogonRequest::kDeviceIdFieldNumber;
+const int LogonRequest::kPhoneNumberFieldNumber;
 #endif  // !_MSC_VER
 
 LogonRequest::LogonRequest()
@@ -1582,6 +1585,7 @@ void LogonRequest::SharedCtor() {
   cached_web_credentials_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   user_agent_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   device_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -1615,6 +1619,9 @@ void LogonRequest::SharedDtor() {
   if (device_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete device_id_;
   }
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete phone_number_;
+  }
   if (this != default_instance_) {
   }
 }
@@ -1679,7 +1686,7 @@ void LogonRequest::Clear() {
       }
     }
   }
-  if (_has_bits_[8 / 32] & 1792) {
+  if (_has_bits_[8 / 32] & 3840) {
     if (has_cached_web_credentials()) {
       if (cached_web_credentials_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
         cached_web_credentials_->clear();
@@ -1695,6 +1702,11 @@ void LogonRequest::Clear() {
         device_id_->clear();
       }
     }
+    if (has_phone_number()) {
+      if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        phone_number_->clear();
+      }
+    }
   }
 
 #undef OFFSET_OF_FIELD_
@@ -1710,7 +1722,7 @@ bool LogonRequest::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:bgs.protocol.authentication.v1.LogonRequest)
   for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
@@ -1886,6 +1898,23 @@ bool LogonRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(130)) goto parse_phone_number;
+        break;
+      }
+
+      // optional string phone_number = 16;
+      case 16: {
+        if (tag == 130) {
+         parse_phone_number:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_phone_number()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->phone_number().data(), this->phone_number().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "phone_number");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -2006,6 +2035,16 @@ void LogonRequest::SerializeWithCachedSizes(
       15, this->device_id(), output);
   }
 
+  // optional string phone_number = 16;
+  if (has_phone_number()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->phone_number().data(), this->phone_number().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "phone_number");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      16, this->phone_number(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2115,6 +2154,17 @@ void LogonRequest::SerializeWithCachedSizes(
         15, this->device_id(), target);
   }
 
+  // optional string phone_number = 16;
+  if (has_phone_number()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->phone_number().data(), this->phone_number().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "phone_number");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        16, this->phone_number(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -2202,6 +2252,13 @@ int LogonRequest::ByteSize() const {
           this->device_id());
     }
 
+    // optional string phone_number = 16;
+    if (has_phone_number()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->phone_number());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -2264,6 +2321,9 @@ void LogonRequest::MergeFrom(const LogonRequest& from) {
     if (from.has_device_id()) {
       set_device_id(from.device_id());
     }
+    if (from.has_phone_number()) {
+      set_phone_number(from.phone_number());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -2298,6 +2358,7 @@ void LogonRequest::Swap(LogonRequest* other) {
     std::swap(cached_web_credentials_, other->cached_web_credentials_);
     std::swap(user_agent_, other->user_agent_);
     std::swap(device_id_, other->device_id_);
+    std::swap(phone_number_, other->phone_number_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/authentication_service.pb.h b/src/server/proto/Client/authentication_service.pb.h
index cb1ad1b55f8..7fb3281f540 100644
--- a/src/server/proto/Client/authentication_service.pb.h
+++ b/src/server/proto/Client/authentication_service.pb.h
@@ -516,6 +516,18 @@ class TC_PROTO_API LogonRequest : public ::google::protobuf::Message {
   inline ::std::string* release_device_id();
   inline void set_allocated_device_id(::std::string* device_id);
 
+  // optional string phone_number = 16;
+  inline bool has_phone_number() const;
+  inline void clear_phone_number();
+  static const int kPhoneNumberFieldNumber = 16;
+  inline const ::std::string& phone_number() const;
+  inline void set_phone_number(const ::std::string& value);
+  inline void set_phone_number(const char* value);
+  inline void set_phone_number(const char* value, size_t size);
+  inline ::std::string* mutable_phone_number();
+  inline ::std::string* release_phone_number();
+  inline void set_allocated_phone_number(::std::string* phone_number);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.authentication.v1.LogonRequest)
  private:
   inline void set_has_program();
@@ -540,6 +552,8 @@ class TC_PROTO_API LogonRequest : public ::google::protobuf::Message {
   inline void clear_has_user_agent();
   inline void set_has_device_id();
   inline void clear_has_device_id();
+  inline void set_has_phone_number();
+  inline void clear_has_phone_number();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -556,6 +570,7 @@ class TC_PROTO_API LogonRequest : public ::google::protobuf::Message {
   ::std::string* cached_web_credentials_;
   ::std::string* user_agent_;
   ::std::string* device_id_;
+  ::std::string* phone_number_;
   friend void TC_PROTO_API protobuf_AddDesc_authentication_5fservice_2eproto();
   friend void protobuf_AssignDesc_authentication_5fservice_2eproto();
   friend void protobuf_ShutdownFile_authentication_5fservice_2eproto();
@@ -3182,6 +3197,82 @@ inline void LogonRequest::set_allocated_device_id(::std::string* device_id) {
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.authentication.v1.LogonRequest.device_id)
 }
 
+// optional string phone_number = 16;
+inline bool LogonRequest::has_phone_number() const {
+  return (_has_bits_[0] & 0x00000800u) != 0;
+}
+inline void LogonRequest::set_has_phone_number() {
+  _has_bits_[0] |= 0x00000800u;
+}
+inline void LogonRequest::clear_has_phone_number() {
+  _has_bits_[0] &= ~0x00000800u;
+}
+inline void LogonRequest::clear_phone_number() {
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_->clear();
+  }
+  clear_has_phone_number();
+}
+inline const ::std::string& LogonRequest::phone_number() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.authentication.v1.LogonRequest.phone_number)
+  return *phone_number_;
+}
+inline void LogonRequest::set_phone_number(const ::std::string& value) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.authentication.v1.LogonRequest.phone_number)
+}
+inline void LogonRequest::set_phone_number(const char* value) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.authentication.v1.LogonRequest.phone_number)
+}
+inline void LogonRequest::set_phone_number(const char* value, size_t size) {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  phone_number_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.authentication.v1.LogonRequest.phone_number)
+}
+inline ::std::string* LogonRequest::mutable_phone_number() {
+  set_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    phone_number_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.authentication.v1.LogonRequest.phone_number)
+  return phone_number_;
+}
+inline ::std::string* LogonRequest::release_phone_number() {
+  clear_has_phone_number();
+  if (phone_number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = phone_number_;
+    phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void LogonRequest::set_allocated_phone_number(::std::string* phone_number) {
+  if (phone_number_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete phone_number_;
+  }
+  if (phone_number) {
+    set_has_phone_number();
+    phone_number_ = phone_number;
+  } else {
+    clear_has_phone_number();
+    phone_number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.authentication.v1.LogonRequest.phone_number)
+}
+
 // -------------------------------------------------------------------
 
 // LogonResult
diff --git a/src/server/proto/Client/channel_types.pb.cc b/src/server/proto/Client/channel_types.pb.cc
index 601912f71c5..c7be52c12c1 100644
--- a/src/server/proto/Client/channel_types.pb.cc
+++ b/src/server/proto/Client/channel_types.pb.cc
@@ -324,19 +324,20 @@ void protobuf_AddDesc_channel_5ftypes_2eproto() {
     "\022\026\n\022PRIVACY_LEVEL_OPEN\020\001\022,\n(PRIVACY_LEVE"
     "L_OPEN_INVITATION_AND_FRIEND\020\002\022!\n\035PRIVAC"
     "Y_LEVEL_OPEN_INVITATION\020\003\022\030\n\024PRIVACY_LEV"
-    "EL_CLOSED\020\004*\005\010d\020\220N\"\'\n\021MemberAccountInfo\022"
-    "\022\n\nbattle_tag\030\003 \001(\t\"\234\001\n\013MemberState\022*\n\ta"
-    "ttribute\030\001 \003(\0132\027.bgs.protocol.Attribute\022"
-    "\020\n\004role\030\002 \003(\rB\002\020\001\022\025\n\nprivileges\030\003 \001(\004:\0010"
-    "\0228\n\004info\030\004 \001(\0132*.bgs.protocol.channel.v1"
-    ".MemberAccountInfo\"g\n\006Member\022(\n\010identity"
-    "\030\001 \002(\0132\026.bgs.protocol.Identity\0223\n\005state\030"
-    "\002 \002(\0132$.bgs.protocol.channel.v1.MemberSt"
-    "ate\"\273\001\n\014SubscriberId\0227\n\007account\030\001 \001(\0132\"."
-    "bgs.protocol.account.v1.AccountIdB\002\030\001\022@\n"
-    "\014game_account\030\002 \001(\0132*.bgs.protocol.accou"
-    "nt.v1.GameAccountHandle\022(\n\007process\030\003 \001(\013"
-    "2\027.bgs.protocol.ProcessId:\006\202\371+\002\020\001B\002H\001P\000", 1759);
+    "EL_CLOSED\020\004*\005\010d\020\220N\"/\n\021MemberAccountInfo\022"
+    "\032\n\nbattle_tag\030\003 \001(\tB\006\202\371+\002\010\001\"\234\001\n\013MemberSt"
+    "ate\022*\n\tattribute\030\001 \003(\0132\027.bgs.protocol.At"
+    "tribute\022\020\n\004role\030\002 \003(\rB\002\020\001\022\025\n\nprivileges\030"
+    "\003 \001(\004:\0010\0228\n\004info\030\004 \001(\0132*.bgs.protocol.ch"
+    "annel.v1.MemberAccountInfo\"g\n\006Member\022(\n\010"
+    "identity\030\001 \002(\0132\026.bgs.protocol.Identity\0223"
+    "\n\005state\030\002 \002(\0132$.bgs.protocol.channel.v1."
+    "MemberState\"\273\001\n\014SubscriberId\0227\n\007account\030"
+    "\001 \001(\0132\".bgs.protocol.account.v1.AccountI"
+    "dB\002\030\001\022@\n\014game_account\030\002 \001(\0132*.bgs.protoc"
+    "ol.account.v1.GameAccountHandle\022(\n\007proce"
+    "ss\030\003 \001(\0132\027.bgs.protocol.ProcessId:\006\202\371+\002\020"
+    "\001B\002H\001P\000", 1767);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "channel_types.proto", &protobuf_RegisterTypes);
   Message::default_instance_ = new Message();
diff --git a/src/server/proto/Client/club_ban.pb.cc b/src/server/proto/Client/club_ban.pb.cc
index a9e9c2a3aeb..2d773e813d4 100644
--- a/src/server/proto/Client/club_ban.pb.cc
+++ b/src/server/proto/Client/club_ban.pb.cc
@@ -111,21 +111,23 @@ void protobuf_AddDesc_club_5fban_2eproto() {
   already_here = true;
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
+  ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto();
   ::bgs::protocol::club::v1::protobuf_AddDesc_club_5fmember_2eproto();
   ::bgs::protocol::v2::protobuf_AddDesc_api_2fclient_2fv2_2fattribute_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\016club_ban.proto\022\024bgs.protocol.club.v1\032\021"
-    "club_member.proto\032#api/client/v2/attribu"
-    "te_types.proto\"\201\001\n\rAddBanOptions\0221\n\ttarg"
-    "et_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe"
-    "rId\022-\n\tattribute\030\002 \003(\0132\032.bgs.protocol.v2"
-    ".Attribute\022\016\n\006reason\030\003 \001(\t\"\331\001\n\007ClubBan\022*"
-    "\n\002id\030\001 \001(\0132\036.bgs.protocol.club.v1.Member"
-    "Id\022\022\n\nbattle_tag\030\002 \001(\t\0228\n\007creator\030\003 \001(\0132"
-    "\'.bgs.protocol.club.v1.MemberDescription"
-    "\022-\n\tattribute\030\004 \003(\0132\032.bgs.protocol.v2.At"
-    "tribute\022\016\n\006reason\030\005 \001(\t\022\025\n\rcreation_time"
-    "\030\006 \001(\004B\002H\001", 450);
+    "\n\016club_ban.proto\022\024bgs.protocol.club.v1\032%"
+    "global_extensions/field_options.proto\032\021c"
+    "lub_member.proto\032#api/client/v2/attribut"
+    "e_types.proto\"\201\001\n\rAddBanOptions\0221\n\ttarge"
+    "t_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Member"
+    "Id\022-\n\tattribute\030\002 \003(\0132\032.bgs.protocol.v2."
+    "Attribute\022\016\n\006reason\030\003 \001(\t\"\341\001\n\007ClubBan\022*\n"
+    "\002id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
+    "d\022\032\n\nbattle_tag\030\002 \001(\tB\006\202\371+\002\010\001\0228\n\007creator"
+    "\030\003 \001(\0132\'.bgs.protocol.club.v1.MemberDesc"
+    "ription\022-\n\tattribute\030\004 \003(\0132\032.bgs.protoco"
+    "l.v2.Attribute\022\016\n\006reason\030\005 \001(\t\022\025\n\rcreati"
+    "on_time\030\006 \001(\004B\002H\001", 497);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_ban.proto", &protobuf_RegisterTypes);
   AddBanOptions::default_instance_ = new AddBanOptions();
diff --git a/src/server/proto/Client/club_ban.pb.h b/src/server/proto/Client/club_ban.pb.h
index b70366b8a78..a1873cc9ecc 100644
--- a/src/server/proto/Client/club_ban.pb.h
+++ b/src/server/proto/Client/club_ban.pb.h
@@ -24,6 +24,7 @@
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/extension_set.h>
 #include <google/protobuf/unknown_field_set.h>
+#include "global_extensions/field_options.pb.h"
 #include "club_member.pb.h"
 #include "api/client/v2/attribute_types.pb.h"
 #include "Define.h" // for TC_PROTO_API
diff --git a/src/server/proto/Client/club_core.pb.cc b/src/server/proto/Client/club_core.pb.cc
index f2babe24a5e..7af6d65c948 100644
--- a/src/server/proto/Client/club_core.pb.cc
+++ b/src/server/proto/Client/club_core.pb.cc
@@ -294,10 +294,11 @@ void protobuf_AssignDesc_club_5fcore_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamSettings));
   ClubSettings_descriptor_ = file->message_type(11);
-  static const int ClubSettings_offsets_[3] = {
+  static const int ClubSettings_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubSettings, stream_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubSettings, stream_notification_filter_all_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubSettings, attribute_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubSettings, push_notification_filter_all_),
   };
   ClubSettings_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -498,18 +499,19 @@ void protobuf_AddDesc_club_5fcore_2eproto() {
     ".v1.StreamPosition\022\022\n\nshort_name\030\t \001(\t\"c"
     "\n\016StreamSettings\022\021\n\tstream_id\030\001 \001(\004\022>\n\006f"
     "ilter\030\002 \001(\0162..bgs.protocol.club.v1.Strea"
-    "mNotificationFilter\"\233\001\n\014ClubSettings\0224\n\006"
+    "mNotificationFilter\"\301\001\n\014ClubSettings\0224\n\006"
     "stream\030\001 \003(\0132$.bgs.protocol.club.v1.Stre"
     "amSettings\022&\n\036stream_notification_filter"
     "_all\030\002 \001(\010\022-\n\tattribute\030\003 \003(\0132\032.bgs.prot"
-    "ocol.v2.Attribute\"\226\001\n\023ClubSettingsOption"
-    "s\0228\n\006stream\030\001 \003(\0132$.bgs.protocol.club.v1"
-    ".StreamSettingsB\002\030\001\0224\n\010settings\030\002 \001(\0132\"."
-    "bgs.protocol.club.v1.ClubSettings\022\017\n\007ver"
-    "sion\030\003 \001(\r\"\210\001\n\026ClubSettingsAssignment\0228\n"
-    "\006stream\030\001 \003(\0132$.bgs.protocol.club.v1.Str"
-    "eamSettingsB\002\030\001\0224\n\010settings\030\002 \001(\0132\".bgs."
-    "protocol.club.v1.ClubSettingsB\002H\001", 3153);
+    "ocol.v2.Attribute\022$\n\034push_notification_f"
+    "ilter_all\030\004 \001(\010\"\226\001\n\023ClubSettingsOptions\022"
+    "8\n\006stream\030\001 \003(\0132$.bgs.protocol.club.v1.S"
+    "treamSettingsB\002\030\001\0224\n\010settings\030\002 \001(\0132\".bg"
+    "s.protocol.club.v1.ClubSettings\022\017\n\007versi"
+    "on\030\003 \001(\r\"\210\001\n\026ClubSettingsAssignment\0228\n\006s"
+    "tream\030\001 \003(\0132$.bgs.protocol.club.v1.Strea"
+    "mSettingsB\002\030\001\0224\n\010settings\030\002 \001(\0132\".bgs.pr"
+    "otocol.club.v1.ClubSettingsB\002H\001", 3191);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_core.proto", &protobuf_RegisterTypes);
   AvatarId::default_instance_ = new AvatarId();
@@ -5564,6 +5566,7 @@ void StreamSettings::Swap(StreamSettings* other) {
 const int ClubSettings::kStreamFieldNumber;
 const int ClubSettings::kStreamNotificationFilterAllFieldNumber;
 const int ClubSettings::kAttributeFieldNumber;
+const int ClubSettings::kPushNotificationFilterAllFieldNumber;
 #endif  // !_MSC_VER
 
 ClubSettings::ClubSettings()
@@ -5585,6 +5588,7 @@ ClubSettings::ClubSettings(const ClubSettings& from)
 void ClubSettings::SharedCtor() {
   _cached_size_ = 0;
   stream_notification_filter_all_ = false;
+  push_notification_filter_all_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -5620,7 +5624,21 @@ ClubSettings* ClubSettings::New() const {
 }
 
 void ClubSettings::Clear() {
-  stream_notification_filter_all_ = false;
+#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
+  &reinterpret_cast<ClubSettings*>(16)->f) - \
+   reinterpret_cast<char*>(16))
+
+#define ZR_(first, last) do {                              \
+    size_t f = OFFSET_OF_FIELD_(first);                    \
+    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
+    ::memset(&first, 0, n);                                \
+  } while (0)
+
+  ZR_(stream_notification_filter_all_, push_notification_filter_all_);
+
+#undef OFFSET_OF_FIELD_
+#undef ZR_
+
   stream_.Clear();
   attribute_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -5676,6 +5694,21 @@ bool ClubSettings::MergePartialFromCodedStream(
           goto handle_unusual;
         }
         if (input->ExpectTag(26)) goto parse_attribute;
+        if (input->ExpectTag(32)) goto parse_push_notification_filter_all;
+        break;
+      }
+
+      // optional bool push_notification_filter_all = 4;
+      case 4: {
+        if (tag == 32) {
+         parse_push_notification_filter_all:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &push_notification_filter_all_)));
+          set_has_push_notification_filter_all();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -5722,6 +5755,11 @@ void ClubSettings::SerializeWithCachedSizes(
       3, this->attribute(i), output);
   }
 
+  // optional bool push_notification_filter_all = 4;
+  if (has_push_notification_filter_all()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->push_notification_filter_all(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -5751,6 +5789,11 @@ void ClubSettings::SerializeWithCachedSizes(
         3, this->attribute(i), target);
   }
 
+  // optional bool push_notification_filter_all = 4;
+  if (has_push_notification_filter_all()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->push_notification_filter_all(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -5768,6 +5811,11 @@ int ClubSettings::ByteSize() const {
       total_size += 1 + 1;
     }
 
+    // optional bool push_notification_filter_all = 4;
+    if (has_push_notification_filter_all()) {
+      total_size += 1 + 1;
+    }
+
   }
   // repeated .bgs.protocol.club.v1.StreamSettings stream = 1;
   total_size += 1 * this->stream_size();
@@ -5816,6 +5864,9 @@ void ClubSettings::MergeFrom(const ClubSettings& from) {
     if (from.has_stream_notification_filter_all()) {
       set_stream_notification_filter_all(from.stream_notification_filter_all());
     }
+    if (from.has_push_notification_filter_all()) {
+      set_push_notification_filter_all(from.push_notification_filter_all());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -5842,6 +5893,7 @@ void ClubSettings::Swap(ClubSettings* other) {
     stream_.Swap(&other->stream_);
     std::swap(stream_notification_filter_all_, other->stream_notification_filter_all_);
     attribute_.Swap(&other->attribute_);
+    std::swap(push_notification_filter_all_, other->push_notification_filter_all_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/club_core.pb.h b/src/server/proto/Client/club_core.pb.h
index b9a3880bc38..80108963b23 100644
--- a/src/server/proto/Client/club_core.pb.h
+++ b/src/server/proto/Client/club_core.pb.h
@@ -1664,10 +1664,19 @@ class TC_PROTO_API ClubSettings : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::v2::Attribute >*
       mutable_attribute();
 
+  // optional bool push_notification_filter_all = 4;
+  inline bool has_push_notification_filter_all() const;
+  inline void clear_push_notification_filter_all();
+  static const int kPushNotificationFilterAllFieldNumber = 4;
+  inline bool push_notification_filter_all() const;
+  inline void set_push_notification_filter_all(bool value);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.ClubSettings)
  private:
   inline void set_has_stream_notification_filter_all();
   inline void clear_has_stream_notification_filter_all();
+  inline void set_has_push_notification_filter_all();
+  inline void clear_has_push_notification_filter_all();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1676,6 +1685,7 @@ class TC_PROTO_API ClubSettings : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::StreamSettings > stream_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::v2::Attribute > attribute_;
   bool stream_notification_filter_all_;
+  bool push_notification_filter_all_;
   friend void TC_PROTO_API protobuf_AddDesc_club_5fcore_2eproto();
   friend void protobuf_AssignDesc_club_5fcore_2eproto();
   friend void protobuf_ShutdownFile_club_5fcore_2eproto();
@@ -4758,6 +4768,30 @@ ClubSettings::mutable_attribute() {
   return &attribute_;
 }
 
+// optional bool push_notification_filter_all = 4;
+inline bool ClubSettings::has_push_notification_filter_all() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ClubSettings::set_has_push_notification_filter_all() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ClubSettings::clear_has_push_notification_filter_all() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ClubSettings::clear_push_notification_filter_all() {
+  push_notification_filter_all_ = false;
+  clear_has_push_notification_filter_all();
+}
+inline bool ClubSettings::push_notification_filter_all() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubSettings.push_notification_filter_all)
+  return push_notification_filter_all_;
+}
+inline void ClubSettings::set_push_notification_filter_all(bool value) {
+  set_has_push_notification_filter_all();
+  push_notification_filter_all_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.ClubSettings.push_notification_filter_all)
+}
+
 // -------------------------------------------------------------------
 
 // ClubSettingsOptions
diff --git a/src/server/proto/Client/club_member.pb.cc b/src/server/proto/Client/club_member.pb.cc
index 68cc6099557..934fb3c0771 100644
--- a/src/server/proto/Client/club_member.pb.cc
+++ b/src/server/proto/Client/club_member.pb.cc
@@ -436,64 +436,64 @@ void protobuf_AddDesc_club_5fmember_2eproto() {
     "1\032\024club_member_id.proto\032\'global_extensio"
     "ns/message_options.proto\032#api/client/v2/"
     "attribute_types.proto\032\017club_enum.proto\032\017"
-    "rpc_types.proto\"\201\003\n\006Member\022*\n\002id\030\001 \001(\0132\036"
-    ".bgs.protocol.club.v1.MemberId\022\022\n\nbattle"
-    "_tag\030\002 \001(\t\022\020\n\004role\030\003 \003(\rB\002\020\001\022-\n\tattribut"
-    "e\030\004 \003(\0132\032.bgs.protocol.v2.Attribute\022\021\n\tj"
-    "oin_time\030\005 \001(\004\022;\n\016presence_level\030\006 \001(\0162#"
-    ".bgs.protocol.club.v1.PresenceLevel\022\026\n\016m"
-    "oderator_mute\030\007 \001(\010\0229\n\rwhisper_level\030\010 \001"
-    "(\0162\".bgs.protocol.club.v1.WhisperLevel\022\014"
-    "\n\004note\030\t \001(\t\022\016\n\006active\0302 \001(\010\0225\n\005voice\0303 "
-    "\001(\0132&.bgs.protocol.club.v1.MemberVoiceSt"
-    "ate\"Q\n\014MemberResult\0221\n\tmember_id\030\001 \001(\0132\036"
-    ".bgs.protocol.club.v1.MemberId\022\016\n\006status"
-    "\030\002 \001(\r\"z\n\023RemoveMemberOptions\022*\n\002id\030\001 \001("
-    "\0132\036.bgs.protocol.club.v1.MemberId\0227\n\006rea"
-    "son\030\002 \001(\0162\'.bgs.protocol.club.v1.ClubRem"
-    "ovedReason\"~\n\027MemberRemovedAssignment\022*\n"
+    "rpc_types.proto\"\211\003\n\006Member\022*\n\002id\030\001 \001(\0132\036"
+    ".bgs.protocol.club.v1.MemberId\022\032\n\nbattle"
+    "_tag\030\002 \001(\tB\006\202\371+\002\010\001\022\020\n\004role\030\003 \003(\rB\002\020\001\022-\n\t"
+    "attribute\030\004 \003(\0132\032.bgs.protocol.v2.Attrib"
+    "ute\022\021\n\tjoin_time\030\005 \001(\004\022;\n\016presence_level"
+    "\030\006 \001(\0162#.bgs.protocol.club.v1.PresenceLe"
+    "vel\022\026\n\016moderator_mute\030\007 \001(\010\0229\n\rwhisper_l"
+    "evel\030\010 \001(\0162\".bgs.protocol.club.v1.Whispe"
+    "rLevel\022\014\n\004note\030\t \001(\t\022\016\n\006active\0302 \001(\010\0225\n\005"
+    "voice\0303 \001(\0132&.bgs.protocol.club.v1.Membe"
+    "rVoiceState\"Q\n\014MemberResult\0221\n\tmember_id"
+    "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\016"
+    "\n\006status\030\002 \001(\r\"z\n\023RemoveMemberOptions\022*\n"
     "\002id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
     "d\0227\n\006reason\030\002 \001(\0162\'.bgs.protocol.club.v1"
-    ".ClubRemovedReason\"\207\001\n\022MemberVoiceOption"
-    "s\022\021\n\tstream_id\030\001 \001(\004\022\016\n\006joined\030\002 \001(\010\022>\n\n"
-    "microphone\030\003 \001(\0162*.bgs.protocol.club.v1."
-    "VoiceMicrophoneState\022\016\n\006active\030\004 \001(\010\"\221\001\n"
-    "\020MemberVoiceState\022\n\n\002id\030\001 \001(\t\022\021\n\tstream_"
-    "id\030\002 \001(\004\022\016\n\006joined\030\003 \001(\010\022>\n\nmicrophone\030\004"
-    " \001(\0162*.bgs.protocol.club.v1.VoiceMicroph"
-    "oneState\022\016\n\006active\030\005 \001(\010\"p\n\023CreateMember"
-    "Options\022*\n\002id\030\001 \001(\0132\036.bgs.protocol.club."
-    "v1.MemberId\022-\n\tattribute\030\002 \003(\0132\032.bgs.pro"
-    "tocol.v2.Attribute\"S\n\021MemberDescription\022"
-    "*\n\002id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe"
-    "rId\022\022\n\nbattle_tag\030\002 \001(\t\"^\n\013RoleOptions\0221"
+    ".ClubRemovedReason\"~\n\027MemberRemovedAssig"
+    "nment\022*\n\002id\030\001 \001(\0132\036.bgs.protocol.club.v1"
+    ".MemberId\0227\n\006reason\030\002 \001(\0162\'.bgs.protocol"
+    ".club.v1.ClubRemovedReason\"\207\001\n\022MemberVoi"
+    "ceOptions\022\021\n\tstream_id\030\001 \001(\004\022\016\n\006joined\030\002"
+    " \001(\010\022>\n\nmicrophone\030\003 \001(\0162*.bgs.protocol."
+    "club.v1.VoiceMicrophoneState\022\016\n\006active\030\004"
+    " \001(\010\"\221\001\n\020MemberVoiceState\022\n\n\002id\030\001 \001(\t\022\021\n"
+    "\tstream_id\030\002 \001(\004\022\016\n\006joined\030\003 \001(\010\022>\n\nmicr"
+    "ophone\030\004 \001(\0162*.bgs.protocol.club.v1.Voic"
+    "eMicrophoneState\022\016\n\006active\030\005 \001(\010\"p\n\023Crea"
+    "teMemberOptions\022*\n\002id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022-\n\tattribute\030\002 \003(\0132\032"
+    ".bgs.protocol.v2.Attribute\"[\n\021MemberDesc"
+    "ription\022*\n\002id\030\001 \001(\0132\036.bgs.protocol.club."
+    "v1.MemberId\022\032\n\nbattle_tag\030\002 \001(\tB\006\202\371+\002\010\001\""
+    "^\n\013RoleOptions\0221\n\tmember_id\030\001 \001(\0132\036.bgs."
+    "protocol.club.v1.MemberId\022\034\n\004role\030\002 \003(\rB"
+    "\016\020\001\212\371+\010*\006\n\004\010\001\020\001\"U\n\016RoleAssignment\0221\n\tmem"
+    "ber_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Memb"
+    "erId\022\020\n\004role\030\002 \003(\rB\002\020\001\"}\n\031MemberAttribut"
+    "eAssignment\0221\n\tmember_id\030\001 \001(\0132\036.bgs.pro"
+    "tocol.club.v1.MemberId\022-\n\tattribute\030\002 \003("
+    "\0132\032.bgs.protocol.v2.Attribute\"Q\n\026Subscri"
+    "berStateOptions\0227\n\005voice\030\001 \001(\0132(.bgs.pro"
+    "tocol.club.v1.MemberVoiceOptions\"\225\001\n\031Sub"
+    "scriberStateAssignment\0221\n\tmember_id\030\001 \001("
+    "\0132\036.bgs.protocol.club.v1.MemberId\022\016\n\006act"
+    "ive\030\002 \001(\010\0225\n\005voice\030\003 \001(\0132&.bgs.protocol."
+    "club.v1.MemberVoiceState\"\341\001\n\022MemberState"
+    "Options\022-\n\tattribute\030\001 \003(\0132\032.bgs.protoco"
+    "l.v2.Attribute\022;\n\016presence_level\030\002 \001(\0162#"
+    ".bgs.protocol.club.v1.PresenceLevel\022\026\n\016m"
+    "oderator_mute\030\003 \001(\010\0229\n\rwhisper_level\030\004 \001"
+    "(\0162\".bgs.protocol.club.v1.WhisperLevel\022\014"
+    "\n\004note\030\005 \001(\t\"\227\002\n\025MemberStateAssignment\0221"
     "\n\tmember_id\030\001 \001(\0132\036.bgs.protocol.club.v1"
-    ".MemberId\022\034\n\004role\030\002 \003(\rB\016\020\001\212\371+\010*\006\n\004\010\001\020\001\""
-    "U\n\016RoleAssignment\0221\n\tmember_id\030\001 \001(\0132\036.b"
-    "gs.protocol.club.v1.MemberId\022\020\n\004role\030\002 \003"
-    "(\rB\002\020\001\"}\n\031MemberAttributeAssignment\0221\n\tm"
-    "ember_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Me"
-    "mberId\022-\n\tattribute\030\002 \003(\0132\032.bgs.protocol"
-    ".v2.Attribute\"Q\n\026SubscriberStateOptions\022"
-    "7\n\005voice\030\001 \001(\0132(.bgs.protocol.club.v1.Me"
-    "mberVoiceOptions\"\225\001\n\031SubscriberStateAssi"
-    "gnment\0221\n\tmember_id\030\001 \001(\0132\036.bgs.protocol"
-    ".club.v1.MemberId\022\016\n\006active\030\002 \001(\010\0225\n\005voi"
-    "ce\030\003 \001(\0132&.bgs.protocol.club.v1.MemberVo"
-    "iceState\"\341\001\n\022MemberStateOptions\022-\n\tattri"
-    "bute\030\001 \003(\0132\032.bgs.protocol.v2.Attribute\022;"
-    "\n\016presence_level\030\002 \001(\0162#.bgs.protocol.cl"
-    "ub.v1.PresenceLevel\022\026\n\016moderator_mute\030\003 "
-    "\001(\010\0229\n\rwhisper_level\030\004 \001(\0162\".bgs.protoco"
-    "l.club.v1.WhisperLevel\022\014\n\004note\030\005 \001(\t\"\227\002\n"
-    "\025MemberStateAssignment\0221\n\tmember_id\030\001 \001("
-    "\0132\036.bgs.protocol.club.v1.MemberId\022-\n\tatt"
-    "ribute\030\002 \003(\0132\032.bgs.protocol.v2.Attribute"
-    "\022;\n\016presence_level\030\003 \001(\0162#.bgs.protocol."
-    "club.v1.PresenceLevel\022\026\n\016moderator_mute\030"
-    "\004 \001(\010\0229\n\rwhisper_level\030\005 \001(\0162\".bgs.proto"
-    "col.club.v1.WhisperLevel\022\014\n\004note\030\006 \001(\tB\002"
-    "H\001P\000", 2444);
+    ".MemberId\022-\n\tattribute\030\002 \003(\0132\032.bgs.proto"
+    "col.v2.Attribute\022;\n\016presence_level\030\003 \001(\016"
+    "2#.bgs.protocol.club.v1.PresenceLevel\022\026\n"
+    "\016moderator_mute\030\004 \001(\010\0229\n\rwhisper_level\030\005"
+    " \001(\0162\".bgs.protocol.club.v1.WhisperLevel"
+    "\022\014\n\004note\030\006 \001(\tB\002H\001P\000", 2460);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_member.proto", &protobuf_RegisterTypes);
   Member::default_instance_ = new Member();
diff --git a/src/server/proto/Client/club_member_id.pb.cc b/src/server/proto/Client/club_member_id.pb.cc
index f8fbd2a681d..0d0f9c5c27f 100644
--- a/src/server/proto/Client/club_member_id.pb.cc
+++ b/src/server/proto/Client/club_member_id.pb.cc
@@ -85,13 +85,14 @@ void protobuf_AddDesc_club_5fmember_5fid_2eproto() {
 
   ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2fmessage_5foptions_2eproto();
   ::bgs::protocol::account::v1::protobuf_AddDesc_account_5ftypes_2eproto();
+  ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\024club_member_id.proto\022\024bgs.protocol.clu"
     "b.v1\032\'global_extensions/message_options."
-    "proto\032\023account_types.proto\"]\n\010MemberId\0226"
-    "\n\naccount_id\030\001 \001(\0132\".bgs.protocol.accoun"
-    "t.v1.AccountId\022\021\n\tunique_id\030\002 \001(\004:\006\202\371+\002\010"
-    "\001B\002H\001", 205);
+    "proto\032\023account_types.proto\032\017rpc_types.pr"
+    "oto\"]\n\010MemberId\0226\n\naccount_id\030\001 \001(\0132\".bg"
+    "s.protocol.account.v1.AccountId\022\021\n\tuniqu"
+    "e_id\030\002 \001(\004:\006\202\371+\002\010\001B\002H\001", 222);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_member_id.proto", &protobuf_RegisterTypes);
   MemberId::default_instance_ = new MemberId();
diff --git a/src/server/proto/Client/club_member_id.pb.h b/src/server/proto/Client/club_member_id.pb.h
index 23dc51a5cf8..9083a4228ea 100644
--- a/src/server/proto/Client/club_member_id.pb.h
+++ b/src/server/proto/Client/club_member_id.pb.h
@@ -26,6 +26,7 @@
 #include <google/protobuf/unknown_field_set.h>
 #include "global_extensions/message_options.pb.h"
 #include "account_types.pb.h"
+#include "rpc_types.pb.h"
 #include "Define.h" // for TC_PROTO_API
 // @@protoc_insertion_point(includes)
 
diff --git a/src/server/proto/Client/club_membership_listener.pb.cc b/src/server/proto/Client/club_membership_listener.pb.cc
index 6a9b713f146..9284e968060 100644
--- a/src/server/proto/Client/club_membership_listener.pb.cc
+++ b/src/server/proto/Client/club_membership_listener.pb.cc
@@ -256,67 +256,65 @@ void protobuf_AddDesc_club_5fmembership_5flistener_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\036club_membership_listener.proto\022\037bgs.pr"
     "otocol.club.v1.membership\032\020club_types.pr"
-    "oto\"\226\001\n\025ClubAddedNotification\0220\n\010agent_i"
+    "oto\"\216\001\n\025ClubAddedNotification\0220\n\010agent_i"
     "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022"
     "C\n\nmembership\030\003 \001(\0132/.bgs.protocol.club."
-    "v1.ClubMembershipDescription:\006\202\371+\002\030\001\"\320\001\n"
-    "\027ClubRemovedNotification\0220\n\010agent_id\030\001 \001"
-    "(\0132\036.bgs.protocol.club.v1.MemberId\0221\n\tme"
-    "mber_id\030\003 \001(\0132\036.bgs.protocol.club.v1.Mem"
-    "berId\022\017\n\007club_id\030\004 \001(\004\0227\n\006reason\030\005 \001(\0162\'"
-    ".bgs.protocol.club.v1.ClubRemovedReason:"
-    "\006\202\371+\002\030\001\"\231\001\n#ReceivedInvitationAddedNotif"
-    "ication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol"
-    ".club.v1.MemberId\0228\n\ninvitation\030\003 \001(\0132$."
-    "bgs.protocol.club.v1.ClubInvitation:\006\202\371+"
-    "\002\030\001\"\257\001\n%ReceivedInvitationRemovedNotific"
-    "ation\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c"
-    "lub.v1.MemberId\022\025\n\rinvitation_id\030\003 \001(\006\0225"
-    "\n\006reason\030\004 \001(\0162%.bgs.protocol.Invitation"
-    "RemovedReason:\006\202\371+\002\030\001\"\251\001\n!SharedSettings"
-    "ChangedNotification\0224\n\010agent_id\030\001 \001(\0132\"."
-    "bgs.protocol.account.v1.AccountId\022F\n\nass"
-    "ignment\030\004 \001(\01322.bgs.protocol.club.v1.Clu"
-    "bSharedSettingsAssignment:\006\202\371+\002\030\001\"\220\001\n\036St"
+    "v1.ClubMembershipDescription\"\310\001\n\027ClubRem"
+    "ovedNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs"
+    ".protocol.club.v1.MemberId\0221\n\tmember_id\030"
+    "\003 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n"
+    "\007club_id\030\004 \001(\004\0227\n\006reason\030\005 \001(\0162\'.bgs.pro"
+    "tocol.club.v1.ClubRemovedReason\"\221\001\n#Rece"
+    "ivedInvitationAddedNotification\0220\n\010agent"
+    "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
+    "d\0228\n\ninvitation\030\003 \001(\0132$.bgs.protocol.clu"
+    "b.v1.ClubInvitation\"\247\001\n%ReceivedInvitati"
+    "onRemovedNotification\0220\n\010agent_id\030\001 \001(\0132"
+    "\036.bgs.protocol.club.v1.MemberId\022\025\n\rinvit"
+    "ation_id\030\003 \001(\006\0225\n\006reason\030\004 \001(\0162%.bgs.pro"
+    "tocol.InvitationRemovedReason\"\241\001\n!Shared"
+    "SettingsChangedNotification\0224\n\010agent_id\030"
+    "\001 \001(\0132\".bgs.protocol.account.v1.AccountI"
+    "d\022F\n\nassignment\030\004 \001(\01322.bgs.protocol.clu"
+    "b.v1.ClubSharedSettingsAssignment\"\210\001\n\036St"
     "reamMentionAddedNotification\0220\n\010agent_id"
     "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\0224"
     "\n\007mention\030\003 \001(\0132#.bgs.protocol.club.v1.S"
-    "treamMention:\006\202\371+\002\030\001\"\220\001\n StreamMentionRe"
-    "movedNotification\0224\n\010agent_id\030\001 \001(\0132\".bg"
-    "s.protocol.account.v1.AccountId\022.\n\nmenti"
-    "on_id\030\003 \001(\0132\032.bgs.protocol.TimeSeriesId:"
-    "\006\202\371+\002\030\001\"{\n(StreamMentionAdvanceViewTimeN"
-    "otification\0224\n\010agent_id\030\001 \001(\0132\".bgs.prot"
-    "ocol.account.v1.AccountId\022\021\n\tview_time\030\003"
-    " \001(\004:\006\202\371+\002\030\0012\316\010\n\026ClubMembershipListener\022"
-    "h\n\013OnClubAdded\0226.bgs.protocol.club.v1.me"
-    "mbership.ClubAddedNotification\032\031.bgs.pro"
-    "tocol.NO_RESPONSE\"\006\202\371+\002\010\001\022l\n\rOnClubRemov"
-    "ed\0228.bgs.protocol.club.v1.membership.Clu"
-    "bRemovedNotification\032\031.bgs.protocol.NO_R"
-    "ESPONSE\"\006\202\371+\002\010\002\022\204\001\n\031OnReceivedInvitation"
-    "Added\022D.bgs.protocol.club.v1.membership."
-    "ReceivedInvitationAddedNotification\032\031.bg"
-    "s.protocol.NO_RESPONSE\"\006\202\371+\002\010\003\022\210\001\n\033OnRec"
-    "eivedInvitationRemoved\022F.bgs.protocol.cl"
-    "ub.v1.membership.ReceivedInvitationRemov"
-    "edNotification\032\031.bgs.protocol.NO_RESPONS"
-    "E\"\006\202\371+\002\010\004\022\200\001\n\027OnSharedSettingsChanged\022B."
-    "bgs.protocol.club.v1.membership.SharedSe"
-    "ttingsChangedNotification\032\031.bgs.protocol"
-    ".NO_RESPONSE\"\006\202\371+\002\010\005\022z\n\024OnStreamMentionA"
-    "dded\022\?.bgs.protocol.club.v1.membership.S"
-    "treamMentionAddedNotification\032\031.bgs.prot"
-    "ocol.NO_RESPONSE\"\006\202\371+\002\010\006\022~\n\026OnStreamMent"
-    "ionRemoved\022A.bgs.protocol.club.v1.member"
-    "ship.StreamMentionRemovedNotification\032\031."
-    "bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\007\022\216\001\n\036OnS"
-    "treamMentionAdvanceViewTime\022I.bgs.protoc"
-    "ol.club.v1.membership.StreamMentionAdvan"
-    "ceViewTimeNotification\032\031.bgs.protocol.NO"
-    "_RESPONSE\"\006\202\371+\002\010\010\032:\202\371+.\n,bnet.protocol.c"
-    "lub.v1.ClubMembershipListener\212\371+\004\010\001\030\001B\005H"
-    "\001\200\001\000", 2484);
+    "treamMention\"\210\001\n StreamMentionRemovedNot"
+    "ification\0224\n\010agent_id\030\001 \001(\0132\".bgs.protoc"
+    "ol.account.v1.AccountId\022.\n\nmention_id\030\003 "
+    "\001(\0132\032.bgs.protocol.TimeSeriesId\"s\n(Strea"
+    "mMentionAdvanceViewTimeNotification\0224\n\010a"
+    "gent_id\030\001 \001(\0132\".bgs.protocol.account.v1."
+    "AccountId\022\021\n\tview_time\030\003 \001(\0042\337\010\n\026ClubMem"
+    "bershipListener\022j\n\013OnClubAdded\0226.bgs.pro"
+    "tocol.club.v1.membership.ClubAddedNotifi"
+    "cation\032\031.bgs.protocol.NO_RESPONSE\"\010\202\371+\004\010"
+    "\001\030\001\022n\n\rOnClubRemoved\0228.bgs.protocol.club"
+    ".v1.membership.ClubRemovedNotification\032\031"
+    ".bgs.protocol.NO_RESPONSE\"\010\202\371+\004\010\002\030\001\022\206\001\n\031"
+    "OnReceivedInvitationAdded\022D.bgs.protocol"
+    ".club.v1.membership.ReceivedInvitationAd"
+    "dedNotification\032\031.bgs.protocol.NO_RESPON"
+    "SE\"\010\202\371+\004\010\003\030\001\022\212\001\n\033OnReceivedInvitationRem"
+    "oved\022F.bgs.protocol.club.v1.membership.R"
+    "eceivedInvitationRemovedNotification\032\031.b"
+    "gs.protocol.NO_RESPONSE\"\010\202\371+\004\010\004\030\001\022\202\001\n\027On"
+    "SharedSettingsChanged\022B.bgs.protocol.clu"
+    "b.v1.membership.SharedSettingsChangedNot"
+    "ification\032\031.bgs.protocol.NO_RESPONSE\"\010\202\371"
+    "+\004\010\005\030\001\022|\n\024OnStreamMentionAdded\022\?.bgs.pro"
+    "tocol.club.v1.membership.StreamMentionAd"
+    "dedNotification\032\031.bgs.protocol.NO_RESPON"
+    "SE\"\010\202\371+\004\010\006\030\001\022\200\001\n\026OnStreamMentionRemoved\022"
+    "A.bgs.protocol.club.v1.membership.Stream"
+    "MentionRemovedNotification\032\031.bgs.protoco"
+    "l.NO_RESPONSE\"\010\202\371+\004\010\007\030\001\022\220\001\n\036OnStreamMent"
+    "ionAdvanceViewTime\022I.bgs.protocol.club.v"
+    "1.membership.StreamMentionAdvanceViewTim"
+    "eNotification\032\031.bgs.protocol.NO_RESPONSE"
+    "\"\010\202\371+\004\010\010\030\001\032:\202\371+.\n,bnet.protocol.club.v1."
+    "ClubMembershipListener\212\371+\004\010\001\030\001B\005H\001\200\001\000", 2437);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_membership_listener.proto", &protobuf_RegisterTypes);
   ClubAddedNotification::default_instance_ = new ClubAddedNotification();
diff --git a/src/server/proto/Client/club_membership_service.pb.cc b/src/server/proto/Client/club_membership_service.pb.cc
index 69231051e52..451a7707d1f 100644
--- a/src/server/proto/Client/club_membership_service.pb.cc
+++ b/src/server/proto/Client/club_membership_service.pb.cc
@@ -297,61 +297,62 @@ void protobuf_AddDesc_club_5fmembership_5fservice_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\035club_membership_service.proto\022\037bgs.pro"
     "tocol.club.v1.membership\032\020club_types.pro"
-    "to\032\021club_stream.proto\"\217\001\n\020SubscribeReque"
-    "st\0224\n\010agent_id\030\001 \001(\0132\".bgs.protocol.acco"
-    "unt.v1.AccountId\022E\n\007options\030\002 \001(\01324.bgs."
-    "protocol.club.v1.ClubMembershipSubscribe"
-    "Options\"M\n\021SubscribeResponse\0228\n\005state\030\001 "
-    "\001(\0132).bgs.protocol.club.v1.ClubMembershi"
-    "pState\"J\n\022UnsubscribeRequest\0224\n\010agent_id"
-    "\030\001 \001(\0132\".bgs.protocol.account.v1.Account"
-    "Id\"\215\001\n\017GetStateRequest\0224\n\010agent_id\030\001 \001(\013"
-    "2\".bgs.protocol.account.v1.AccountId\022D\n\007"
-    "options\030\002 \001(\01323.bgs.protocol.club.v1.Clu"
-    "bMembershipGetStateOptions\"L\n\020GetStateRe"
-    "sponse\0228\n\005state\030\001 \001(\0132).bgs.protocol.clu"
-    "b.v1.ClubMembershipState\"\231\001\n\037UpdateClubS"
-    "haredSettingsRequest\0224\n\010agent_id\030\001 \001(\0132\""
-    ".bgs.protocol.account.v1.AccountId\022@\n\007op"
-    "tions\030\002 \001(\0132/.bgs.protocol.club.v1.ClubS"
-    "haredSettingsOptions\"\230\001\n\030GetStreamMentio"
-    "nsRequest\0224\n\010agent_id\030\001 \001(\0132\".bgs.protoc"
-    "ol.account.v1.AccountId\022.\n\007options\030\002 \001(\013"
+    "to\032\021club_stream.proto\"\227\001\n\020SubscribeReque"
+    "st\022<\n\010agent_id\030\001 \001(\0132\".bgs.protocol.acco"
+    "unt.v1.AccountIdB\006\202\371+\002\020\001\022E\n\007options\030\002 \001("
+    "\01324.bgs.protocol.club.v1.ClubMembershipS"
+    "ubscribeOptions\"M\n\021SubscribeResponse\0228\n\005"
+    "state\030\001 \001(\0132).bgs.protocol.club.v1.ClubM"
+    "embershipState\"R\n\022UnsubscribeRequest\022<\n\010"
+    "agent_id\030\001 \001(\0132\".bgs.protocol.account.v1"
+    ".AccountIdB\006\202\371+\002\020\001\"\225\001\n\017GetStateRequest\022<"
+    "\n\010agent_id\030\001 \001(\0132\".bgs.protocol.account."
+    "v1.AccountIdB\006\202\371+\002\020\001\022D\n\007options\030\002 \001(\01323."
+    "bgs.protocol.club.v1.ClubMembershipGetSt"
+    "ateOptions\"L\n\020GetStateResponse\0228\n\005state\030"
+    "\001 \001(\0132).bgs.protocol.club.v1.ClubMembers"
+    "hipState\"\241\001\n\037UpdateClubSharedSettingsReq"
+    "uest\022<\n\010agent_id\030\001 \001(\0132\".bgs.protocol.ac"
+    "count.v1.AccountIdB\006\202\371+\002\020\001\022@\n\007options\030\002 "
+    "\001(\0132/.bgs.protocol.club.v1.ClubSharedSet"
+    "tingsOptions\"\240\001\n\030GetStreamMentionsReques"
+    "t\022<\n\010agent_id\030\001 \001(\0132\".bgs.protocol.accou"
+    "nt.v1.AccountIdB\006\202\371+\002\020\001\022.\n\007options\030\002 \001(\013"
     "2\035.bgs.protocol.GetEventOptions\022\026\n\016fetch"
     "_messages\030\003 \001(\010\"g\n\031GetStreamMentionsResp"
     "onse\0224\n\007mention\030\001 \003(\0132#.bgs.protocol.clu"
     "b.v1.StreamMention\022\024\n\014continuation\030\002 \001(\004"
-    "\"\203\001\n\033RemoveStreamMentionsRequest\0224\n\010agen"
+    "\"\213\001\n\033RemoveStreamMentionsRequest\022<\n\010agen"
     "t_id\030\001 \001(\0132\".bgs.protocol.account.v1.Acc"
-    "ountId\022.\n\nmention_id\030\002 \003(\0132\032.bgs.protoco"
-    "l.TimeSeriesId\"[\n#AdvanceStreamMentionVi"
-    "ewTimeRequest\0224\n\010agent_id\030\001 \001(\0132\".bgs.pr"
-    "otocol.account.v1.AccountId2\304\007\n\025ClubMemb"
-    "ershipService\022z\n\tSubscribe\0221.bgs.protoco"
-    "l.club.v1.membership.SubscribeRequest\0322."
-    "bgs.protocol.club.v1.membership.Subscrib"
-    "eResponse\"\006\202\371+\002\010\001\022`\n\013Unsubscribe\0223.bgs.p"
-    "rotocol.club.v1.membership.UnsubscribeRe"
-    "quest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\002\022w\n\010G"
-    "etState\0220.bgs.protocol.club.v1.membershi"
-    "p.GetStateRequest\0321.bgs.protocol.club.v1"
-    ".membership.GetStateResponse\"\006\202\371+\002\010\003\022z\n\030"
-    "UpdateClubSharedSettings\022@.bgs.protocol."
-    "club.v1.membership.UpdateClubSharedSetti"
-    "ngsRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\004"
-    "\022\222\001\n\021GetStreamMentions\0229.bgs.protocol.cl"
-    "ub.v1.membership.GetStreamMentionsReques"
-    "t\032:.bgs.protocol.club.v1.membership.GetS"
-    "treamMentionsResponse\"\006\202\371+\002\010\005\022r\n\024RemoveS"
-    "treamMentions\022<.bgs.protocol.club.v1.mem"
-    "bership.RemoveStreamMentionsRequest\032\024.bg"
-    "s.protocol.NoData\"\006\202\371+\002\010\006\022\202\001\n\034AdvanceStr"
-    "eamMentionViewTime\022D.bgs.protocol.club.v"
-    "1.membership.AdvanceStreamMentionViewTim"
-    "eRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\007\032J"
-    "\202\371+>\n+bnet.protocol.club.v1.ClubMembersh"
-    "ipService*\017club_membership\212\371+\004\020\001\030\001B\005H\001\200\001"
-    "\000", 2241);
+    "ountIdB\006\202\371+\002\020\001\022.\n\nmention_id\030\002 \003(\0132\032.bgs"
+    ".protocol.TimeSeriesId\"c\n#AdvanceStreamM"
+    "entionViewTimeRequest\022<\n\010agent_id\030\001 \001(\0132"
+    "\".bgs.protocol.account.v1.AccountIdB\006\202\371+"
+    "\002\020\0012\310\007\n\025ClubMembershipService\022z\n\tSubscri"
+    "be\0221.bgs.protocol.club.v1.membership.Sub"
+    "scribeRequest\0322.bgs.protocol.club.v1.mem"
+    "bership.SubscribeResponse\"\006\202\371+\002\010\001\022`\n\013Uns"
+    "ubscribe\0223.bgs.protocol.club.v1.membersh"
+    "ip.UnsubscribeRequest\032\024.bgs.protocol.NoD"
+    "ata\"\006\202\371+\002\010\002\022y\n\010GetState\0220.bgs.protocol.c"
+    "lub.v1.membership.GetStateRequest\0321.bgs."
+    "protocol.club.v1.membership.GetStateResp"
+    "onse\"\010\202\371+\004\010\0030\001\022z\n\030UpdateClubSharedSettin"
+    "gs\022@.bgs.protocol.club.v1.membership.Upd"
+    "ateClubSharedSettingsRequest\032\024.bgs.proto"
+    "col.NoData\"\006\202\371+\002\010\004\022\224\001\n\021GetStreamMentions"
+    "\0229.bgs.protocol.club.v1.membership.GetSt"
+    "reamMentionsRequest\032:.bgs.protocol.club."
+    "v1.membership.GetStreamMentionsResponse\""
+    "\010\202\371+\004\010\0050\001\022r\n\024RemoveStreamMentions\022<.bgs."
+    "protocol.club.v1.membership.RemoveStream"
+    "MentionsRequest\032\024.bgs.protocol.NoData\"\006\202"
+    "\371+\002\010\006\022\202\001\n\034AdvanceStreamMentionViewTime\022D"
+    ".bgs.protocol.club.v1.membership.Advance"
+    "StreamMentionViewTimeRequest\032\024.bgs.proto"
+    "col.NoData\"\006\202\371+\002\010\007\032J\202\371+>\n+bnet.protocol."
+    "club.v1.ClubMembershipService*\017club_memb"
+    "ership\212\371+\004\020\001\030\001B\005H\001\200\001\000", 2301);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_membership_service.proto", &protobuf_RegisterTypes);
   SubscribeRequest::default_instance_ = new SubscribeRequest();
diff --git a/src/server/proto/Client/club_notification.pb.cc b/src/server/proto/Client/club_notification.pb.cc
index 286398d204e..cb42fa59009 100644
--- a/src/server/proto/Client/club_notification.pb.cc
+++ b/src/server/proto/Client/club_notification.pb.cc
@@ -430,10 +430,11 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamTypingIndicatorNotification));
   StreamUnreadIndicatorNotification_descriptor_ = file->message_type(19);
-  static const int StreamUnreadIndicatorNotification_offsets_[3] = {
+  static const int StreamUnreadIndicatorNotification_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, club_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, event_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, message_),
   };
   StreamUnreadIndicatorNotification_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -586,88 +587,86 @@ void protobuf_AddDesc_club_5fnotification_2eproto() {
     "\006member\030\013 \001(\0132\034.bgs.protocol.club.v1.Mem"
     "ber\"\\\n\027UnsubscribeNotification\0220\n\010agent_"
     "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId"
-    "\022\017\n\007club_id\030\003 \001(\004\"\244\001\n\030StateChangedNotifi"
+    "\022\017\n\007club_id\030\003 \001(\004\"\234\001\n\030StateChangedNotifi"
     "cation\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol."
     "club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022=\n\nass"
     "ignment\030\005 \001(\0132).bgs.protocol.club.v1.Clu"
-    "bStateAssignment:\006\202\371+\002\030\001\"\252\001\n\033SettingsCha"
-    "ngedNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs"
-    ".protocol.club.v1.MemberId\022\017\n\007club_id\030\003 "
-    "\001(\004\022@\n\nassignment\030\004 \001(\0132,.bgs.protocol.c"
-    "lub.v1.ClubSettingsAssignment:\006\202\371+\002\030\001\"\222\001"
-    "\n\027MemberAddedNotification\0220\n\010agent_id\030\001 "
-    "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c"
-    "lub_id\030\003 \001(\004\022,\n\006member\030\004 \003(\0132\034.bgs.proto"
-    "col.club.v1.Member:\006\202\371+\002\030\001\"\245\001\n\031MemberRem"
-    "ovedNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs"
-    ".protocol.club.v1.MemberId\022\017\n\007club_id\030\003 "
-    "\001(\004\022=\n\006member\030\004 \003(\0132-.bgs.protocol.club."
-    "v1.MemberRemovedAssignment:\006\202\371+\002\030\001\"\254\001\n\036M"
-    "emberStateChangedNotification\0220\n\010agent_i"
-    "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022"
-    "\017\n\007club_id\030\003 \001(\004\022\?\n\nassignment\030\004 \003(\0132+.b"
-    "gs.protocol.club.v1.MemberStateAssignmen"
-    "t:\006\202\371+\002\030\001\"\264\001\n\"SubscriberStateChangedNoti"
+    "bStateAssignment\"\242\001\n\033SettingsChangedNoti"
+    "fication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco"
+    "l.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022@\n\na"
+    "ssignment\030\004 \001(\0132,.bgs.protocol.club.v1.C"
+    "lubSettingsAssignment\"\212\001\n\027MemberAddedNot"
+    "ification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022,\n\006"
+    "member\030\004 \003(\0132\034.bgs.protocol.club.v1.Memb"
+    "er\"\235\001\n\031MemberRemovedNotification\0220\n\010agen"
+    "t_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Member"
+    "Id\022\017\n\007club_id\030\003 \001(\004\022=\n\006member\030\004 \003(\0132-.bg"
+    "s.protocol.club.v1.MemberRemovedAssignme"
+    "nt\"\244\001\n\036MemberStateChangedNotification\0220\n"
+    "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M"
+    "emberId\022\017\n\007club_id\030\003 \001(\004\022\?\n\nassignment\030\004"
+    " \003(\0132+.bgs.protocol.club.v1.MemberStateA"
+    "ssignment\"\254\001\n\"SubscriberStateChangedNoti"
     "fication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco"
     "l.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022C\n\na"
     "ssignment\030\004 \003(\0132/.bgs.protocol.club.v1.S"
-    "ubscriberStateAssignment:\006\202\371+\002\030\001\"\244\001\n\035Mem"
-    "berRoleChangedNotification\0220\n\010agent_id\030\001"
-    " \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007"
-    "club_id\030\003 \001(\004\0228\n\nassignment\030\004 \003(\0132$.bgs."
-    "protocol.club.v1.RoleAssignment:\006\202\371+\002\030\001\""
-    "\242\001\n\033InvitationAddedNotification\0220\n\010agent"
+    "ubscriberStateAssignment\"\234\001\n\035MemberRoleC"
+    "hangedNotification\0220\n\010agent_id\030\001 \001(\0132\036.b"
+    "gs.protocol.club.v1.MemberId\022\017\n\007club_id\030"
+    "\003 \001(\004\0228\n\nassignment\030\004 \003(\0132$.bgs.protocol"
+    ".club.v1.RoleAssignment\"\232\001\n\033InvitationAd"
+    "dedNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs."
+    "protocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001"
+    "(\004\0228\n\ninvitation\030\004 \001(\0132$.bgs.protocol.cl"
+    "ub.v1.ClubInvitation\"\260\001\n\035InvitationRemov"
+    "edNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.p"
+    "rotocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001("
+    "\004\022\025\n\rinvitation_id\030\004 \001(\006\0225\n\006reason\030\005 \001(\016"
+    "2%.bgs.protocol.InvitationRemovedReason\""
+    "\232\001\n\033SuggestionAddedNotification\0220\n\010agent"
     "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
-    "d\022\017\n\007club_id\030\003 \001(\004\0228\n\ninvitation\030\004 \001(\0132$"
-    ".bgs.protocol.club.v1.ClubInvitation:\006\202\371"
-    "+\002\030\001\"\270\001\n\035InvitationRemovedNotification\0220"
-    "\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1."
-    "MemberId\022\017\n\007club_id\030\003 \001(\004\022\025\n\rinvitation_"
-    "id\030\004 \001(\006\0225\n\006reason\030\005 \001(\0162%.bgs.protocol."
-    "InvitationRemovedReason:\006\202\371+\002\030\001\"\242\001\n\033Sugg"
-    "estionAddedNotification\0220\n\010agent_id\030\001 \001("
-    "\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007clu"
-    "b_id\030\003 \001(\004\0228\n\nsuggestion\030\004 \001(\0132$.bgs.pro"
-    "tocol.club.v1.ClubSuggestion:\006\202\371+\002\030\001\"\270\001\n"
+    "d\022\017\n\007club_id\030\003 \001(\004\0228\n\nsuggestion\030\004 \001(\0132$"
+    ".bgs.protocol.club.v1.ClubSuggestion\"\260\001\n"
     "\035SuggestionRemovedNotification\0220\n\010agent_"
     "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId"
     "\022\017\n\007club_id\030\003 \001(\004\022\025\n\rsuggestion_id\030\004 \001(\006"
     "\0225\n\006reason\030\005 \001(\0162%.bgs.protocol.Suggesti"
-    "onRemovedReason:\006\202\371+\002\030\001\"\222\001\n\027StreamAddedN"
-    "otification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.prot"
-    "ocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022,"
-    "\n\006stream\030\004 \001(\0132\034.bgs.protocol.club.v1.St"
-    "ream:\006\202\371+\002\030\001\"y\n\031StreamRemovedNotificatio"
-    "n\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club."
-    "v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n\tstream_i"
-    "d\030\004 \001(\004:\006\202\371+\002\030\001\"\277\001\n\036StreamStateChangedNo"
-    "tification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto"
-    "col.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n"
-    "\tstream_id\030\004 \001(\004\022\?\n\nassignment\030\005 \001(\0132+.b"
-    "gs.protocol.club.v1.StreamStateAssignmen"
-    "t:\006\202\371+\002\030\001\"\264\001\n\036StreamMessageAddedNotifica"
-    "tion\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.cl"
-    "ub.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n\tstrea"
-    "m_id\030\004 \001(\004\0224\n\007message\030\005 \001(\0132#.bgs.protoc"
-    "ol.club.v1.StreamMessage:\006\202\371+\002\030\001\"\266\001\n Str"
+    "onRemovedReason\"\212\001\n\027StreamAddedNotificat"
+    "ion\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu"
+    "b.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022,\n\006stream"
+    "\030\004 \001(\0132\034.bgs.protocol.club.v1.Stream\"q\n\031"
+    "StreamRemovedNotification\0220\n\010agent_id\030\001 "
+    "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c"
+    "lub_id\030\003 \001(\004\022\021\n\tstream_id\030\004 \001(\004\"\267\001\n\036Stre"
+    "amStateChangedNotification\0220\n\010agent_id\030\001"
+    " \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007"
+    "club_id\030\003 \001(\004\022\021\n\tstream_id\030\004 \001(\004\022\?\n\nassi"
+    "gnment\030\005 \001(\0132+.bgs.protocol.club.v1.Stre"
+    "amStateAssignment\"\254\001\n\036StreamMessageAdded"
+    "Notification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pro"
+    "tocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022"
+    "\021\n\tstream_id\030\004 \001(\004\0224\n\007message\030\005 \001(\0132#.bg"
+    "s.protocol.club.v1.StreamMessage\"\256\001\n Str"
     "eamMessageUpdatedNotification\0220\n\010agent_i"
     "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022"
     "\017\n\007club_id\030\003 \001(\004\022\021\n\tstream_id\030\004 \001(\004\0224\n\007m"
     "essage\030\005 \001(\0132#.bgs.protocol.club.v1.Stre"
-    "amMessage:\006\202\371+\002\030\001\"\301\001\n!StreamTypingIndica"
-    "torNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs."
-    "protocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001"
-    "(\004\022\021\n\tstream_id\030\004 \001(\004\022>\n\tindicator\030\005 \003(\013"
-    "2+.bgs.protocol.club.v1.StreamTypingIndi"
-    "cator:\006\202\371+\002\030\001\"\244\001\n!StreamUnreadIndicatorN"
-    "otification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.prot"
-    "ocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\0224"
-    "\n\005event\030\004 \001(\0132%.bgs.protocol.club.v1.Str"
-    "eamEventTime:\006\202\371+\002\030\001\"\251\001\n!StreamAdvanceVi"
-    "ewTimeNotification\0220\n\010agent_id\030\001 \001(\0132\036.b"
-    "gs.protocol.club.v1.MemberId\022\017\n\007club_id\030"
-    "\003 \001(\004\0229\n\004view\030\004 \003(\0132+.bgs.protocol.club."
-    "v1.StreamAdvanceViewTime:\006\202\371+\002\030\001B\002H\001P\000P\001", 3720);
+    "amMessage\"\271\001\n!StreamTypingIndicatorNotif"
+    "ication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol"
+    ".club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n\tst"
+    "ream_id\030\004 \001(\004\022>\n\tindicator\030\005 \003(\0132+.bgs.p"
+    "rotocol.club.v1.StreamTypingIndicator\"\322\001"
+    "\n!StreamUnreadIndicatorNotification\0220\n\010a"
+    "gent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Mem"
+    "berId\022\017\n\007club_id\030\003 \001(\004\0224\n\005event\030\004 \001(\0132%."
+    "bgs.protocol.club.v1.StreamEventTime\0224\n\007"
+    "message\030\005 \001(\0132#.bgs.protocol.club.v1.Str"
+    "eamMessage\"\241\001\n!StreamAdvanceViewTimeNoti"
+    "fication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco"
+    "l.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\0229\n\004v"
+    "iew\030\004 \003(\0132+.bgs.protocol.club.v1.StreamA"
+    "dvanceViewTimeB\002H\001P\000P\001", 3622);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_notification.proto", &protobuf_RegisterTypes);
   SubscribeNotification::default_instance_ = new SubscribeNotification();
@@ -7114,6 +7113,7 @@ void StreamTypingIndicatorNotification::Swap(StreamTypingIndicatorNotification*
 const int StreamUnreadIndicatorNotification::kAgentIdFieldNumber;
 const int StreamUnreadIndicatorNotification::kClubIdFieldNumber;
 const int StreamUnreadIndicatorNotification::kEventFieldNumber;
+const int StreamUnreadIndicatorNotification::kMessageFieldNumber;
 #endif  // !_MSC_VER
 
 StreamUnreadIndicatorNotification::StreamUnreadIndicatorNotification()
@@ -7125,6 +7125,7 @@ StreamUnreadIndicatorNotification::StreamUnreadIndicatorNotification()
 void StreamUnreadIndicatorNotification::InitAsDefaultInstance() {
   agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance());
   event_ = const_cast< ::bgs::protocol::club::v1::StreamEventTime*>(&::bgs::protocol::club::v1::StreamEventTime::default_instance());
+  message_ = const_cast< ::bgs::protocol::club::v1::StreamMessage*>(&::bgs::protocol::club::v1::StreamMessage::default_instance());
 }
 
 StreamUnreadIndicatorNotification::StreamUnreadIndicatorNotification(const StreamUnreadIndicatorNotification& from)
@@ -7139,6 +7140,7 @@ void StreamUnreadIndicatorNotification::SharedCtor() {
   agent_id_ = NULL;
   club_id_ = GOOGLE_ULONGLONG(0);
   event_ = NULL;
+  message_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -7151,6 +7153,7 @@ void StreamUnreadIndicatorNotification::SharedDtor() {
   if (this != default_instance_) {
     delete agent_id_;
     delete event_;
+    delete message_;
   }
 }
 
@@ -7176,7 +7179,7 @@ StreamUnreadIndicatorNotification* StreamUnreadIndicatorNotification::New() cons
 }
 
 void StreamUnreadIndicatorNotification::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 15) {
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear();
     }
@@ -7184,6 +7187,9 @@ void StreamUnreadIndicatorNotification::Clear() {
     if (has_event()) {
       if (event_ != NULL) event_->::bgs::protocol::club::v1::StreamEventTime::Clear();
     }
+    if (has_message()) {
+      if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -7235,6 +7241,19 @@ bool StreamUnreadIndicatorNotification::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(42)) goto parse_message;
+        break;
+      }
+
+      // optional .bgs.protocol.club.v1.StreamMessage message = 5;
+      case 5: {
+        if (tag == 42) {
+         parse_message:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_message()));
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -7281,6 +7300,12 @@ void StreamUnreadIndicatorNotification::SerializeWithCachedSizes(
       4, this->event(), output);
   }
 
+  // optional .bgs.protocol.club.v1.StreamMessage message = 5;
+  if (has_message()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->message(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -7310,6 +7335,13 @@ void StreamUnreadIndicatorNotification::SerializeWithCachedSizes(
         4, this->event(), target);
   }
 
+  // optional .bgs.protocol.club.v1.StreamMessage message = 5;
+  if (has_message()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->message(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -7343,6 +7375,13 @@ int StreamUnreadIndicatorNotification::ByteSize() const {
           this->event());
     }
 
+    // optional .bgs.protocol.club.v1.StreamMessage message = 5;
+    if (has_message()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->message());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -7379,6 +7418,9 @@ void StreamUnreadIndicatorNotification::MergeFrom(const StreamUnreadIndicatorNot
     if (from.has_event()) {
       mutable_event()->::bgs::protocol::club::v1::StreamEventTime::MergeFrom(from.event());
     }
+    if (from.has_message()) {
+      mutable_message()->::bgs::protocol::club::v1::StreamMessage::MergeFrom(from.message());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -7400,6 +7442,9 @@ bool StreamUnreadIndicatorNotification::IsInitialized() const {
   if (has_agent_id()) {
     if (!this->agent_id().IsInitialized()) return false;
   }
+  if (has_message()) {
+    if (!this->message().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -7408,6 +7453,7 @@ void StreamUnreadIndicatorNotification::Swap(StreamUnreadIndicatorNotification*
     std::swap(agent_id_, other->agent_id_);
     std::swap(club_id_, other->club_id_);
     std::swap(event_, other->event_);
+    std::swap(message_, other->message_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/club_notification.pb.h b/src/server/proto/Client/club_notification.pb.h
index f5634407320..806ae9d1d6b 100644
--- a/src/server/proto/Client/club_notification.pb.h
+++ b/src/server/proto/Client/club_notification.pb.h
@@ -2182,6 +2182,15 @@ class TC_PROTO_API StreamUnreadIndicatorNotification : public ::google::protobuf
   inline ::bgs::protocol::club::v1::StreamEventTime* release_event();
   inline void set_allocated_event(::bgs::protocol::club::v1::StreamEventTime* event);
 
+  // optional .bgs.protocol.club.v1.StreamMessage message = 5;
+  inline bool has_message() const;
+  inline void clear_message();
+  static const int kMessageFieldNumber = 5;
+  inline const ::bgs::protocol::club::v1::StreamMessage& message() const;
+  inline ::bgs::protocol::club::v1::StreamMessage* mutable_message();
+  inline ::bgs::protocol::club::v1::StreamMessage* release_message();
+  inline void set_allocated_message(::bgs::protocol::club::v1::StreamMessage* message);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.StreamUnreadIndicatorNotification)
  private:
   inline void set_has_agent_id();
@@ -2190,6 +2199,8 @@ class TC_PROTO_API StreamUnreadIndicatorNotification : public ::google::protobuf
   inline void clear_has_club_id();
   inline void set_has_event();
   inline void clear_has_event();
+  inline void set_has_message();
+  inline void clear_has_message();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -2198,6 +2209,7 @@ class TC_PROTO_API StreamUnreadIndicatorNotification : public ::google::protobuf
   ::bgs::protocol::club::v1::MemberId* agent_id_;
   ::google::protobuf::uint64 club_id_;
   ::bgs::protocol::club::v1::StreamEventTime* event_;
+  ::bgs::protocol::club::v1::StreamMessage* message_;
   friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto();
   friend void protobuf_AssignDesc_club_5fnotification_2eproto();
   friend void protobuf_ShutdownFile_club_5fnotification_2eproto();
@@ -4626,6 +4638,47 @@ inline void StreamUnreadIndicatorNotification::set_allocated_event(::bgs::protoc
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.event)
 }
 
+// optional .bgs.protocol.club.v1.StreamMessage message = 5;
+inline bool StreamUnreadIndicatorNotification::has_message() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void StreamUnreadIndicatorNotification::set_has_message() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void StreamUnreadIndicatorNotification::clear_has_message() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void StreamUnreadIndicatorNotification::clear_message() {
+  if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear();
+  clear_has_message();
+}
+inline const ::bgs::protocol::club::v1::StreamMessage& StreamUnreadIndicatorNotification::message() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.message)
+  return message_ != NULL ? *message_ : *default_instance_->message_;
+}
+inline ::bgs::protocol::club::v1::StreamMessage* StreamUnreadIndicatorNotification::mutable_message() {
+  set_has_message();
+  if (message_ == NULL) message_ = new ::bgs::protocol::club::v1::StreamMessage;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.message)
+  return message_;
+}
+inline ::bgs::protocol::club::v1::StreamMessage* StreamUnreadIndicatorNotification::release_message() {
+  clear_has_message();
+  ::bgs::protocol::club::v1::StreamMessage* temp = message_;
+  message_ = NULL;
+  return temp;
+}
+inline void StreamUnreadIndicatorNotification::set_allocated_message(::bgs::protocol::club::v1::StreamMessage* message) {
+  delete message_;
+  message_ = message;
+  if (message) {
+    set_has_message();
+  } else {
+    clear_has_message();
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.message)
+}
+
 // -------------------------------------------------------------------
 
 // StreamAdvanceViewTimeNotification
diff --git a/src/server/proto/Client/club_request.pb.cc b/src/server/proto/Client/club_request.pb.cc
index b6943e21d97..c7d17d3acae 100644
--- a/src/server/proto/Client/club_request.pb.cc
+++ b/src/server/proto/Client/club_request.pb.cc
@@ -58,6 +58,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* UpdateClubSettingsRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   UpdateClubSettingsRequest_reflection_ = NULL;
+const ::google::protobuf::Descriptor* AddMemberRequest_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  AddMemberRequest_reflection_ = NULL;
 const ::google::protobuf::Descriptor* JoinRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   JoinRequest_reflection_ = NULL;
@@ -458,7 +461,24 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UpdateClubSettingsRequest));
-  JoinRequest_descriptor_ = file->message_type(11);
+  AddMemberRequest_descriptor_ = file->message_type(11);
+  static const int AddMemberRequest_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddMemberRequest, agent_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddMemberRequest, club_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddMemberRequest, options_),
+  };
+  AddMemberRequest_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      AddMemberRequest_descriptor_,
+      AddMemberRequest::default_instance_,
+      AddMemberRequest_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddMemberRequest, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddMemberRequest, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(AddMemberRequest));
+  JoinRequest_descriptor_ = file->message_type(12);
   static const int JoinRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(JoinRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(JoinRequest, club_id_),
@@ -475,7 +495,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(JoinRequest));
-  LeaveRequest_descriptor_ = file->message_type(12);
+  LeaveRequest_descriptor_ = file->message_type(13);
   static const int LeaveRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LeaveRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LeaveRequest, club_id_),
@@ -491,7 +511,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(LeaveRequest));
-  KickRequest_descriptor_ = file->message_type(13);
+  KickRequest_descriptor_ = file->message_type(14);
   static const int KickRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KickRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KickRequest, club_id_),
@@ -508,7 +528,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(KickRequest));
-  GetMemberRequest_descriptor_ = file->message_type(14);
+  GetMemberRequest_descriptor_ = file->message_type(15);
   static const int GetMemberRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetMemberRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetMemberRequest, club_id_),
@@ -525,7 +545,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetMemberRequest));
-  GetMemberResponse_descriptor_ = file->message_type(15);
+  GetMemberResponse_descriptor_ = file->message_type(16);
   static const int GetMemberResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetMemberResponse, member_),
   };
@@ -540,7 +560,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetMemberResponse));
-  GetMembersRequest_descriptor_ = file->message_type(16);
+  GetMembersRequest_descriptor_ = file->message_type(17);
   static const int GetMembersRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetMembersRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetMembersRequest, club_id_),
@@ -557,7 +577,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetMembersRequest));
-  GetMembersResponse_descriptor_ = file->message_type(17);
+  GetMembersResponse_descriptor_ = file->message_type(18);
   static const int GetMembersResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetMembersResponse, member_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetMembersResponse, continuation_),
@@ -573,7 +593,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetMembersResponse));
-  UpdateMemberStateRequest_descriptor_ = file->message_type(18);
+  UpdateMemberStateRequest_descriptor_ = file->message_type(19);
   static const int UpdateMemberStateRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateMemberStateRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateMemberStateRequest, club_id_),
@@ -591,7 +611,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UpdateMemberStateRequest));
-  UpdateSubscriberStateRequest_descriptor_ = file->message_type(19);
+  UpdateSubscriberStateRequest_descriptor_ = file->message_type(20);
   static const int UpdateSubscriberStateRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateSubscriberStateRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateSubscriberStateRequest, club_id_),
@@ -608,7 +628,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UpdateSubscriberStateRequest));
-  AssignRoleRequest_descriptor_ = file->message_type(20);
+  AssignRoleRequest_descriptor_ = file->message_type(21);
   static const int AssignRoleRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AssignRoleRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AssignRoleRequest, club_id_),
@@ -625,7 +645,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AssignRoleRequest));
-  UnassignRoleRequest_descriptor_ = file->message_type(21);
+  UnassignRoleRequest_descriptor_ = file->message_type(22);
   static const int UnassignRoleRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnassignRoleRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnassignRoleRequest, club_id_),
@@ -642,7 +662,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UnassignRoleRequest));
-  SendInvitationRequest_descriptor_ = file->message_type(22);
+  SendInvitationRequest_descriptor_ = file->message_type(23);
   static const int SendInvitationRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SendInvitationRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SendInvitationRequest, club_id_),
@@ -659,7 +679,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SendInvitationRequest));
-  AcceptInvitationRequest_descriptor_ = file->message_type(23);
+  AcceptInvitationRequest_descriptor_ = file->message_type(24);
   static const int AcceptInvitationRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AcceptInvitationRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AcceptInvitationRequest, club_id_),
@@ -676,7 +696,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AcceptInvitationRequest));
-  DeclineInvitationRequest_descriptor_ = file->message_type(24);
+  DeclineInvitationRequest_descriptor_ = file->message_type(25);
   static const int DeclineInvitationRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DeclineInvitationRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DeclineInvitationRequest, club_id_),
@@ -693,7 +713,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DeclineInvitationRequest));
-  RevokeInvitationRequest_descriptor_ = file->message_type(25);
+  RevokeInvitationRequest_descriptor_ = file->message_type(26);
   static const int RevokeInvitationRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RevokeInvitationRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RevokeInvitationRequest, club_id_),
@@ -710,7 +730,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RevokeInvitationRequest));
-  GetInvitationRequest_descriptor_ = file->message_type(26);
+  GetInvitationRequest_descriptor_ = file->message_type(27);
   static const int GetInvitationRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetInvitationRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetInvitationRequest, club_id_),
@@ -727,7 +747,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetInvitationRequest));
-  GetInvitationResponse_descriptor_ = file->message_type(27);
+  GetInvitationResponse_descriptor_ = file->message_type(28);
   static const int GetInvitationResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetInvitationResponse, invitation_),
   };
@@ -742,7 +762,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetInvitationResponse));
-  GetInvitationsRequest_descriptor_ = file->message_type(28);
+  GetInvitationsRequest_descriptor_ = file->message_type(29);
   static const int GetInvitationsRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetInvitationsRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetInvitationsRequest, club_id_),
@@ -759,7 +779,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetInvitationsRequest));
-  GetInvitationsResponse_descriptor_ = file->message_type(29);
+  GetInvitationsResponse_descriptor_ = file->message_type(30);
   static const int GetInvitationsResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetInvitationsResponse, invitation_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetInvitationsResponse, continuation_),
@@ -775,7 +795,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetInvitationsResponse));
-  SendSuggestionRequest_descriptor_ = file->message_type(30);
+  SendSuggestionRequest_descriptor_ = file->message_type(31);
   static const int SendSuggestionRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SendSuggestionRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SendSuggestionRequest, club_id_),
@@ -792,7 +812,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SendSuggestionRequest));
-  AcceptSuggestionRequest_descriptor_ = file->message_type(31);
+  AcceptSuggestionRequest_descriptor_ = file->message_type(32);
   static const int AcceptSuggestionRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AcceptSuggestionRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AcceptSuggestionRequest, club_id_),
@@ -809,7 +829,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AcceptSuggestionRequest));
-  DeclineSuggestionRequest_descriptor_ = file->message_type(32);
+  DeclineSuggestionRequest_descriptor_ = file->message_type(33);
   static const int DeclineSuggestionRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DeclineSuggestionRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DeclineSuggestionRequest, club_id_),
@@ -826,7 +846,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DeclineSuggestionRequest));
-  GetSuggestionRequest_descriptor_ = file->message_type(33);
+  GetSuggestionRequest_descriptor_ = file->message_type(34);
   static const int GetSuggestionRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSuggestionRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSuggestionRequest, club_id_),
@@ -843,7 +863,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetSuggestionRequest));
-  GetSuggestionResponse_descriptor_ = file->message_type(34);
+  GetSuggestionResponse_descriptor_ = file->message_type(35);
   static const int GetSuggestionResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSuggestionResponse, suggestion_),
   };
@@ -858,7 +878,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetSuggestionResponse));
-  GetSuggestionsRequest_descriptor_ = file->message_type(35);
+  GetSuggestionsRequest_descriptor_ = file->message_type(36);
   static const int GetSuggestionsRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSuggestionsRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSuggestionsRequest, club_id_),
@@ -875,7 +895,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetSuggestionsRequest));
-  GetSuggestionsResponse_descriptor_ = file->message_type(36);
+  GetSuggestionsResponse_descriptor_ = file->message_type(37);
   static const int GetSuggestionsResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSuggestionsResponse, suggestion_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetSuggestionsResponse, continuation_),
@@ -891,7 +911,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetSuggestionsResponse));
-  CreateTicketRequest_descriptor_ = file->message_type(37);
+  CreateTicketRequest_descriptor_ = file->message_type(38);
   static const int CreateTicketRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateTicketRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateTicketRequest, club_id_),
@@ -908,7 +928,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateTicketRequest));
-  CreateTicketResponse_descriptor_ = file->message_type(38);
+  CreateTicketResponse_descriptor_ = file->message_type(39);
   static const int CreateTicketResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateTicketResponse, ticket_),
   };
@@ -923,7 +943,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateTicketResponse));
-  DestroyTicketRequest_descriptor_ = file->message_type(39);
+  DestroyTicketRequest_descriptor_ = file->message_type(40);
   static const int DestroyTicketRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyTicketRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyTicketRequest, club_id_),
@@ -940,7 +960,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DestroyTicketRequest));
-  RedeemTicketRequest_descriptor_ = file->message_type(40);
+  RedeemTicketRequest_descriptor_ = file->message_type(41);
   static const int RedeemTicketRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RedeemTicketRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RedeemTicketRequest, ticket_id_),
@@ -956,7 +976,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RedeemTicketRequest));
-  GetTicketRequest_descriptor_ = file->message_type(41);
+  GetTicketRequest_descriptor_ = file->message_type(42);
   static const int GetTicketRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetTicketRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetTicketRequest, ticket_id_),
@@ -972,7 +992,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetTicketRequest));
-  GetTicketResponse_descriptor_ = file->message_type(42);
+  GetTicketResponse_descriptor_ = file->message_type(43);
   static const int GetTicketResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetTicketResponse, ticket_),
   };
@@ -987,7 +1007,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetTicketResponse));
-  GetTicketsRequest_descriptor_ = file->message_type(43);
+  GetTicketsRequest_descriptor_ = file->message_type(44);
   static const int GetTicketsRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetTicketsRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetTicketsRequest, club_id_),
@@ -1004,7 +1024,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetTicketsRequest));
-  GetTicketsResponse_descriptor_ = file->message_type(44);
+  GetTicketsResponse_descriptor_ = file->message_type(45);
   static const int GetTicketsResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetTicketsResponse, ticket_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetTicketsResponse, continuation_),
@@ -1020,7 +1040,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetTicketsResponse));
-  AddBanRequest_descriptor_ = file->message_type(45);
+  AddBanRequest_descriptor_ = file->message_type(46);
   static const int AddBanRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddBanRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddBanRequest, club_id_),
@@ -1037,7 +1057,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AddBanRequest));
-  RemoveBanRequest_descriptor_ = file->message_type(46);
+  RemoveBanRequest_descriptor_ = file->message_type(47);
   static const int RemoveBanRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RemoveBanRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RemoveBanRequest, club_id_),
@@ -1054,7 +1074,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RemoveBanRequest));
-  GetBanRequest_descriptor_ = file->message_type(47);
+  GetBanRequest_descriptor_ = file->message_type(48);
   static const int GetBanRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetBanRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetBanRequest, club_id_),
@@ -1071,7 +1091,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetBanRequest));
-  GetBanResponse_descriptor_ = file->message_type(48);
+  GetBanResponse_descriptor_ = file->message_type(49);
   static const int GetBanResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetBanResponse, ban_),
   };
@@ -1086,7 +1106,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetBanResponse));
-  GetBansRequest_descriptor_ = file->message_type(49);
+  GetBansRequest_descriptor_ = file->message_type(50);
   static const int GetBansRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetBansRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetBansRequest, club_id_),
@@ -1103,7 +1123,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetBansRequest));
-  GetBansResponse_descriptor_ = file->message_type(50);
+  GetBansResponse_descriptor_ = file->message_type(51);
   static const int GetBansResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetBansResponse, ban_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetBansResponse, continuation_),
@@ -1119,7 +1139,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetBansResponse));
-  SubscribeStreamRequest_descriptor_ = file->message_type(51);
+  SubscribeStreamRequest_descriptor_ = file->message_type(52);
   static const int SubscribeStreamRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeStreamRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeStreamRequest, club_id_),
@@ -1136,7 +1156,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SubscribeStreamRequest));
-  UnsubscribeStreamRequest_descriptor_ = file->message_type(52);
+  UnsubscribeStreamRequest_descriptor_ = file->message_type(53);
   static const int UnsubscribeStreamRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeStreamRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeStreamRequest, club_id_),
@@ -1153,7 +1173,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UnsubscribeStreamRequest));
-  CreateStreamRequest_descriptor_ = file->message_type(53);
+  CreateStreamRequest_descriptor_ = file->message_type(54);
   static const int CreateStreamRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamRequest, club_id_),
@@ -1170,7 +1190,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateStreamRequest));
-  CreateStreamResponse_descriptor_ = file->message_type(54);
+  CreateStreamResponse_descriptor_ = file->message_type(55);
   static const int CreateStreamResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamResponse, club_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamResponse, stream_id_),
@@ -1186,7 +1206,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateStreamResponse));
-  DestroyStreamRequest_descriptor_ = file->message_type(55);
+  DestroyStreamRequest_descriptor_ = file->message_type(56);
   static const int DestroyStreamRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyStreamRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyStreamRequest, club_id_),
@@ -1203,7 +1223,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DestroyStreamRequest));
-  GetStreamRequest_descriptor_ = file->message_type(56);
+  GetStreamRequest_descriptor_ = file->message_type(57);
   static const int GetStreamRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamRequest, club_id_),
@@ -1220,7 +1240,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamRequest));
-  GetStreamResponse_descriptor_ = file->message_type(57);
+  GetStreamResponse_descriptor_ = file->message_type(58);
   static const int GetStreamResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamResponse, stream_),
   };
@@ -1235,7 +1255,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamResponse));
-  GetStreamsRequest_descriptor_ = file->message_type(58);
+  GetStreamsRequest_descriptor_ = file->message_type(59);
   static const int GetStreamsRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsRequest, club_id_),
@@ -1252,7 +1272,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamsRequest));
-  GetStreamsResponse_descriptor_ = file->message_type(59);
+  GetStreamsResponse_descriptor_ = file->message_type(60);
   static const int GetStreamsResponse_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsResponse, stream_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsResponse, view_),
@@ -1269,7 +1289,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamsResponse));
-  UpdateStreamStateRequest_descriptor_ = file->message_type(60);
+  UpdateStreamStateRequest_descriptor_ = file->message_type(61);
   static const int UpdateStreamStateRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateStreamStateRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateStreamStateRequest, club_id_),
@@ -1287,7 +1307,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UpdateStreamStateRequest));
-  SetStreamFocusRequest_descriptor_ = file->message_type(61);
+  SetStreamFocusRequest_descriptor_ = file->message_type(62);
   static const int SetStreamFocusRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetStreamFocusRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetStreamFocusRequest, club_id_),
@@ -1305,7 +1325,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SetStreamFocusRequest));
-  CreateMessageRequest_descriptor_ = file->message_type(62);
+  CreateMessageRequest_descriptor_ = file->message_type(63);
   static const int CreateMessageRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageRequest, club_id_),
@@ -1323,7 +1343,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateMessageRequest));
-  CreateMessageResponse_descriptor_ = file->message_type(63);
+  CreateMessageResponse_descriptor_ = file->message_type(64);
   static const int CreateMessageResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageResponse, message_),
   };
@@ -1338,7 +1358,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateMessageResponse));
-  DestroyMessageRequest_descriptor_ = file->message_type(64);
+  DestroyMessageRequest_descriptor_ = file->message_type(65);
   static const int DestroyMessageRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyMessageRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyMessageRequest, club_id_),
@@ -1356,7 +1376,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DestroyMessageRequest));
-  DestroyMessageResponse_descriptor_ = file->message_type(65);
+  DestroyMessageResponse_descriptor_ = file->message_type(66);
   static const int DestroyMessageResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyMessageResponse, message_),
   };
@@ -1371,7 +1391,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DestroyMessageResponse));
-  EditMessageRequest_descriptor_ = file->message_type(66);
+  EditMessageRequest_descriptor_ = file->message_type(67);
   static const int EditMessageRequest_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditMessageRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditMessageRequest, club_id_),
@@ -1390,7 +1410,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(EditMessageRequest));
-  EditMessageResponse_descriptor_ = file->message_type(67);
+  EditMessageResponse_descriptor_ = file->message_type(68);
   static const int EditMessageResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditMessageResponse, message_),
   };
@@ -1405,7 +1425,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(EditMessageResponse));
-  SetMessagePinnedRequest_descriptor_ = file->message_type(68);
+  SetMessagePinnedRequest_descriptor_ = file->message_type(69);
   static const int SetMessagePinnedRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetMessagePinnedRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetMessagePinnedRequest, club_id_),
@@ -1422,7 +1442,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SetMessagePinnedRequest));
-  SetTypingIndicatorRequest_descriptor_ = file->message_type(69);
+  SetTypingIndicatorRequest_descriptor_ = file->message_type(70);
   static const int SetTypingIndicatorRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetTypingIndicatorRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetTypingIndicatorRequest, club_id_),
@@ -1440,7 +1460,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SetTypingIndicatorRequest));
-  AdvanceStreamViewTimeRequest_descriptor_ = file->message_type(70);
+  AdvanceStreamViewTimeRequest_descriptor_ = file->message_type(71);
   static const int AdvanceStreamViewTimeRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamViewTimeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamViewTimeRequest, club_id_),
@@ -1458,7 +1478,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AdvanceStreamViewTimeRequest));
-  AdvanceStreamMentionViewTimeRequest_descriptor_ = file->message_type(71);
+  AdvanceStreamMentionViewTimeRequest_descriptor_ = file->message_type(72);
   static const int AdvanceStreamMentionViewTimeRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamMentionViewTimeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamMentionViewTimeRequest, club_id_),
@@ -1475,7 +1495,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AdvanceStreamMentionViewTimeRequest));
-  AdvanceActivityViewTimeRequest_descriptor_ = file->message_type(72);
+  AdvanceActivityViewTimeRequest_descriptor_ = file->message_type(73);
   static const int AdvanceActivityViewTimeRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceActivityViewTimeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceActivityViewTimeRequest, club_id_),
@@ -1491,7 +1511,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AdvanceActivityViewTimeRequest));
-  GetStreamHistoryRequest_descriptor_ = file->message_type(73);
+  GetStreamHistoryRequest_descriptor_ = file->message_type(74);
   static const int GetStreamHistoryRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryRequest, club_id_),
@@ -1509,7 +1529,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamHistoryRequest));
-  GetStreamHistoryResponse_descriptor_ = file->message_type(74);
+  GetStreamHistoryResponse_descriptor_ = file->message_type(75);
   static const int GetStreamHistoryResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryResponse, message_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryResponse, continuation_),
@@ -1525,7 +1545,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamHistoryResponse));
-  GetStreamMessageRequest_descriptor_ = file->message_type(75);
+  GetStreamMessageRequest_descriptor_ = file->message_type(76);
   static const int GetStreamMessageRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, club_id_),
@@ -1543,7 +1563,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamMessageRequest));
-  GetStreamMessageResponse_descriptor_ = file->message_type(76);
+  GetStreamMessageResponse_descriptor_ = file->message_type(77);
   static const int GetStreamMessageResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageResponse, message_),
   };
@@ -1558,7 +1578,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamMessageResponse));
-  GetClubActivityRequest_descriptor_ = file->message_type(77);
+  GetClubActivityRequest_descriptor_ = file->message_type(78);
   static const int GetClubActivityRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetClubActivityRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetClubActivityRequest, club_id_),
@@ -1575,7 +1595,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetClubActivityRequest));
-  GetClubActivityResponse_descriptor_ = file->message_type(78);
+  GetClubActivityResponse_descriptor_ = file->message_type(79);
   static const int GetClubActivityResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetClubActivityResponse, continuation_),
   };
@@ -1590,11 +1610,12 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetClubActivityResponse));
-  GetStreamVoiceTokenRequest_descriptor_ = file->message_type(79);
-  static const int GetStreamVoiceTokenRequest_offsets_[3] = {
+  GetStreamVoiceTokenRequest_descriptor_ = file->message_type(80);
+  static const int GetStreamVoiceTokenRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenRequest, club_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenRequest, stream_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenRequest, version_),
   };
   GetStreamVoiceTokenRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -1607,7 +1628,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamVoiceTokenRequest));
-  GetStreamVoiceTokenResponse_descriptor_ = file->message_type(80);
+  GetStreamVoiceTokenResponse_descriptor_ = file->message_type(81);
   static const int GetStreamVoiceTokenResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenResponse, channel_uri_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenResponse, credentials_),
@@ -1623,7 +1644,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetStreamVoiceTokenResponse));
-  KickFromStreamVoiceRequest_descriptor_ = file->message_type(81);
+  KickFromStreamVoiceRequest_descriptor_ = file->message_type(82);
   static const int KickFromStreamVoiceRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KickFromStreamVoiceRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KickFromStreamVoiceRequest, club_id_),
@@ -1676,6 +1697,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     UpdateClubSettingsRequest_descriptor_, &UpdateClubSettingsRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    AddMemberRequest_descriptor_, &AddMemberRequest::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     JoinRequest_descriptor_, &JoinRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     LeaveRequest_descriptor_, &LeaveRequest::default_instance());
@@ -1844,6 +1867,8 @@ void protobuf_ShutdownFile_club_5frequest_2eproto() {
   delete UpdateClubStateRequest_reflection_;
   delete UpdateClubSettingsRequest::default_instance_;
   delete UpdateClubSettingsRequest_reflection_;
+  delete AddMemberRequest::default_instance_;
+  delete AddMemberRequest_reflection_;
   delete JoinRequest::default_instance_;
   delete JoinRequest_reflection_;
   delete LeaveRequest::default_instance_;
@@ -1997,248 +2022,264 @@ void protobuf_AddDesc_club_5frequest_2eproto() {
   ::bgs::protocol::club::v1::protobuf_AddDesc_club_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\022club_request.proto\022\024bgs.protocol.club."
-    "v1\032\020club_types.proto\"U\n\020SubscribeRequest"
+    "v1\032\020club_types.proto\"]\n\020SubscribeRequest"
     "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v"
-    "1.MemberId\022\017\n\007club_id\030\002 \001(\004\"W\n\022Unsubscri"
-    "beRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
-    "ol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\"{\n\r"
-    "CreateRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pr"
-    "otocol.club.v1.MemberId\0228\n\007options\030\002 \001(\013"
-    "2\'.bgs.protocol.club.v1.ClubCreateOption"
-    "s\"!\n\016CreateResponse\022\017\n\007club_id\030\001 \001(\004\"S\n\016"
-    "DestroyRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.p"
-    "rotocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001("
-    "\004\"Z\n\025GetDescriptionRequest\0220\n\010agent_id\030\001"
-    " \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007"
-    "club_id\030\002 \001(\004\"M\n\026GetDescriptionResponse\022"
-    "3\n\004club\030\001 \001(\0132%.bgs.protocol.club.v1.Clu"
-    "bDescription\"z\n\022GetClubTypeRequest\0220\n\010ag"
-    "ent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Memb"
-    "erId\0222\n\004type\030\002 \001(\0132$.bgs.protocol.club.v"
-    "1.UniqueClubType\"\271\001\n\023GetClubTypeResponse"
-    "\0222\n\004type\030\001 \001(\0132$.bgs.protocol.club.v1.Un"
-    "iqueClubType\0223\n\010role_set\030\002 \001(\0132!.bgs.pro"
-    "tocol.club.v1.ClubRoleSet\0229\n\trange_set\030\003"
-    " \001(\0132&.bgs.protocol.club.v1.ClubTypeRang"
-    "eSet\"\224\001\n\026UpdateClubStateRequest\0220\n\010agent"
-    "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
-    "d\022\017\n\007club_id\030\002 \001(\004\0227\n\007options\030\003 \001(\0132&.bg"
-    "s.protocol.club.v1.ClubStateOptions\"\232\001\n\031"
-    "UpdateClubSettingsRequest\0220\n\010agent_id\030\001 "
-    "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c"
-    "lub_id\030\002 \001(\004\022:\n\007options\030\003 \001(\0132).bgs.prot"
-    "ocol.club.v1.ClubSettingsOptions\"\214\001\n\013Joi"
-    "nRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco"
-    "l.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022:\n\007o"
-    "ptions\030\003 \001(\0132).bgs.protocol.club.v1.Crea"
-    "teMemberOptions\"Q\n\014LeaveRequest\0220\n\010agent"
-    "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
-    "d\022\017\n\007club_id\030\002 \001(\004\"\203\001\n\013KickRequest\0220\n\010ag"
-    "ent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Memb"
-    "erId\022\017\n\007club_id\030\002 \001(\004\0221\n\ttarget_id\030\003 \001(\013"
-    "2\036.bgs.protocol.club.v1.MemberId\"\210\001\n\020Get"
-    "MemberRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pr"
-    "otocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004"
-    "\0221\n\tmember_id\030\003 \001(\0132\036.bgs.protocol.club."
-    "v1.MemberId\"A\n\021GetMemberResponse\022,\n\006memb"
-    "er\030\001 \001(\0132\034.bgs.protocol.club.v1.Member\"l"
-    "\n\021GetMembersRequest\0220\n\010agent_id\030\001 \001(\0132\036."
-    "bgs.protocol.club.v1.MemberId\022\017\n\007club_id"
-    "\030\002 \001(\004\022\024\n\014continuation\030\004 \001(\004\"X\n\022GetMembe"
-    "rsResponse\022,\n\006member\030\001 \003(\0132\034.bgs.protoco"
-    "l.club.v1.Member\022\024\n\014continuation\030\002 \001(\004\"\313"
-    "\001\n\030UpdateMemberStateRequest\0220\n\010agent_id\030"
-    "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n"
-    "\007club_id\030\002 \001(\004\0221\n\tmember_id\030\003 \001(\0132\036.bgs."
-    "protocol.club.v1.MemberId\0229\n\007options\030\005 \001"
-    "(\0132(.bgs.protocol.club.v1.MemberStateOpt"
-    "ions\"\240\001\n\034UpdateSubscriberStateRequest\0220\n"
-    "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M"
-    "emberId\022\017\n\007club_id\030\002 \001(\004\022=\n\007options\030\003 \001("
-    "\0132,.bgs.protocol.club.v1.SubscriberState"
-    "Options\"\212\001\n\021AssignRoleRequest\0220\n\010agent_i"
-    "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022"
-    "\017\n\007club_id\030\002 \001(\004\0222\n\007options\030\003 \001(\0132!.bgs."
-    "protocol.club.v1.RoleOptions\"\214\001\n\023Unassig"
-    "nRoleRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pro"
-    "tocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022"
-    "2\n\007options\030\003 \001(\0132!.bgs.protocol.club.v1."
-    "RoleOptions\"\230\001\n\025SendInvitationRequest\0220\n"
-    "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M"
-    "emberId\022\017\n\007club_id\030\002 \001(\004\022<\n\007options\030\003 \001("
-    "\0132+.bgs.protocol.club.v1.SendInvitationO"
-    "ptions\"s\n\027AcceptInvitationRequest\0220\n\010age"
-    "nt_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe"
-    "rId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 "
-    "\001(\006\"t\n\030DeclineInvitationRequest\0220\n\010agent"
-    "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
-    "d\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 \001("
-    "\006\"s\n\027RevokeInvitationRequest\0220\n\010agent_id"
-    "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017"
-    "\n\007club_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 \001(\006\"p"
-    "\n\024GetInvitationRequest\0220\n\010agent_id\030\001 \001(\013"
-    "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club"
-    "_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 \001(\006\"Q\n\025GetI"
-    "nvitationResponse\0228\n\ninvitation\030\001 \001(\0132$."
-    "bgs.protocol.club.v1.ClubInvitation\"p\n\025G"
-    "etInvitationsRequest\0220\n\010agent_id\030\001 \001(\0132\036"
-    ".bgs.protocol.club.v1.MemberId\022\017\n\007club_i"
-    "d\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"h\n\026GetInvi"
-    "tationsResponse\0228\n\ninvitation\030\001 \003(\0132$.bg"
-    "s.protocol.club.v1.ClubInvitation\022\024\n\014con"
-    "tinuation\030\002 \001(\004\"\230\001\n\025SendSuggestionReques"
-    "t\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club."
-    "v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022<\n\007options\030"
-    "\003 \001(\0132+.bgs.protocol.club.v1.SendSuggest"
-    "ionOptions\"s\n\027AcceptSuggestionRequest\0220\n"
-    "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M"
-    "emberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rsuggestion_i"
-    "d\030\003 \001(\006\"t\n\030DeclineSuggestionRequest\0220\n\010a"
-    "gent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Mem"
-    "berId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rsuggestion_id\030"
-    "\003 \001(\006\"p\n\024GetSuggestionRequest\0220\n\010agent_i"
-    "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022"
-    "\017\n\007club_id\030\002 \001(\004\022\025\n\rsuggestion_id\030\003 \001(\006\""
-    "Q\n\025GetSuggestionResponse\0228\n\nsuggestion\030\001"
-    " \001(\0132$.bgs.protocol.club.v1.ClubSuggesti"
-    "on\"p\n\025GetSuggestionsRequest\0220\n\010agent_id\030"
-    "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n"
-    "\007club_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"h\n\026"
-    "GetSuggestionsResponse\0228\n\nsuggestion\030\001 \003"
-    "(\0132$.bgs.protocol.club.v1.ClubSuggestion"
-    "\022\024\n\014continuation\030\002 \001(\004\"\224\001\n\023CreateTicketR"
-    "equest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol."
-    "club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022:\n\007opt"
-    "ions\030\003 \001(\0132).bgs.protocol.club.v1.Create"
-    "TicketOptions\"H\n\024CreateTicketResponse\0220\n"
-    "\006ticket\030\001 \001(\0132 .bgs.protocol.club.v1.Clu"
-    "bTicket\"l\n\024DestroyTicketRequest\0220\n\010agent"
-    "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
-    "d\022\017\n\007club_id\030\002 \001(\004\022\021\n\tticket_id\030\003 \001(\t\"Z\n"
-    "\023RedeemTicketRequest\0220\n\010agent_id\030\001 \001(\0132\036"
-    ".bgs.protocol.club.v1.MemberId\022\021\n\tticket"
-    "_id\030\003 \001(\t\"W\n\020GetTicketRequest\0220\n\010agent_i"
+    "1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\"_\n\022U"
+    "nsubscribeRequest\0220\n\010agent_id\030\001 \001(\0132\036.bg"
+    "s.protocol.club.v1.MemberId\022\027\n\007club_id\030\002"
+    " \001(\004B\006\202\371+\002\020\001\"{\n\rCreateRequest\0220\n\010agent_i"
     "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022"
-    "\021\n\tticket_id\030\003 \001(\t\"E\n\021GetTicketResponse\022"
-    "0\n\006ticket\030\001 \001(\0132 .bgs.protocol.club.v1.C"
-    "lubTicket\"l\n\021GetTicketsRequest\0220\n\010agent_"
+    "8\n\007options\030\002 \001(\0132\'.bgs.protocol.club.v1."
+    "ClubCreateOptions\"!\n\016CreateResponse\022\017\n\007c"
+    "lub_id\030\001 \001(\004\"[\n\016DestroyRequest\0220\n\010agent_"
     "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId"
-    "\022\017\n\007club_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\""
-    "\\\n\022GetTicketsResponse\0220\n\006ticket\030\001 \003(\0132 ."
-    "bgs.protocol.club.v1.ClubTicket\022\024\n\014conti"
-    "nuation\030\002 \001(\004\"\210\001\n\rAddBanRequest\0220\n\010agent"
+    "\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\"b\n\025GetDescript"
+    "ionRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto"
+    "col.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202"
+    "\371+\002\020\001\"M\n\026GetDescriptionResponse\0223\n\004club\030"
+    "\001 \001(\0132%.bgs.protocol.club.v1.ClubDescrip"
+    "tion\"z\n\022GetClubTypeRequest\0220\n\010agent_id\030\001"
+    " \001(\0132\036.bgs.protocol.club.v1.MemberId\0222\n\004"
+    "type\030\002 \001(\0132$.bgs.protocol.club.v1.Unique"
+    "ClubType\"\271\001\n\023GetClubTypeResponse\0222\n\004type"
+    "\030\001 \001(\0132$.bgs.protocol.club.v1.UniqueClub"
+    "Type\0223\n\010role_set\030\002 \001(\0132!.bgs.protocol.cl"
+    "ub.v1.ClubRoleSet\0229\n\trange_set\030\003 \001(\0132&.b"
+    "gs.protocol.club.v1.ClubTypeRangeSet\"\234\001\n"
+    "\026UpdateClubStateRequest\0220\n\010agent_id\030\001 \001("
+    "\0132\036.bgs.protocol.club.v1.MemberId\022\027\n\007clu"
+    "b_id\030\002 \001(\004B\006\202\371+\002\020\001\0227\n\007options\030\003 \001(\0132&.bg"
+    "s.protocol.club.v1.ClubStateOptions\"\242\001\n\031"
+    "UpdateClubSettingsRequest\0220\n\010agent_id\030\001 "
+    "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\027\n\007c"
+    "lub_id\030\002 \001(\004B\006\202\371+\002\020\001\022:\n\007options\030\003 \001(\0132)."
+    "bgs.protocol.club.v1.ClubSettingsOptions"
+    "\"\231\001\n\020AddMemberRequest\0220\n\010agent_id\030\001 \001(\0132"
+    "\036.bgs.protocol.club.v1.MemberId\022\027\n\007club_"
+    "id\030\002 \001(\004B\006\202\371+\002\020\001\022:\n\007options\030\003 \001(\0132).bgs."
+    "protocol.club.v1.CreateMemberOptions\"\224\001\n"
+    "\013JoinRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pro"
+    "tocol.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B"
+    "\006\202\371+\002\020\001\022:\n\007options\030\003 \001(\0132).bgs.protocol."
+    "club.v1.CreateMemberOptions\"Y\n\014LeaveRequ"
+    "est\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu"
+    "b.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\"\213"
+    "\001\n\013KickRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.p"
+    "rotocol.club.v1.MemberId\022\027\n\007club_id\030\002 \001("
+    "\004B\006\202\371+\002\020\001\0221\n\ttarget_id\030\003 \001(\0132\036.bgs.proto"
+    "col.club.v1.MemberId\"\220\001\n\020GetMemberReques"
+    "t\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club."
+    "v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\0221\n\t"
+    "member_id\030\003 \001(\0132\036.bgs.protocol.club.v1.M"
+    "emberId\"A\n\021GetMemberResponse\022,\n\006member\030\001"
+    " \001(\0132\034.bgs.protocol.club.v1.Member\"t\n\021Ge"
+    "tMembersRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs."
+    "protocol.club.v1.MemberId\022\027\n\007club_id\030\002 \001"
+    "(\004B\006\202\371+\002\020\001\022\024\n\014continuation\030\004 \001(\004\"X\n\022GetM"
+    "embersResponse\022,\n\006member\030\001 \003(\0132\034.bgs.pro"
+    "tocol.club.v1.Member\022\024\n\014continuation\030\002 \001"
+    "(\004\"\323\001\n\030UpdateMemberStateRequest\0220\n\010agent"
     "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI"
-    "d\022\017\n\007club_id\030\002 \001(\004\0224\n\007options\030\003 \001(\0132#.bg"
-    "s.protocol.club.v1.AddBanOptions\"\210\001\n\020Rem"
-    "oveBanRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pr"
-    "otocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004"
-    "\0221\n\ttarget_id\030\003 \001(\0132\036.bgs.protocol.club."
-    "v1.MemberId\"\205\001\n\rGetBanRequest\0220\n\010agent_i"
-    "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022"
-    "\017\n\007club_id\030\002 \001(\004\0221\n\ttarget_id\030\003 \001(\0132\036.bg"
-    "s.protocol.club.v1.MemberId\"<\n\016GetBanRes"
-    "ponse\022*\n\003ban\030\001 \001(\0132\035.bgs.protocol.club.v"
-    "1.ClubBan\"i\n\016GetBansRequest\0220\n\010agent_id\030"
-    "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n"
-    "\007club_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"S\n\017"
-    "GetBansResponse\022*\n\003ban\030\001 \003(\0132\035.bgs.proto"
-    "col.club.v1.ClubBan\022\024\n\014continuation\030\002 \001("
-    "\004\"n\n\026SubscribeStreamRequest\0220\n\010agent_id\030"
-    "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n"
-    "\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \003(\004\"p\n\030Uns"
-    "ubscribeStreamRequest\0220\n\010agent_id\030\001 \001(\0132"
-    "\036.bgs.protocol.club.v1.MemberId\022\017\n\007club_"
-    "id\030\002 \001(\004\022\021\n\tstream_id\030\003 \003(\004\"\224\001\n\023CreateSt"
-    "reamRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.prot"
-    "ocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022:"
-    "\n\007options\030\003 \001(\0132).bgs.protocol.club.v1.C"
-    "reateStreamOptions\":\n\024CreateStreamRespon"
-    "se\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\"l"
-    "\n\024DestroyStreamRequest\0220\n\010agent_id\030\001 \001(\013"
-    "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club"
-    "_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\"h\n\020GetStrea"
-    "mRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco"
-    "l.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\ts"
-    "tream_id\030\003 \001(\004\"A\n\021GetStreamResponse\022,\n\006s"
-    "tream\030\001 \001(\0132\034.bgs.protocol.club.v1.Strea"
-    "m\"l\n\021GetStreamsRequest\0220\n\010agent_id\030\001 \001(\013"
-    "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club"
-    "_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"\210\001\n\022GetS"
-    "treamsResponse\022,\n\006stream\030\001 \003(\0132\034.bgs.pro"
-    "tocol.club.v1.Stream\022.\n\004view\030\002 \003(\0132 .bgs"
-    ".protocol.club.v1.StreamView\022\024\n\014continua"
-    "tion\030\003 \001(\004\"\253\001\n\030UpdateStreamStateRequest\022"
-    "0\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1"
-    ".MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030"
-    "\003 \001(\004\0229\n\007options\030\005 \001(\0132(.bgs.protocol.cl"
-    "ub.v1.StreamStateOptions\"|\n\025SetStreamFoc"
-    "usRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
-    "ol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\t"
-    "stream_id\030\003 \001(\004\022\r\n\005focus\030\004 \001(\010\"\251\001\n\024Creat"
-    "eMessageRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs."
-    "protocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001"
-    "(\004\022\021\n\tstream_id\030\003 \001(\004\022;\n\007options\030\004 \001(\0132*"
-    ".bgs.protocol.club.v1.CreateMessageOptio"
-    "ns\"M\n\025CreateMessageResponse\0224\n\007message\030\001"
-    " \001(\0132#.bgs.protocol.club.v1.StreamMessag"
-    "e\"\232\001\n\025DestroyMessageRequest\0220\n\010agent_id\030"
-    "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n"
-    "\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022+\n\nmes"
-    "sage_id\030\004 \001(\0132\027.bgs.protocol.MessageId\"N"
-    "\n\026DestroyMessageResponse\0224\n\007message\030\001 \001("
-    "\0132#.bgs.protocol.club.v1.StreamMessage\"\324"
-    "\001\n\022EditMessageRequest\0220\n\010agent_id\030\001 \001(\0132"
-    "\036.bgs.protocol.club.v1.MemberId\022\017\n\007club_"
-    "id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022+\n\nmessage_i"
-    "d\030\004 \001(\0132\027.bgs.protocol.MessageId\022;\n\007opti"
-    "ons\030\005 \001(\0132*.bgs.protocol.club.v1.CreateM"
-    "essageOptions\"K\n\023EditMessageResponse\0224\n\007"
-    "message\030\001 \001(\0132#.bgs.protocol.club.v1.Str"
-    "eamMessage\"o\n\027SetMessagePinnedRequest\0220\n"
+    "d\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\0221\n\tmember_id\030"
+    "\003 \001(\0132\036.bgs.protocol.club.v1.MemberId\0229\n"
+    "\007options\030\005 \001(\0132(.bgs.protocol.club.v1.Me"
+    "mberStateOptions\"\250\001\n\034UpdateSubscriberSta"
+    "teRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371"
+    "+\002\020\001\022=\n\007options\030\003 \001(\0132,.bgs.protocol.clu"
+    "b.v1.SubscriberStateOptions\"\222\001\n\021AssignRo"
+    "leRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371"
+    "+\002\020\001\0222\n\007options\030\003 \001(\0132!.bgs.protocol.clu"
+    "b.v1.RoleOptions\"\224\001\n\023UnassignRoleRequest"
+    "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v"
+    "1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\0222\n\007o"
+    "ptions\030\003 \001(\0132!.bgs.protocol.club.v1.Role"
+    "Options\"\240\001\n\025SendInvitationRequest\0220\n\010age"
+    "nt_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe"
+    "rId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022<\n\007options\030"
+    "\003 \001(\0132+.bgs.protocol.club.v1.SendInvitat"
+    "ionOptions\"{\n\027AcceptInvitationRequest\0220\n"
     "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M"
-    "emberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 "
-    "\001(\004\"\243\001\n\031SetTypingIndicatorRequest\0220\n\010age"
+    "emberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\025\n\rinvi"
+    "tation_id\030\003 \001(\006\"|\n\030DeclineInvitationRequ"
+    "est\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu"
+    "b.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\025"
+    "\n\rinvitation_id\030\003 \001(\006\"{\n\027RevokeInvitatio"
+    "nRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco"
+    "l.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+"
+    "\002\020\001\022\025\n\rinvitation_id\030\003 \001(\006\"x\n\024GetInvitat"
+    "ionRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto"
+    "col.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202"
+    "\371+\002\020\001\022\025\n\rinvitation_id\030\003 \001(\006\"Q\n\025GetInvit"
+    "ationResponse\0228\n\ninvitation\030\001 \001(\0132$.bgs."
+    "protocol.club.v1.ClubInvitation\"x\n\025GetIn"
+    "vitationsRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs"
+    ".protocol.club.v1.MemberId\022\027\n\007club_id\030\002 "
+    "\001(\004B\006\202\371+\002\020\001\022\024\n\014continuation\030\003 \001(\004\"h\n\026Get"
+    "InvitationsResponse\0228\n\ninvitation\030\001 \003(\0132"
+    "$.bgs.protocol.club.v1.ClubInvitation\022\024\n"
+    "\014continuation\030\002 \001(\004\"\240\001\n\025SendSuggestionRe"
+    "quest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c"
+    "lub.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001"
+    "\022<\n\007options\030\003 \001(\0132+.bgs.protocol.club.v1"
+    ".SendSuggestionOptions\"{\n\027AcceptSuggesti"
+    "onRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371"
+    "+\002\020\001\022\025\n\rsuggestion_id\030\003 \001(\006\"|\n\030DeclineSu"
+    "ggestionRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs."
+    "protocol.club.v1.MemberId\022\027\n\007club_id\030\002 \001"
+    "(\004B\006\202\371+\002\020\001\022\025\n\rsuggestion_id\030\003 \001(\006\"x\n\024Get"
+    "SuggestionRequest\0220\n\010agent_id\030\001 \001(\0132\036.bg"
+    "s.protocol.club.v1.MemberId\022\027\n\007club_id\030\002"
+    " \001(\004B\006\202\371+\002\020\001\022\025\n\rsuggestion_id\030\003 \001(\006\"Q\n\025G"
+    "etSuggestionResponse\0228\n\nsuggestion\030\001 \001(\013"
+    "2$.bgs.protocol.club.v1.ClubSuggestion\"x"
+    "\n\025GetSuggestionsRequest\0220\n\010agent_id\030\001 \001("
+    "\0132\036.bgs.protocol.club.v1.MemberId\022\027\n\007clu"
+    "b_id\030\002 \001(\004B\006\202\371+\002\020\001\022\024\n\014continuation\030\003 \001(\004"
+    "\"h\n\026GetSuggestionsResponse\0228\n\nsuggestion"
+    "\030\001 \003(\0132$.bgs.protocol.club.v1.ClubSugges"
+    "tion\022\024\n\014continuation\030\002 \001(\004\"\234\001\n\023CreateTic"
+    "ketRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto"
+    "col.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202"
+    "\371+\002\020\001\022:\n\007options\030\003 \001(\0132).bgs.protocol.cl"
+    "ub.v1.CreateTicketOptions\"H\n\024CreateTicke"
+    "tResponse\0220\n\006ticket\030\001 \001(\0132 .bgs.protocol"
+    ".club.v1.ClubTicket\"t\n\024DestroyTicketRequ"
+    "est\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu"
+    "b.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\021"
+    "\n\tticket_id\030\003 \001(\t\"Z\n\023RedeemTicketRequest"
+    "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v"
+    "1.MemberId\022\021\n\tticket_id\030\003 \001(\t\"W\n\020GetTick"
+    "etRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022\021\n\tticket_id\030\003 \001(\t\"E"
+    "\n\021GetTicketResponse\0220\n\006ticket\030\001 \001(\0132 .bg"
+    "s.protocol.club.v1.ClubTicket\"t\n\021GetTick"
+    "etsRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto"
+    "col.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202"
+    "\371+\002\020\001\022\024\n\014continuation\030\003 \001(\004\"\\\n\022GetTicket"
+    "sResponse\0220\n\006ticket\030\001 \003(\0132 .bgs.protocol"
+    ".club.v1.ClubTicket\022\024\n\014continuation\030\002 \001("
+    "\004\"\220\001\n\rAddBanRequest\0220\n\010agent_id\030\001 \001(\0132\036."
+    "bgs.protocol.club.v1.MemberId\022\027\n\007club_id"
+    "\030\002 \001(\004B\006\202\371+\002\020\001\0224\n\007options\030\003 \001(\0132#.bgs.pr"
+    "otocol.club.v1.AddBanOptions\"\220\001\n\020RemoveB"
+    "anRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371"
+    "+\002\020\001\0221\n\ttarget_id\030\003 \001(\0132\036.bgs.protocol.c"
+    "lub.v1.MemberId\"\215\001\n\rGetBanRequest\0220\n\010age"
     "nt_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe"
-    "rId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022"
-    "0\n\tindicator\030\004 \001(\0162\035.bgs.protocol.Typing"
-    "Indicator\"\232\001\n\034AdvanceStreamViewTimeReque"
+    "rId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\0221\n\ttarget_i"
+    "d\030\003 \001(\0132\036.bgs.protocol.club.v1.MemberId\""
+    "<\n\016GetBanResponse\022*\n\003ban\030\001 \001(\0132\035.bgs.pro"
+    "tocol.club.v1.ClubBan\"q\n\016GetBansRequest\022"
+    "0\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1"
+    ".MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\024\n\014co"
+    "ntinuation\030\003 \001(\004\"S\n\017GetBansResponse\022*\n\003b"
+    "an\030\001 \003(\0132\035.bgs.protocol.club.v1.ClubBan\022"
+    "\024\n\014continuation\030\002 \001(\004\"v\n\026SubscribeStream"
+    "Request\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol"
+    ".club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002"
+    "\020\001\022\021\n\tstream_id\030\003 \003(\004\"x\n\030UnsubscribeStre"
+    "amRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc"
+    "ol.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371"
+    "+\002\020\001\022\021\n\tstream_id\030\003 \003(\004\"\234\001\n\023CreateStream"
+    "Request\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol"
+    ".club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002"
+    "\020\001\022:\n\007options\030\003 \001(\0132).bgs.protocol.club."
+    "v1.CreateStreamOptions\":\n\024CreateStreamRe"
+    "sponse\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001"
+    "(\004\"t\n\024DestroyStreamRequest\0220\n\010agent_id\030\001"
+    " \001(\0132\036.bgs.protocol.club.v1.MemberId\022\027\n\007"
+    "club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004"
+    "\"p\n\020GetStreamRequest\0220\n\010agent_id\030\001 \001(\0132\036"
+    ".bgs.protocol.club.v1.MemberId\022\027\n\007club_i"
+    "d\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004\"A\n\021Ge"
+    "tStreamResponse\022,\n\006stream\030\001 \001(\0132\034.bgs.pr"
+    "otocol.club.v1.Stream\"t\n\021GetStreamsReque"
     "st\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club"
-    ".v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022 \n\024stream_"
-    "id_deprecated\030\003 \001(\004B\002\030\001\022\025\n\tstream_id\030\004 \003"
-    "(\004B\002\020\001\"{\n#AdvanceStreamMentionViewTimeRe"
-    "quest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c"
-    "lub.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstre"
-    "am_id\030\003 \001(\004\"c\n\036AdvanceActivityViewTimeRe"
-    "quest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c"
-    "lub.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\"\237\001\n\027Get"
-    "StreamHistoryRequest\0220\n\010agent_id\030\001 \001(\0132\036"
-    ".bgs.protocol.club.v1.MemberId\022\017\n\007club_i"
-    "d\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022.\n\007options\030\004 "
-    "\001(\0132\035.bgs.protocol.GetEventOptions\"f\n\030Ge"
-    "tStreamHistoryResponse\0224\n\007message\030\001 \003(\0132"
-    "#.bgs.protocol.club.v1.StreamMessage\022\024\n\014"
-    "continuation\030\002 \001(\004\"\234\001\n\027GetStreamMessageR"
+    ".v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\024\n"
+    "\014continuation\030\003 \001(\004\"\210\001\n\022GetStreamsRespon"
+    "se\022,\n\006stream\030\001 \003(\0132\034.bgs.protocol.club.v"
+    "1.Stream\022.\n\004view\030\002 \003(\0132 .bgs.protocol.cl"
+    "ub.v1.StreamView\022\024\n\014continuation\030\003 \001(\004\"\263"
+    "\001\n\030UpdateStreamStateRequest\0220\n\010agent_id\030"
+    "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\027\n"
+    "\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003 \001("
+    "\004\0229\n\007options\030\005 \001(\0132(.bgs.protocol.club.v"
+    "1.StreamStateOptions\"\204\001\n\025SetStreamFocusR"
     "equest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol."
-    "club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstr"
-    "eam_id\030\003 \001(\004\022+\n\nmessage_id\030\004 \001(\0132\027.bgs.p"
-    "rotocol.MessageId\"P\n\030GetStreamMessageRes"
-    "ponse\0224\n\007message\030\001 \001(\0132#.bgs.protocol.cl"
-    "ub.v1.StreamMessage\"\213\001\n\026GetClubActivityR"
-    "equest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol."
-    "club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022.\n\007opt"
-    "ions\030\003 \001(\0132\035.bgs.protocol.GetEventOption"
-    "s\"/\n\027GetClubActivityResponse\022\024\n\014continua"
-    "tion\030\002 \001(\004\"r\n\032GetStreamVoiceTokenRequest"
+    "club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020"
+    "\001\022\021\n\tstream_id\030\003 \001(\004\022\r\n\005focus\030\004 \001(\010\"\261\001\n\024"
+    "CreateMessageRequest\0220\n\010agent_id\030\001 \001(\0132\036"
+    ".bgs.protocol.club.v1.MemberId\022\027\n\007club_i"
+    "d\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004\022;\n\007op"
+    "tions\030\004 \001(\0132*.bgs.protocol.club.v1.Creat"
+    "eMessageOptions\"M\n\025CreateMessageResponse"
+    "\0224\n\007message\030\001 \001(\0132#.bgs.protocol.club.v1"
+    ".StreamMessage\"\242\001\n\025DestroyMessageRequest"
     "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v"
-    "1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id"
-    "\030\003 \001(\004\"g\n\033GetStreamVoiceTokenResponse\022\023\n"
-    "\013channel_uri\030\001 \001(\t\0223\n\013credentials\030\002 \001(\0132"
-    "\036.bgs.protocol.VoiceCredentials\"\245\001\n\032Kick"
-    "FromStreamVoiceRequest\0220\n\010agent_id\030\001 \001(\013"
-    "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club"
-    "_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\0221\n\ttarget_i"
-    "d\030\004 \001(\0132\036.bgs.protocol.club.v1.MemberIdB"
-    "\002H\001P\000", 9685);
+    "1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\ts"
+    "tream_id\030\003 \001(\004\022+\n\nmessage_id\030\004 \001(\0132\027.bgs"
+    ".protocol.MessageId\"N\n\026DestroyMessageRes"
+    "ponse\0224\n\007message\030\001 \001(\0132#.bgs.protocol.cl"
+    "ub.v1.StreamMessage\"\334\001\n\022EditMessageReque"
+    "st\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club"
+    ".v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n"
+    "\tstream_id\030\003 \001(\004\022+\n\nmessage_id\030\004 \001(\0132\027.b"
+    "gs.protocol.MessageId\022;\n\007options\030\005 \001(\0132*"
+    ".bgs.protocol.club.v1.CreateMessageOptio"
+    "ns\"K\n\023EditMessageResponse\0224\n\007message\030\001 \001"
+    "(\0132#.bgs.protocol.club.v1.StreamMessage\""
+    "w\n\027SetMessagePinnedRequest\0220\n\010agent_id\030\001"
+    " \001(\0132\036.bgs.protocol.club.v1.MemberId\022\027\n\007"
+    "club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004"
+    "\"\253\001\n\031SetTypingIndicatorRequest\0220\n\010agent_"
+    "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId"
+    "\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003"
+    " \001(\004\0220\n\tindicator\030\004 \001(\0162\035.bgs.protocol.T"
+    "ypingIndicator\"\242\001\n\034AdvanceStreamViewTime"
+    "Request\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol"
+    ".club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002"
+    "\020\001\022 \n\024stream_id_deprecated\030\003 \001(\004B\002\030\001\022\025\n\t"
+    "stream_id\030\004 \003(\004B\002\020\001\"\203\001\n#AdvanceStreamMen"
+    "tionViewTimeRequest\0220\n\010agent_id\030\001 \001(\0132\036."
+    "bgs.protocol.club.v1.MemberId\022\027\n\007club_id"
+    "\030\002 \001(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004\"k\n\036Adv"
+    "anceActivityViewTimeRequest\0220\n\010agent_id\030"
+    "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\027\n"
+    "\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\"\247\001\n\027GetStreamHist"
+    "oryRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto"
+    "col.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202"
+    "\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004\022.\n\007options\030\004 \001("
+    "\0132\035.bgs.protocol.GetEventOptions\"f\n\030GetS"
+    "treamHistoryResponse\0224\n\007message\030\001 \003(\0132#."
+    "bgs.protocol.club.v1.StreamMessage\022\024\n\014co"
+    "ntinuation\030\002 \001(\004\"\244\001\n\027GetStreamMessageReq"
+    "uest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.cl"
+    "ub.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202\371+\002\020\001\022"
+    "\021\n\tstream_id\030\003 \001(\004\022+\n\nmessage_id\030\004 \001(\0132\027"
+    ".bgs.protocol.MessageId\"P\n\030GetStreamMess"
+    "ageResponse\0224\n\007message\030\001 \001(\0132#.bgs.proto"
+    "col.club.v1.StreamMessage\"\223\001\n\026GetClubAct"
+    "ivityRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pro"
+    "tocol.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B"
+    "\006\202\371+\002\020\001\022.\n\007options\030\003 \001(\0132\035.bgs.protocol."
+    "GetEventOptions\"/\n\027GetClubActivityRespon"
+    "se\022\024\n\014continuation\030\002 \001(\004\"\247\001\n\032GetStreamVo"
+    "iceTokenRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs."
+    "protocol.club.v1.MemberId\022\027\n\007club_id\030\002 \001"
+    "(\004B\006\202\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004\022+\n\007version"
+    "\030\004 \001(\rB\032\202\371+\026*\024VoiceProviderVersion\"g\n\033Ge"
+    "tStreamVoiceTokenResponse\022\023\n\013channel_uri"
+    "\030\001 \001(\t\0223\n\013credentials\030\002 \001(\0132\036.bgs.protoc"
+    "ol.VoiceCredentials\"\255\001\n\032KickFromStreamVo"
+    "iceRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto"
+    "col.club.v1.MemberId\022\027\n\007club_id\030\002 \001(\004B\006\202"
+    "\371+\002\020\001\022\021\n\tstream_id\030\003 \001(\004\0221\n\ttarget_id\030\004 "
+    "\001(\0132\036.bgs.protocol.club.v1.MemberIdB\002H\001P"
+    "\000", 10321);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_request.proto", &protobuf_RegisterTypes);
   SubscribeRequest::default_instance_ = new SubscribeRequest();
@@ -2252,6 +2293,7 @@ void protobuf_AddDesc_club_5frequest_2eproto() {
   GetClubTypeResponse::default_instance_ = new GetClubTypeResponse();
   UpdateClubStateRequest::default_instance_ = new UpdateClubStateRequest();
   UpdateClubSettingsRequest::default_instance_ = new UpdateClubSettingsRequest();
+  AddMemberRequest::default_instance_ = new AddMemberRequest();
   JoinRequest::default_instance_ = new JoinRequest();
   LeaveRequest::default_instance_ = new LeaveRequest();
   KickRequest::default_instance_ = new KickRequest();
@@ -2334,6 +2376,7 @@ void protobuf_AddDesc_club_5frequest_2eproto() {
   GetClubTypeResponse::default_instance_->InitAsDefaultInstance();
   UpdateClubStateRequest::default_instance_->InitAsDefaultInstance();
   UpdateClubSettingsRequest::default_instance_->InitAsDefaultInstance();
+  AddMemberRequest::default_instance_->InitAsDefaultInstance();
   JoinRequest::default_instance_->InitAsDefaultInstance();
   LeaveRequest::default_instance_->InitAsDefaultInstance();
   KickRequest::default_instance_->InitAsDefaultInstance();
@@ -5456,6 +5499,324 @@ void UpdateClubSettingsRequest::Swap(UpdateClubSettingsRequest* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int AddMemberRequest::kAgentIdFieldNumber;
+const int AddMemberRequest::kClubIdFieldNumber;
+const int AddMemberRequest::kOptionsFieldNumber;
+#endif  // !_MSC_VER
+
+AddMemberRequest::AddMemberRequest()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.AddMemberRequest)
+}
+
+void AddMemberRequest::InitAsDefaultInstance() {
+  agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance());
+  options_ = const_cast< ::bgs::protocol::club::v1::CreateMemberOptions*>(&::bgs::protocol::club::v1::CreateMemberOptions::default_instance());
+}
+
+AddMemberRequest::AddMemberRequest(const AddMemberRequest& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+  // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.AddMemberRequest)
+}
+
+void AddMemberRequest::SharedCtor() {
+  _cached_size_ = 0;
+  agent_id_ = NULL;
+  club_id_ = GOOGLE_ULONGLONG(0);
+  options_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+AddMemberRequest::~AddMemberRequest() {
+  // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.AddMemberRequest)
+  SharedDtor();
+}
+
+void AddMemberRequest::SharedDtor() {
+  if (this != default_instance_) {
+    delete agent_id_;
+    delete options_;
+  }
+}
+
+void AddMemberRequest::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* AddMemberRequest::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return AddMemberRequest_descriptor_;
+}
+
+const AddMemberRequest& AddMemberRequest::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_club_5frequest_2eproto();
+  return *default_instance_;
+}
+
+AddMemberRequest* AddMemberRequest::default_instance_ = NULL;
+
+AddMemberRequest* AddMemberRequest::New() const {
+  return new AddMemberRequest;
+}
+
+void AddMemberRequest::Clear() {
+  if (_has_bits_[0 / 32] & 7) {
+    if (has_agent_id()) {
+      if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear();
+    }
+    club_id_ = GOOGLE_ULONGLONG(0);
+    if (has_options()) {
+      if (options_ != NULL) options_->::bgs::protocol::club::v1::CreateMemberOptions::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool AddMemberRequest::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.AddMemberRequest)
+  for (;;) {
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .bgs.protocol.club.v1.MemberId agent_id = 1;
+      case 1: {
+        if (tag == 10) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_agent_id()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(16)) goto parse_club_id;
+        break;
+      }
+
+      // optional uint64 club_id = 2;
+      case 2: {
+        if (tag == 16) {
+         parse_club_id:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &club_id_)));
+          set_has_club_id();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(26)) goto parse_options;
+        break;
+      }
+
+      // optional .bgs.protocol.club.v1.CreateMemberOptions options = 3;
+      case 3: {
+        if (tag == 26) {
+         parse_options:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_options()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectAtEnd()) goto success;
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0 ||
+            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.AddMemberRequest)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.AddMemberRequest)
+  return false;
+#undef DO_
+}
+
+void AddMemberRequest::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.AddMemberRequest)
+  // optional .bgs.protocol.club.v1.MemberId agent_id = 1;
+  if (has_agent_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->agent_id(), output);
+  }
+
+  // optional uint64 club_id = 2;
+  if (has_club_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->club_id(), output);
+  }
+
+  // optional .bgs.protocol.club.v1.CreateMemberOptions options = 3;
+  if (has_options()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->options(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.AddMemberRequest)
+}
+
+::google::protobuf::uint8* AddMemberRequest::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.AddMemberRequest)
+  // optional .bgs.protocol.club.v1.MemberId agent_id = 1;
+  if (has_agent_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->agent_id(), target);
+  }
+
+  // optional uint64 club_id = 2;
+  if (has_club_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->club_id(), target);
+  }
+
+  // optional .bgs.protocol.club.v1.CreateMemberOptions options = 3;
+  if (has_options()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->options(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.AddMemberRequest)
+  return target;
+}
+
+int AddMemberRequest::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .bgs.protocol.club.v1.MemberId agent_id = 1;
+    if (has_agent_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->agent_id());
+    }
+
+    // optional uint64 club_id = 2;
+    if (has_club_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->club_id());
+    }
+
+    // optional .bgs.protocol.club.v1.CreateMemberOptions options = 3;
+    if (has_options()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->options());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void AddMemberRequest::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const AddMemberRequest* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const AddMemberRequest*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void AddMemberRequest::MergeFrom(const AddMemberRequest& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_agent_id()) {
+      mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id());
+    }
+    if (from.has_club_id()) {
+      set_club_id(from.club_id());
+    }
+    if (from.has_options()) {
+      mutable_options()->::bgs::protocol::club::v1::CreateMemberOptions::MergeFrom(from.options());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void AddMemberRequest::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void AddMemberRequest::CopyFrom(const AddMemberRequest& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool AddMemberRequest::IsInitialized() const {
+
+  if (has_agent_id()) {
+    if (!this->agent_id().IsInitialized()) return false;
+  }
+  if (has_options()) {
+    if (!this->options().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void AddMemberRequest::Swap(AddMemberRequest* other) {
+  if (other != this) {
+    std::swap(agent_id_, other->agent_id_);
+    std::swap(club_id_, other->club_id_);
+    std::swap(options_, other->options_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata AddMemberRequest::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = AddMemberRequest_descriptor_;
+  metadata.reflection = AddMemberRequest_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int JoinRequest::kAgentIdFieldNumber;
 const int JoinRequest::kClubIdFieldNumber;
 const int JoinRequest::kOptionsFieldNumber;
@@ -26094,6 +26455,7 @@ void GetClubActivityResponse::Swap(GetClubActivityResponse* other) {
 const int GetStreamVoiceTokenRequest::kAgentIdFieldNumber;
 const int GetStreamVoiceTokenRequest::kClubIdFieldNumber;
 const int GetStreamVoiceTokenRequest::kStreamIdFieldNumber;
+const int GetStreamVoiceTokenRequest::kVersionFieldNumber;
 #endif  // !_MSC_VER
 
 GetStreamVoiceTokenRequest::GetStreamVoiceTokenRequest()
@@ -26118,6 +26480,7 @@ void GetStreamVoiceTokenRequest::SharedCtor() {
   agent_id_ = NULL;
   club_id_ = GOOGLE_ULONGLONG(0);
   stream_id_ = GOOGLE_ULONGLONG(0);
+  version_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -26164,8 +26527,8 @@ void GetStreamVoiceTokenRequest::Clear() {
     ::memset(&first, 0, n);                                \
   } while (0)
 
-  if (_has_bits_[0 / 32] & 7) {
-    ZR_(club_id_, stream_id_);
+  if (_has_bits_[0 / 32] & 15) {
+    ZR_(club_id_, version_);
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear();
     }
@@ -26226,6 +26589,21 @@ bool GetStreamVoiceTokenRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(32)) goto parse_version;
+        break;
+      }
+
+      // optional uint32 version = 4;
+      case 4: {
+        if (tag == 32) {
+         parse_version:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &version_)));
+          set_has_version();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -26271,6 +26649,11 @@ void GetStreamVoiceTokenRequest::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->stream_id(), output);
   }
 
+  // optional uint32 version = 4;
+  if (has_version()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->version(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -26298,6 +26681,11 @@ void GetStreamVoiceTokenRequest::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->stream_id(), target);
   }
 
+  // optional uint32 version = 4;
+  if (has_version()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->version(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -26331,6 +26719,13 @@ int GetStreamVoiceTokenRequest::ByteSize() const {
           this->stream_id());
     }
 
+    // optional uint32 version = 4;
+    if (has_version()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->version());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -26367,6 +26762,9 @@ void GetStreamVoiceTokenRequest::MergeFrom(const GetStreamVoiceTokenRequest& fro
     if (from.has_stream_id()) {
       set_stream_id(from.stream_id());
     }
+    if (from.has_version()) {
+      set_version(from.version());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -26396,6 +26794,7 @@ void GetStreamVoiceTokenRequest::Swap(GetStreamVoiceTokenRequest* other) {
     std::swap(agent_id_, other->agent_id_);
     std::swap(club_id_, other->club_id_);
     std::swap(stream_id_, other->stream_id_);
+    std::swap(version_, other->version_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/club_request.pb.h b/src/server/proto/Client/club_request.pb.h
index 67aa467c42d..e4e98f13028 100644
--- a/src/server/proto/Client/club_request.pb.h
+++ b/src/server/proto/Client/club_request.pb.h
@@ -49,6 +49,7 @@ class GetClubTypeRequest;
 class GetClubTypeResponse;
 class UpdateClubStateRequest;
 class UpdateClubSettingsRequest;
+class AddMemberRequest;
 class JoinRequest;
 class LeaveRequest;
 class KickRequest;
@@ -1144,6 +1145,109 @@ class TC_PROTO_API UpdateClubSettingsRequest : public ::google::protobuf::Messag
 };
 // -------------------------------------------------------------------
 
+class TC_PROTO_API AddMemberRequest : public ::google::protobuf::Message {
+ public:
+  AddMemberRequest();
+  virtual ~AddMemberRequest();
+
+  AddMemberRequest(const AddMemberRequest& from);
+
+  inline AddMemberRequest& operator=(const AddMemberRequest& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const AddMemberRequest& default_instance();
+
+  void Swap(AddMemberRequest* other);
+
+  // implements Message ----------------------------------------------
+
+  AddMemberRequest* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const AddMemberRequest& from);
+  void MergeFrom(const AddMemberRequest& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .bgs.protocol.club.v1.MemberId agent_id = 1;
+  inline bool has_agent_id() const;
+  inline void clear_agent_id();
+  static const int kAgentIdFieldNumber = 1;
+  inline const ::bgs::protocol::club::v1::MemberId& agent_id() const;
+  inline ::bgs::protocol::club::v1::MemberId* mutable_agent_id();
+  inline ::bgs::protocol::club::v1::MemberId* release_agent_id();
+  inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id);
+
+  // optional uint64 club_id = 2;
+  inline bool has_club_id() const;
+  inline void clear_club_id();
+  static const int kClubIdFieldNumber = 2;
+  inline ::google::protobuf::uint64 club_id() const;
+  inline void set_club_id(::google::protobuf::uint64 value);
+
+  // optional .bgs.protocol.club.v1.CreateMemberOptions options = 3;
+  inline bool has_options() const;
+  inline void clear_options();
+  static const int kOptionsFieldNumber = 3;
+  inline const ::bgs::protocol::club::v1::CreateMemberOptions& options() const;
+  inline ::bgs::protocol::club::v1::CreateMemberOptions* mutable_options();
+  inline ::bgs::protocol::club::v1::CreateMemberOptions* release_options();
+  inline void set_allocated_options(::bgs::protocol::club::v1::CreateMemberOptions* options);
+
+  // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.AddMemberRequest)
+ private:
+  inline void set_has_agent_id();
+  inline void clear_has_agent_id();
+  inline void set_has_club_id();
+  inline void clear_has_club_id();
+  inline void set_has_options();
+  inline void clear_has_options();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
+  ::bgs::protocol::club::v1::MemberId* agent_id_;
+  ::google::protobuf::uint64 club_id_;
+  ::bgs::protocol::club::v1::CreateMemberOptions* options_;
+  friend void TC_PROTO_API protobuf_AddDesc_club_5frequest_2eproto();
+  friend void protobuf_AssignDesc_club_5frequest_2eproto();
+  friend void protobuf_ShutdownFile_club_5frequest_2eproto();
+
+  void InitAsDefaultInstance();
+  static AddMemberRequest* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class TC_PROTO_API JoinRequest : public ::google::protobuf::Message {
  public:
   JoinRequest();
@@ -7925,6 +8029,13 @@ class TC_PROTO_API GetStreamVoiceTokenRequest : public ::google::protobuf::Messa
   inline ::google::protobuf::uint64 stream_id() const;
   inline void set_stream_id(::google::protobuf::uint64 value);
 
+  // optional uint32 version = 4;
+  inline bool has_version() const;
+  inline void clear_version();
+  static const int kVersionFieldNumber = 4;
+  inline ::google::protobuf::uint32 version() const;
+  inline void set_version(::google::protobuf::uint32 value);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.GetStreamVoiceTokenRequest)
  private:
   inline void set_has_agent_id();
@@ -7933,6 +8044,8 @@ class TC_PROTO_API GetStreamVoiceTokenRequest : public ::google::protobuf::Messa
   inline void clear_has_club_id();
   inline void set_has_stream_id();
   inline void clear_has_stream_id();
+  inline void set_has_version();
+  inline void clear_has_version();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -7941,6 +8054,7 @@ class TC_PROTO_API GetStreamVoiceTokenRequest : public ::google::protobuf::Messa
   ::bgs::protocol::club::v1::MemberId* agent_id_;
   ::google::protobuf::uint64 club_id_;
   ::google::protobuf::uint64 stream_id_;
+  ::google::protobuf::uint32 version_;
   friend void TC_PROTO_API protobuf_AddDesc_club_5frequest_2eproto();
   friend void protobuf_AssignDesc_club_5frequest_2eproto();
   friend void protobuf_ShutdownFile_club_5frequest_2eproto();
@@ -9033,6 +9147,116 @@ inline void UpdateClubSettingsRequest::set_allocated_options(::bgs::protocol::cl
 
 // -------------------------------------------------------------------
 
+// AddMemberRequest
+
+// optional .bgs.protocol.club.v1.MemberId agent_id = 1;
+inline bool AddMemberRequest::has_agent_id() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void AddMemberRequest::set_has_agent_id() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void AddMemberRequest::clear_has_agent_id() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void AddMemberRequest::clear_agent_id() {
+  if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear();
+  clear_has_agent_id();
+}
+inline const ::bgs::protocol::club::v1::MemberId& AddMemberRequest::agent_id() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.AddMemberRequest.agent_id)
+  return agent_id_ != NULL ? *agent_id_ : *default_instance_->agent_id_;
+}
+inline ::bgs::protocol::club::v1::MemberId* AddMemberRequest::mutable_agent_id() {
+  set_has_agent_id();
+  if (agent_id_ == NULL) agent_id_ = new ::bgs::protocol::club::v1::MemberId;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.AddMemberRequest.agent_id)
+  return agent_id_;
+}
+inline ::bgs::protocol::club::v1::MemberId* AddMemberRequest::release_agent_id() {
+  clear_has_agent_id();
+  ::bgs::protocol::club::v1::MemberId* temp = agent_id_;
+  agent_id_ = NULL;
+  return temp;
+}
+inline void AddMemberRequest::set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id) {
+  delete agent_id_;
+  agent_id_ = agent_id;
+  if (agent_id) {
+    set_has_agent_id();
+  } else {
+    clear_has_agent_id();
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.AddMemberRequest.agent_id)
+}
+
+// optional uint64 club_id = 2;
+inline bool AddMemberRequest::has_club_id() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void AddMemberRequest::set_has_club_id() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void AddMemberRequest::clear_has_club_id() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void AddMemberRequest::clear_club_id() {
+  club_id_ = GOOGLE_ULONGLONG(0);
+  clear_has_club_id();
+}
+inline ::google::protobuf::uint64 AddMemberRequest::club_id() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.AddMemberRequest.club_id)
+  return club_id_;
+}
+inline void AddMemberRequest::set_club_id(::google::protobuf::uint64 value) {
+  set_has_club_id();
+  club_id_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.AddMemberRequest.club_id)
+}
+
+// optional .bgs.protocol.club.v1.CreateMemberOptions options = 3;
+inline bool AddMemberRequest::has_options() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void AddMemberRequest::set_has_options() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void AddMemberRequest::clear_has_options() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void AddMemberRequest::clear_options() {
+  if (options_ != NULL) options_->::bgs::protocol::club::v1::CreateMemberOptions::Clear();
+  clear_has_options();
+}
+inline const ::bgs::protocol::club::v1::CreateMemberOptions& AddMemberRequest::options() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.AddMemberRequest.options)
+  return options_ != NULL ? *options_ : *default_instance_->options_;
+}
+inline ::bgs::protocol::club::v1::CreateMemberOptions* AddMemberRequest::mutable_options() {
+  set_has_options();
+  if (options_ == NULL) options_ = new ::bgs::protocol::club::v1::CreateMemberOptions;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.AddMemberRequest.options)
+  return options_;
+}
+inline ::bgs::protocol::club::v1::CreateMemberOptions* AddMemberRequest::release_options() {
+  clear_has_options();
+  ::bgs::protocol::club::v1::CreateMemberOptions* temp = options_;
+  options_ = NULL;
+  return temp;
+}
+inline void AddMemberRequest::set_allocated_options(::bgs::protocol::club::v1::CreateMemberOptions* options) {
+  delete options_;
+  options_ = options;
+  if (options) {
+    set_has_options();
+  } else {
+    clear_has_options();
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.AddMemberRequest.options)
+}
+
+// -------------------------------------------------------------------
+
 // JoinRequest
 
 // optional .bgs.protocol.club.v1.MemberId agent_id = 1;
@@ -15333,6 +15557,30 @@ inline void GetStreamVoiceTokenRequest::set_stream_id(::google::protobuf::uint64
   // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.GetStreamVoiceTokenRequest.stream_id)
 }
 
+// optional uint32 version = 4;
+inline bool GetStreamVoiceTokenRequest::has_version() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void GetStreamVoiceTokenRequest::set_has_version() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void GetStreamVoiceTokenRequest::clear_has_version() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void GetStreamVoiceTokenRequest::clear_version() {
+  version_ = 0u;
+  clear_has_version();
+}
+inline ::google::protobuf::uint32 GetStreamVoiceTokenRequest::version() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.GetStreamVoiceTokenRequest.version)
+  return version_;
+}
+inline void GetStreamVoiceTokenRequest::set_version(::google::protobuf::uint32 value) {
+  set_has_version();
+  version_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.GetStreamVoiceTokenRequest.version)
+}
+
 // -------------------------------------------------------------------
 
 // GetStreamVoiceTokenResponse
diff --git a/src/server/proto/Client/club_role.pb.cc b/src/server/proto/Client/club_role.pb.cc
index 6b1dadf90e6..0095dd90d60 100644
--- a/src/server/proto/Client/club_role.pb.cc
+++ b/src/server/proto/Client/club_role.pb.cc
@@ -45,7 +45,7 @@ void protobuf_AssignDesc_club_5frole_2eproto() {
       "club_role.proto");
   GOOGLE_CHECK(file != NULL);
   ClubPrivilegeSet_descriptor_ = file->message_type(0);
-  static const int ClubPrivilegeSet_offsets_[48] = {
+  static const int ClubPrivilegeSet_offsets_[49] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_destroy_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_attribute_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_name_),
@@ -53,6 +53,7 @@ void protobuf_AssignDesc_club_5frole_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_avatar_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_broadcast_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_privacy_level_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_add_member_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_kick_member_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_own_member_attribute_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_other_member_attribute_),
@@ -183,52 +184,53 @@ void protobuf_AddDesc_club_5frole_2eproto() {
   ::bgs::protocol::protobuf_AddDesc_role_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\017club_role.proto\022\024bgs.protocol.club.v1\032"
-    "\020role_types.proto\"\257\013\n\020ClubPrivilegeSet\022\023"
+    "\020role_types.proto\"\307\013\n\020ClubPrivilegeSet\022\023"
     "\n\013can_destroy\030\001 \001(\010\022\031\n\021can_set_attribute"
     "\030\n \001(\010\022\024\n\014can_set_name\030\013 \001(\010\022\033\n\023can_set_"
     "description\030\014 \001(\010\022\026\n\016can_set_avatar\030\r \001("
     "\010\022\031\n\021can_set_broadcast\030\016 \001(\010\022\035\n\025can_set_"
-    "privacy_level\030\017 \001(\010\022\027\n\017can_kick_member\030\036"
-    " \001(\010\022$\n\034can_set_own_member_attribute\030\037 \001"
-    "(\010\022&\n\036can_set_other_member_attribute\030  \001"
-    "(\010\022\037\n\027can_set_own_voice_state\030! \001(\010\022\"\n\032c"
-    "an_set_own_presence_level\030\" \001(\010\022!\n\031can_s"
-    "et_own_whisper_level\030# \001(\010\022\037\n\027can_set_ow"
-    "n_member_note\030$ \001(\010\022!\n\031can_set_other_mem"
-    "ber_note\030% \001(\010\022\025\n\rcan_use_voice\0302 \001(\010\022%\n"
-    "\035can_voice_mute_member_for_all\0303 \001(\010\022\032\n\022"
-    "can_get_invitation\030F \001(\010\022\033\n\023can_send_inv"
-    "itation\030G \001(\010\022!\n\031can_send_guest_invitati"
-    "on\030H \001(\010\022!\n\031can_revoke_own_invitation\030I "
-    "\001(\010\022#\n\033can_revoke_other_invitation\030J \001(\010"
-    "\022\032\n\022can_get_suggestion\030Z \001(\010\022\032\n\022can_sugg"
-    "est_member\030[ \001(\010\022\032\n\022can_approve_member\030\\"
-    " \001(\010\022\026\n\016can_get_ticket\030n \001(\010\022\031\n\021can_crea"
-    "te_ticket\030o \001(\010\022\032\n\022can_destroy_ticket\030p "
-    "\001(\010\022\024\n\013can_get_ban\030\202\001 \001(\010\022\024\n\013can_add_ban"
-    "\030\203\001 \001(\010\022\027\n\016can_remove_ban\030\204\001 \001(\010\022\032\n\021can_"
-    "create_stream\030\214\001 \001(\010\022\033\n\022can_destroy_stre"
-    "am\030\215\001 \001(\010\022 \n\027can_set_stream_position\030\216\001 "
-    "\001(\010\022!\n\030can_set_stream_attribute\030\217\001 \001(\010\022\034"
-    "\n\023can_set_stream_name\030\220\001 \001(\010\022\037\n\026can_set_"
-    "stream_subject\030\221\001 \001(\010\022\036\n\025can_set_stream_"
-    "access\030\222\001 \001(\010\022#\n\032can_set_stream_voice_le"
-    "vel\030\223\001 \001(\010\022\033\n\022can_create_message\030\264\001 \001(\010\022"
-    " \n\027can_destroy_own_message\030\265\001 \001(\010\022\"\n\031can"
-    "_destroy_other_message\030\266\001 \001(\010\022\035\n\024can_edi"
-    "t_own_message\030\267\001 \001(\010\022\030\n\017can_pin_message\030"
-    "\270\001 \001(\010\022\030\n\017can_mention_all\030\271\001 \001(\010\022\031\n\020can_"
-    "mention_here\030\272\001 \001(\010\022\033\n\022can_mention_membe"
-    "r\030\273\001 \001(\010\022\031\n\020can_mention_role\030\274\001 \001(\010\"\271\001\n\010"
-    "ClubRole\022\n\n\002id\030\001 \001(\r\022&\n\005state\030\002 \001(\0132\027.bg"
-    "s.protocol.RoleState\0229\n\tprivilege\030\003 \001(\0132"
-    "&.bgs.protocol.club.v1.ClubPrivilegeSet\022"
-    "\"\n\032always_grant_stream_access\030\004 \001(\010\022\032\n\022a"
-    "llow_in_club_slot\030\005 \001(\010\"\224\001\n\013ClubRoleSet\022"
-    ",\n\004role\030\001 \003(\0132\036.bgs.protocol.club.v1.Clu"
-    "bRole\022\030\n\014default_role\030\005 \003(\rB\002\020\001\022,\n$assig"
-    "nment_respects_relegation_chain\030\006 \001(\010\022\017\n"
-    "\007subtype\030\007 \001(\tB\002H\001", 1858);
+    "privacy_level\030\017 \001(\010\022\026\n\016can_add_member\030\035 "
+    "\001(\010\022\027\n\017can_kick_member\030\036 \001(\010\022$\n\034can_set_"
+    "own_member_attribute\030\037 \001(\010\022&\n\036can_set_ot"
+    "her_member_attribute\030  \001(\010\022\037\n\027can_set_ow"
+    "n_voice_state\030! \001(\010\022\"\n\032can_set_own_prese"
+    "nce_level\030\" \001(\010\022!\n\031can_set_own_whisper_l"
+    "evel\030# \001(\010\022\037\n\027can_set_own_member_note\030$ "
+    "\001(\010\022!\n\031can_set_other_member_note\030% \001(\010\022\025"
+    "\n\rcan_use_voice\0302 \001(\010\022%\n\035can_voice_mute_"
+    "member_for_all\0303 \001(\010\022\032\n\022can_get_invitati"
+    "on\030F \001(\010\022\033\n\023can_send_invitation\030G \001(\010\022!\n"
+    "\031can_send_guest_invitation\030H \001(\010\022!\n\031can_"
+    "revoke_own_invitation\030I \001(\010\022#\n\033can_revok"
+    "e_other_invitation\030J \001(\010\022\032\n\022can_get_sugg"
+    "estion\030Z \001(\010\022\032\n\022can_suggest_member\030[ \001(\010"
+    "\022\032\n\022can_approve_member\030\\ \001(\010\022\026\n\016can_get_"
+    "ticket\030n \001(\010\022\031\n\021can_create_ticket\030o \001(\010\022"
+    "\032\n\022can_destroy_ticket\030p \001(\010\022\024\n\013can_get_b"
+    "an\030\202\001 \001(\010\022\024\n\013can_add_ban\030\203\001 \001(\010\022\027\n\016can_r"
+    "emove_ban\030\204\001 \001(\010\022\032\n\021can_create_stream\030\214\001"
+    " \001(\010\022\033\n\022can_destroy_stream\030\215\001 \001(\010\022 \n\027can"
+    "_set_stream_position\030\216\001 \001(\010\022!\n\030can_set_s"
+    "tream_attribute\030\217\001 \001(\010\022\034\n\023can_set_stream"
+    "_name\030\220\001 \001(\010\022\037\n\026can_set_stream_subject\030\221"
+    "\001 \001(\010\022\036\n\025can_set_stream_access\030\222\001 \001(\010\022#\n"
+    "\032can_set_stream_voice_level\030\223\001 \001(\010\022\033\n\022ca"
+    "n_create_message\030\264\001 \001(\010\022 \n\027can_destroy_o"
+    "wn_message\030\265\001 \001(\010\022\"\n\031can_destroy_other_m"
+    "essage\030\266\001 \001(\010\022\035\n\024can_edit_own_message\030\267\001"
+    " \001(\010\022\030\n\017can_pin_message\030\270\001 \001(\010\022\030\n\017can_me"
+    "ntion_all\030\271\001 \001(\010\022\031\n\020can_mention_here\030\272\001 "
+    "\001(\010\022\033\n\022can_mention_member\030\273\001 \001(\010\022\031\n\020can_"
+    "mention_role\030\274\001 \001(\010\"\271\001\n\010ClubRole\022\n\n\002id\030\001"
+    " \001(\r\022&\n\005state\030\002 \001(\0132\027.bgs.protocol.RoleS"
+    "tate\0229\n\tprivilege\030\003 \001(\0132&.bgs.protocol.c"
+    "lub.v1.ClubPrivilegeSet\022\"\n\032always_grant_"
+    "stream_access\030\004 \001(\010\022\032\n\022allow_in_club_slo"
+    "t\030\005 \001(\010\"\224\001\n\013ClubRoleSet\022,\n\004role\030\001 \003(\0132\036."
+    "bgs.protocol.club.v1.ClubRole\022\030\n\014default"
+    "_role\030\005 \003(\rB\002\020\001\022,\n$assignment_respects_r"
+    "elegation_chain\030\006 \001(\010\022\017\n\007subtype\030\007 \001(\tB\002"
+    "H\001", 1882);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_role.proto", &protobuf_RegisterTypes);
   ClubPrivilegeSet::default_instance_ = new ClubPrivilegeSet();
@@ -257,6 +259,7 @@ const int ClubPrivilegeSet::kCanSetDescriptionFieldNumber;
 const int ClubPrivilegeSet::kCanSetAvatarFieldNumber;
 const int ClubPrivilegeSet::kCanSetBroadcastFieldNumber;
 const int ClubPrivilegeSet::kCanSetPrivacyLevelFieldNumber;
+const int ClubPrivilegeSet::kCanAddMemberFieldNumber;
 const int ClubPrivilegeSet::kCanKickMemberFieldNumber;
 const int ClubPrivilegeSet::kCanSetOwnMemberAttributeFieldNumber;
 const int ClubPrivilegeSet::kCanSetOtherMemberAttributeFieldNumber;
@@ -325,6 +328,7 @@ void ClubPrivilegeSet::SharedCtor() {
   can_set_avatar_ = false;
   can_set_broadcast_ = false;
   can_set_privacy_level_ = false;
+  can_add_member_ = false;
   can_kick_member_ = false;
   can_set_own_member_attribute_ = false;
   can_set_other_member_attribute_ = false;
@@ -412,23 +416,24 @@ void ClubPrivilegeSet::Clear() {
   } while (0)
 
   if (_has_bits_[0 / 32] & 255) {
-    ZR_(can_destroy_, can_kick_member_);
+    ZR_(can_destroy_, can_add_member_);
   }
   if (_has_bits_[8 / 32] & 65280) {
-    ZR_(can_set_own_member_attribute_, can_use_voice_);
+    ZR_(can_kick_member_, can_set_other_member_note_);
   }
   if (_has_bits_[16 / 32] & 16711680) {
-    ZR_(can_voice_mute_member_for_all_, can_suggest_member_);
+    ZR_(can_use_voice_, can_get_suggestion_);
   }
   if (_has_bits_[24 / 32] & 4278190080) {
-    ZR_(can_approve_member_, can_create_stream_);
+    ZR_(can_suggest_member_, can_remove_ban_);
   }
   if (_has_bits_[32 / 32] & 255) {
-    ZR_(can_destroy_stream_, can_create_message_);
+    ZR_(can_create_stream_, can_set_stream_voice_level_);
   }
   if (_has_bits_[40 / 32] & 65280) {
-    ZR_(can_destroy_own_message_, can_mention_role_);
+    ZR_(can_create_message_, can_mention_member_);
   }
+  can_mention_role_ = false;
 
 #undef OFFSET_OF_FIELD_
 #undef ZR_
@@ -547,6 +552,21 @@ bool ClubPrivilegeSet::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(232)) goto parse_can_add_member;
+        break;
+      }
+
+      // optional bool can_add_member = 29;
+      case 29: {
+        if (tag == 232) {
+         parse_can_add_member:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &can_add_member_)));
+          set_has_can_add_member();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectTag(240)) goto parse_can_kick_member;
         break;
       }
@@ -1226,6 +1246,11 @@ void ClubPrivilegeSet::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(15, this->can_set_privacy_level(), output);
   }
 
+  // optional bool can_add_member = 29;
+  if (has_can_add_member()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(29, this->can_add_member(), output);
+  }
+
   // optional bool can_kick_member = 30;
   if (has_can_kick_member()) {
     ::google::protobuf::internal::WireFormatLite::WriteBool(30, this->can_kick_member(), output);
@@ -1476,6 +1501,11 @@ void ClubPrivilegeSet::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(15, this->can_set_privacy_level(), target);
   }
 
+  // optional bool can_add_member = 29;
+  if (has_can_add_member()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(29, this->can_add_member(), target);
+  }
+
   // optional bool can_kick_member = 30;
   if (has_can_kick_member()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(30, this->can_kick_member(), target);
@@ -1728,13 +1758,18 @@ int ClubPrivilegeSet::ByteSize() const {
       total_size += 1 + 1;
     }
 
-    // optional bool can_kick_member = 30;
-    if (has_can_kick_member()) {
+    // optional bool can_add_member = 29;
+    if (has_can_add_member()) {
       total_size += 2 + 1;
     }
 
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional bool can_kick_member = 30;
+    if (has_can_kick_member()) {
+      total_size += 2 + 1;
+    }
+
     // optional bool can_set_own_member_attribute = 31;
     if (has_can_set_own_member_attribute()) {
       total_size += 2 + 1;
@@ -1770,13 +1805,13 @@ int ClubPrivilegeSet::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional bool can_use_voice = 50;
     if (has_can_use_voice()) {
       total_size += 2 + 1;
     }
 
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional bool can_voice_mute_member_for_all = 51;
     if (has_can_voice_mute_member_for_all()) {
       total_size += 2 + 1;
@@ -1812,13 +1847,13 @@ int ClubPrivilegeSet::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     // optional bool can_suggest_member = 91;
     if (has_can_suggest_member()) {
       total_size += 2 + 1;
     }
 
-  }
-  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     // optional bool can_approve_member = 92;
     if (has_can_approve_member()) {
       total_size += 2 + 1;
@@ -1854,13 +1889,13 @@ int ClubPrivilegeSet::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     // optional bool can_create_stream = 140;
     if (has_can_create_stream()) {
       total_size += 2 + 1;
     }
 
-  }
-  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     // optional bool can_destroy_stream = 141;
     if (has_can_destroy_stream()) {
       total_size += 2 + 1;
@@ -1896,13 +1931,13 @@ int ClubPrivilegeSet::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     // optional bool can_create_message = 180;
     if (has_can_create_message()) {
       total_size += 2 + 1;
     }
 
-  }
-  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     // optional bool can_destroy_own_message = 181;
     if (has_can_destroy_own_message()) {
       total_size += 2 + 1;
@@ -1938,6 +1973,8 @@ int ClubPrivilegeSet::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     // optional bool can_mention_role = 188;
     if (has_can_mention_role()) {
       total_size += 2 + 1;
@@ -1991,11 +2028,14 @@ void ClubPrivilegeSet::MergeFrom(const ClubPrivilegeSet& from) {
     if (from.has_can_set_privacy_level()) {
       set_can_set_privacy_level(from.can_set_privacy_level());
     }
-    if (from.has_can_kick_member()) {
-      set_can_kick_member(from.can_kick_member());
+    if (from.has_can_add_member()) {
+      set_can_add_member(from.can_add_member());
     }
   }
   if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_can_kick_member()) {
+      set_can_kick_member(from.can_kick_member());
+    }
     if (from.has_can_set_own_member_attribute()) {
       set_can_set_own_member_attribute(from.can_set_own_member_attribute());
     }
@@ -2017,11 +2057,11 @@ void ClubPrivilegeSet::MergeFrom(const ClubPrivilegeSet& from) {
     if (from.has_can_set_other_member_note()) {
       set_can_set_other_member_note(from.can_set_other_member_note());
     }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_can_use_voice()) {
       set_can_use_voice(from.can_use_voice());
     }
-  }
-  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_can_voice_mute_member_for_all()) {
       set_can_voice_mute_member_for_all(from.can_voice_mute_member_for_all());
     }
@@ -2043,11 +2083,11 @@ void ClubPrivilegeSet::MergeFrom(const ClubPrivilegeSet& from) {
     if (from.has_can_get_suggestion()) {
       set_can_get_suggestion(from.can_get_suggestion());
     }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (from.has_can_suggest_member()) {
       set_can_suggest_member(from.can_suggest_member());
     }
-  }
-  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (from.has_can_approve_member()) {
       set_can_approve_member(from.can_approve_member());
     }
@@ -2069,11 +2109,11 @@ void ClubPrivilegeSet::MergeFrom(const ClubPrivilegeSet& from) {
     if (from.has_can_remove_ban()) {
       set_can_remove_ban(from.can_remove_ban());
     }
+  }
+  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (from.has_can_create_stream()) {
       set_can_create_stream(from.can_create_stream());
     }
-  }
-  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (from.has_can_destroy_stream()) {
       set_can_destroy_stream(from.can_destroy_stream());
     }
@@ -2095,11 +2135,11 @@ void ClubPrivilegeSet::MergeFrom(const ClubPrivilegeSet& from) {
     if (from.has_can_set_stream_voice_level()) {
       set_can_set_stream_voice_level(from.can_set_stream_voice_level());
     }
+  }
+  if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     if (from.has_can_create_message()) {
       set_can_create_message(from.can_create_message());
     }
-  }
-  if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     if (from.has_can_destroy_own_message()) {
       set_can_destroy_own_message(from.can_destroy_own_message());
     }
@@ -2121,6 +2161,8 @@ void ClubPrivilegeSet::MergeFrom(const ClubPrivilegeSet& from) {
     if (from.has_can_mention_member()) {
       set_can_mention_member(from.can_mention_member());
     }
+  }
+  if (from._has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     if (from.has_can_mention_role()) {
       set_can_mention_role(from.can_mention_role());
     }
@@ -2154,6 +2196,7 @@ void ClubPrivilegeSet::Swap(ClubPrivilegeSet* other) {
     std::swap(can_set_avatar_, other->can_set_avatar_);
     std::swap(can_set_broadcast_, other->can_set_broadcast_);
     std::swap(can_set_privacy_level_, other->can_set_privacy_level_);
+    std::swap(can_add_member_, other->can_add_member_);
     std::swap(can_kick_member_, other->can_kick_member_);
     std::swap(can_set_own_member_attribute_, other->can_set_own_member_attribute_);
     std::swap(can_set_other_member_attribute_, other->can_set_other_member_attribute_);
diff --git a/src/server/proto/Client/club_role.pb.h b/src/server/proto/Client/club_role.pb.h
index 8808af111de..6f3ddebe584 100644
--- a/src/server/proto/Client/club_role.pb.h
+++ b/src/server/proto/Client/club_role.pb.h
@@ -146,6 +146,13 @@ class TC_PROTO_API ClubPrivilegeSet : public ::google::protobuf::Message {
   inline bool can_set_privacy_level() const;
   inline void set_can_set_privacy_level(bool value);
 
+  // optional bool can_add_member = 29;
+  inline bool has_can_add_member() const;
+  inline void clear_can_add_member();
+  static const int kCanAddMemberFieldNumber = 29;
+  inline bool can_add_member() const;
+  inline void set_can_add_member(bool value);
+
   // optional bool can_kick_member = 30;
   inline bool has_can_kick_member() const;
   inline void clear_can_kick_member();
@@ -449,6 +456,8 @@ class TC_PROTO_API ClubPrivilegeSet : public ::google::protobuf::Message {
   inline void clear_has_can_set_broadcast();
   inline void set_has_can_set_privacy_level();
   inline void clear_has_can_set_privacy_level();
+  inline void set_has_can_add_member();
+  inline void clear_has_can_add_member();
   inline void set_has_can_kick_member();
   inline void clear_has_can_kick_member();
   inline void set_has_can_set_own_member_attribute();
@@ -542,6 +551,7 @@ class TC_PROTO_API ClubPrivilegeSet : public ::google::protobuf::Message {
   bool can_set_avatar_;
   bool can_set_broadcast_;
   bool can_set_privacy_level_;
+  bool can_add_member_;
   bool can_kick_member_;
   bool can_set_own_member_attribute_;
   bool can_set_other_member_attribute_;
@@ -1013,15 +1023,39 @@ inline void ClubPrivilegeSet::set_can_set_privacy_level(bool value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.ClubPrivilegeSet.can_set_privacy_level)
 }
 
+// optional bool can_add_member = 29;
+inline bool ClubPrivilegeSet::has_can_add_member() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void ClubPrivilegeSet::set_has_can_add_member() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void ClubPrivilegeSet::clear_has_can_add_member() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void ClubPrivilegeSet::clear_can_add_member() {
+  can_add_member_ = false;
+  clear_has_can_add_member();
+}
+inline bool ClubPrivilegeSet::can_add_member() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubPrivilegeSet.can_add_member)
+  return can_add_member_;
+}
+inline void ClubPrivilegeSet::set_can_add_member(bool value) {
+  set_has_can_add_member();
+  can_add_member_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.ClubPrivilegeSet.can_add_member)
+}
+
 // optional bool can_kick_member = 30;
 inline bool ClubPrivilegeSet::has_can_kick_member() const {
-  return (_has_bits_[0] & 0x00000080u) != 0;
+  return (_has_bits_[0] & 0x00000100u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_kick_member() {
-  _has_bits_[0] |= 0x00000080u;
+  _has_bits_[0] |= 0x00000100u;
 }
 inline void ClubPrivilegeSet::clear_has_can_kick_member() {
-  _has_bits_[0] &= ~0x00000080u;
+  _has_bits_[0] &= ~0x00000100u;
 }
 inline void ClubPrivilegeSet::clear_can_kick_member() {
   can_kick_member_ = false;
@@ -1039,13 +1073,13 @@ inline void ClubPrivilegeSet::set_can_kick_member(bool value) {
 
 // optional bool can_set_own_member_attribute = 31;
 inline bool ClubPrivilegeSet::has_can_set_own_member_attribute() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
+  return (_has_bits_[0] & 0x00000200u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_own_member_attribute() {
-  _has_bits_[0] |= 0x00000100u;
+  _has_bits_[0] |= 0x00000200u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_own_member_attribute() {
-  _has_bits_[0] &= ~0x00000100u;
+  _has_bits_[0] &= ~0x00000200u;
 }
 inline void ClubPrivilegeSet::clear_can_set_own_member_attribute() {
   can_set_own_member_attribute_ = false;
@@ -1063,13 +1097,13 @@ inline void ClubPrivilegeSet::set_can_set_own_member_attribute(bool value) {
 
 // optional bool can_set_other_member_attribute = 32;
 inline bool ClubPrivilegeSet::has_can_set_other_member_attribute() const {
-  return (_has_bits_[0] & 0x00000200u) != 0;
+  return (_has_bits_[0] & 0x00000400u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_other_member_attribute() {
-  _has_bits_[0] |= 0x00000200u;
+  _has_bits_[0] |= 0x00000400u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_other_member_attribute() {
-  _has_bits_[0] &= ~0x00000200u;
+  _has_bits_[0] &= ~0x00000400u;
 }
 inline void ClubPrivilegeSet::clear_can_set_other_member_attribute() {
   can_set_other_member_attribute_ = false;
@@ -1087,13 +1121,13 @@ inline void ClubPrivilegeSet::set_can_set_other_member_attribute(bool value) {
 
 // optional bool can_set_own_voice_state = 33;
 inline bool ClubPrivilegeSet::has_can_set_own_voice_state() const {
-  return (_has_bits_[0] & 0x00000400u) != 0;
+  return (_has_bits_[0] & 0x00000800u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_own_voice_state() {
-  _has_bits_[0] |= 0x00000400u;
+  _has_bits_[0] |= 0x00000800u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_own_voice_state() {
-  _has_bits_[0] &= ~0x00000400u;
+  _has_bits_[0] &= ~0x00000800u;
 }
 inline void ClubPrivilegeSet::clear_can_set_own_voice_state() {
   can_set_own_voice_state_ = false;
@@ -1111,13 +1145,13 @@ inline void ClubPrivilegeSet::set_can_set_own_voice_state(bool value) {
 
 // optional bool can_set_own_presence_level = 34;
 inline bool ClubPrivilegeSet::has_can_set_own_presence_level() const {
-  return (_has_bits_[0] & 0x00000800u) != 0;
+  return (_has_bits_[0] & 0x00001000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_own_presence_level() {
-  _has_bits_[0] |= 0x00000800u;
+  _has_bits_[0] |= 0x00001000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_own_presence_level() {
-  _has_bits_[0] &= ~0x00000800u;
+  _has_bits_[0] &= ~0x00001000u;
 }
 inline void ClubPrivilegeSet::clear_can_set_own_presence_level() {
   can_set_own_presence_level_ = false;
@@ -1135,13 +1169,13 @@ inline void ClubPrivilegeSet::set_can_set_own_presence_level(bool value) {
 
 // optional bool can_set_own_whisper_level = 35;
 inline bool ClubPrivilegeSet::has_can_set_own_whisper_level() const {
-  return (_has_bits_[0] & 0x00001000u) != 0;
+  return (_has_bits_[0] & 0x00002000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_own_whisper_level() {
-  _has_bits_[0] |= 0x00001000u;
+  _has_bits_[0] |= 0x00002000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_own_whisper_level() {
-  _has_bits_[0] &= ~0x00001000u;
+  _has_bits_[0] &= ~0x00002000u;
 }
 inline void ClubPrivilegeSet::clear_can_set_own_whisper_level() {
   can_set_own_whisper_level_ = false;
@@ -1159,13 +1193,13 @@ inline void ClubPrivilegeSet::set_can_set_own_whisper_level(bool value) {
 
 // optional bool can_set_own_member_note = 36;
 inline bool ClubPrivilegeSet::has_can_set_own_member_note() const {
-  return (_has_bits_[0] & 0x00002000u) != 0;
+  return (_has_bits_[0] & 0x00004000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_own_member_note() {
-  _has_bits_[0] |= 0x00002000u;
+  _has_bits_[0] |= 0x00004000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_own_member_note() {
-  _has_bits_[0] &= ~0x00002000u;
+  _has_bits_[0] &= ~0x00004000u;
 }
 inline void ClubPrivilegeSet::clear_can_set_own_member_note() {
   can_set_own_member_note_ = false;
@@ -1183,13 +1217,13 @@ inline void ClubPrivilegeSet::set_can_set_own_member_note(bool value) {
 
 // optional bool can_set_other_member_note = 37;
 inline bool ClubPrivilegeSet::has_can_set_other_member_note() const {
-  return (_has_bits_[0] & 0x00004000u) != 0;
+  return (_has_bits_[0] & 0x00008000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_other_member_note() {
-  _has_bits_[0] |= 0x00004000u;
+  _has_bits_[0] |= 0x00008000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_other_member_note() {
-  _has_bits_[0] &= ~0x00004000u;
+  _has_bits_[0] &= ~0x00008000u;
 }
 inline void ClubPrivilegeSet::clear_can_set_other_member_note() {
   can_set_other_member_note_ = false;
@@ -1207,13 +1241,13 @@ inline void ClubPrivilegeSet::set_can_set_other_member_note(bool value) {
 
 // optional bool can_use_voice = 50;
 inline bool ClubPrivilegeSet::has_can_use_voice() const {
-  return (_has_bits_[0] & 0x00008000u) != 0;
+  return (_has_bits_[0] & 0x00010000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_use_voice() {
-  _has_bits_[0] |= 0x00008000u;
+  _has_bits_[0] |= 0x00010000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_use_voice() {
-  _has_bits_[0] &= ~0x00008000u;
+  _has_bits_[0] &= ~0x00010000u;
 }
 inline void ClubPrivilegeSet::clear_can_use_voice() {
   can_use_voice_ = false;
@@ -1231,13 +1265,13 @@ inline void ClubPrivilegeSet::set_can_use_voice(bool value) {
 
 // optional bool can_voice_mute_member_for_all = 51;
 inline bool ClubPrivilegeSet::has_can_voice_mute_member_for_all() const {
-  return (_has_bits_[0] & 0x00010000u) != 0;
+  return (_has_bits_[0] & 0x00020000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_voice_mute_member_for_all() {
-  _has_bits_[0] |= 0x00010000u;
+  _has_bits_[0] |= 0x00020000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_voice_mute_member_for_all() {
-  _has_bits_[0] &= ~0x00010000u;
+  _has_bits_[0] &= ~0x00020000u;
 }
 inline void ClubPrivilegeSet::clear_can_voice_mute_member_for_all() {
   can_voice_mute_member_for_all_ = false;
@@ -1255,13 +1289,13 @@ inline void ClubPrivilegeSet::set_can_voice_mute_member_for_all(bool value) {
 
 // optional bool can_get_invitation = 70;
 inline bool ClubPrivilegeSet::has_can_get_invitation() const {
-  return (_has_bits_[0] & 0x00020000u) != 0;
+  return (_has_bits_[0] & 0x00040000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_get_invitation() {
-  _has_bits_[0] |= 0x00020000u;
+  _has_bits_[0] |= 0x00040000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_get_invitation() {
-  _has_bits_[0] &= ~0x00020000u;
+  _has_bits_[0] &= ~0x00040000u;
 }
 inline void ClubPrivilegeSet::clear_can_get_invitation() {
   can_get_invitation_ = false;
@@ -1279,13 +1313,13 @@ inline void ClubPrivilegeSet::set_can_get_invitation(bool value) {
 
 // optional bool can_send_invitation = 71;
 inline bool ClubPrivilegeSet::has_can_send_invitation() const {
-  return (_has_bits_[0] & 0x00040000u) != 0;
+  return (_has_bits_[0] & 0x00080000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_send_invitation() {
-  _has_bits_[0] |= 0x00040000u;
+  _has_bits_[0] |= 0x00080000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_send_invitation() {
-  _has_bits_[0] &= ~0x00040000u;
+  _has_bits_[0] &= ~0x00080000u;
 }
 inline void ClubPrivilegeSet::clear_can_send_invitation() {
   can_send_invitation_ = false;
@@ -1303,13 +1337,13 @@ inline void ClubPrivilegeSet::set_can_send_invitation(bool value) {
 
 // optional bool can_send_guest_invitation = 72;
 inline bool ClubPrivilegeSet::has_can_send_guest_invitation() const {
-  return (_has_bits_[0] & 0x00080000u) != 0;
+  return (_has_bits_[0] & 0x00100000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_send_guest_invitation() {
-  _has_bits_[0] |= 0x00080000u;
+  _has_bits_[0] |= 0x00100000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_send_guest_invitation() {
-  _has_bits_[0] &= ~0x00080000u;
+  _has_bits_[0] &= ~0x00100000u;
 }
 inline void ClubPrivilegeSet::clear_can_send_guest_invitation() {
   can_send_guest_invitation_ = false;
@@ -1327,13 +1361,13 @@ inline void ClubPrivilegeSet::set_can_send_guest_invitation(bool value) {
 
 // optional bool can_revoke_own_invitation = 73;
 inline bool ClubPrivilegeSet::has_can_revoke_own_invitation() const {
-  return (_has_bits_[0] & 0x00100000u) != 0;
+  return (_has_bits_[0] & 0x00200000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_revoke_own_invitation() {
-  _has_bits_[0] |= 0x00100000u;
+  _has_bits_[0] |= 0x00200000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_revoke_own_invitation() {
-  _has_bits_[0] &= ~0x00100000u;
+  _has_bits_[0] &= ~0x00200000u;
 }
 inline void ClubPrivilegeSet::clear_can_revoke_own_invitation() {
   can_revoke_own_invitation_ = false;
@@ -1351,13 +1385,13 @@ inline void ClubPrivilegeSet::set_can_revoke_own_invitation(bool value) {
 
 // optional bool can_revoke_other_invitation = 74;
 inline bool ClubPrivilegeSet::has_can_revoke_other_invitation() const {
-  return (_has_bits_[0] & 0x00200000u) != 0;
+  return (_has_bits_[0] & 0x00400000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_revoke_other_invitation() {
-  _has_bits_[0] |= 0x00200000u;
+  _has_bits_[0] |= 0x00400000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_revoke_other_invitation() {
-  _has_bits_[0] &= ~0x00200000u;
+  _has_bits_[0] &= ~0x00400000u;
 }
 inline void ClubPrivilegeSet::clear_can_revoke_other_invitation() {
   can_revoke_other_invitation_ = false;
@@ -1375,13 +1409,13 @@ inline void ClubPrivilegeSet::set_can_revoke_other_invitation(bool value) {
 
 // optional bool can_get_suggestion = 90;
 inline bool ClubPrivilegeSet::has_can_get_suggestion() const {
-  return (_has_bits_[0] & 0x00400000u) != 0;
+  return (_has_bits_[0] & 0x00800000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_get_suggestion() {
-  _has_bits_[0] |= 0x00400000u;
+  _has_bits_[0] |= 0x00800000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_get_suggestion() {
-  _has_bits_[0] &= ~0x00400000u;
+  _has_bits_[0] &= ~0x00800000u;
 }
 inline void ClubPrivilegeSet::clear_can_get_suggestion() {
   can_get_suggestion_ = false;
@@ -1399,13 +1433,13 @@ inline void ClubPrivilegeSet::set_can_get_suggestion(bool value) {
 
 // optional bool can_suggest_member = 91;
 inline bool ClubPrivilegeSet::has_can_suggest_member() const {
-  return (_has_bits_[0] & 0x00800000u) != 0;
+  return (_has_bits_[0] & 0x01000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_suggest_member() {
-  _has_bits_[0] |= 0x00800000u;
+  _has_bits_[0] |= 0x01000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_suggest_member() {
-  _has_bits_[0] &= ~0x00800000u;
+  _has_bits_[0] &= ~0x01000000u;
 }
 inline void ClubPrivilegeSet::clear_can_suggest_member() {
   can_suggest_member_ = false;
@@ -1423,13 +1457,13 @@ inline void ClubPrivilegeSet::set_can_suggest_member(bool value) {
 
 // optional bool can_approve_member = 92;
 inline bool ClubPrivilegeSet::has_can_approve_member() const {
-  return (_has_bits_[0] & 0x01000000u) != 0;
+  return (_has_bits_[0] & 0x02000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_approve_member() {
-  _has_bits_[0] |= 0x01000000u;
+  _has_bits_[0] |= 0x02000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_approve_member() {
-  _has_bits_[0] &= ~0x01000000u;
+  _has_bits_[0] &= ~0x02000000u;
 }
 inline void ClubPrivilegeSet::clear_can_approve_member() {
   can_approve_member_ = false;
@@ -1447,13 +1481,13 @@ inline void ClubPrivilegeSet::set_can_approve_member(bool value) {
 
 // optional bool can_get_ticket = 110;
 inline bool ClubPrivilegeSet::has_can_get_ticket() const {
-  return (_has_bits_[0] & 0x02000000u) != 0;
+  return (_has_bits_[0] & 0x04000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_get_ticket() {
-  _has_bits_[0] |= 0x02000000u;
+  _has_bits_[0] |= 0x04000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_get_ticket() {
-  _has_bits_[0] &= ~0x02000000u;
+  _has_bits_[0] &= ~0x04000000u;
 }
 inline void ClubPrivilegeSet::clear_can_get_ticket() {
   can_get_ticket_ = false;
@@ -1471,13 +1505,13 @@ inline void ClubPrivilegeSet::set_can_get_ticket(bool value) {
 
 // optional bool can_create_ticket = 111;
 inline bool ClubPrivilegeSet::has_can_create_ticket() const {
-  return (_has_bits_[0] & 0x04000000u) != 0;
+  return (_has_bits_[0] & 0x08000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_create_ticket() {
-  _has_bits_[0] |= 0x04000000u;
+  _has_bits_[0] |= 0x08000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_create_ticket() {
-  _has_bits_[0] &= ~0x04000000u;
+  _has_bits_[0] &= ~0x08000000u;
 }
 inline void ClubPrivilegeSet::clear_can_create_ticket() {
   can_create_ticket_ = false;
@@ -1495,13 +1529,13 @@ inline void ClubPrivilegeSet::set_can_create_ticket(bool value) {
 
 // optional bool can_destroy_ticket = 112;
 inline bool ClubPrivilegeSet::has_can_destroy_ticket() const {
-  return (_has_bits_[0] & 0x08000000u) != 0;
+  return (_has_bits_[0] & 0x10000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_destroy_ticket() {
-  _has_bits_[0] |= 0x08000000u;
+  _has_bits_[0] |= 0x10000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_destroy_ticket() {
-  _has_bits_[0] &= ~0x08000000u;
+  _has_bits_[0] &= ~0x10000000u;
 }
 inline void ClubPrivilegeSet::clear_can_destroy_ticket() {
   can_destroy_ticket_ = false;
@@ -1519,13 +1553,13 @@ inline void ClubPrivilegeSet::set_can_destroy_ticket(bool value) {
 
 // optional bool can_get_ban = 130;
 inline bool ClubPrivilegeSet::has_can_get_ban() const {
-  return (_has_bits_[0] & 0x10000000u) != 0;
+  return (_has_bits_[0] & 0x20000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_get_ban() {
-  _has_bits_[0] |= 0x10000000u;
+  _has_bits_[0] |= 0x20000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_get_ban() {
-  _has_bits_[0] &= ~0x10000000u;
+  _has_bits_[0] &= ~0x20000000u;
 }
 inline void ClubPrivilegeSet::clear_can_get_ban() {
   can_get_ban_ = false;
@@ -1543,13 +1577,13 @@ inline void ClubPrivilegeSet::set_can_get_ban(bool value) {
 
 // optional bool can_add_ban = 131;
 inline bool ClubPrivilegeSet::has_can_add_ban() const {
-  return (_has_bits_[0] & 0x20000000u) != 0;
+  return (_has_bits_[0] & 0x40000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_add_ban() {
-  _has_bits_[0] |= 0x20000000u;
+  _has_bits_[0] |= 0x40000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_add_ban() {
-  _has_bits_[0] &= ~0x20000000u;
+  _has_bits_[0] &= ~0x40000000u;
 }
 inline void ClubPrivilegeSet::clear_can_add_ban() {
   can_add_ban_ = false;
@@ -1567,13 +1601,13 @@ inline void ClubPrivilegeSet::set_can_add_ban(bool value) {
 
 // optional bool can_remove_ban = 132;
 inline bool ClubPrivilegeSet::has_can_remove_ban() const {
-  return (_has_bits_[0] & 0x40000000u) != 0;
+  return (_has_bits_[0] & 0x80000000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_remove_ban() {
-  _has_bits_[0] |= 0x40000000u;
+  _has_bits_[0] |= 0x80000000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_remove_ban() {
-  _has_bits_[0] &= ~0x40000000u;
+  _has_bits_[0] &= ~0x80000000u;
 }
 inline void ClubPrivilegeSet::clear_can_remove_ban() {
   can_remove_ban_ = false;
@@ -1591,13 +1625,13 @@ inline void ClubPrivilegeSet::set_can_remove_ban(bool value) {
 
 // optional bool can_create_stream = 140;
 inline bool ClubPrivilegeSet::has_can_create_stream() const {
-  return (_has_bits_[0] & 0x80000000u) != 0;
+  return (_has_bits_[1] & 0x00000001u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_create_stream() {
-  _has_bits_[0] |= 0x80000000u;
+  _has_bits_[1] |= 0x00000001u;
 }
 inline void ClubPrivilegeSet::clear_has_can_create_stream() {
-  _has_bits_[0] &= ~0x80000000u;
+  _has_bits_[1] &= ~0x00000001u;
 }
 inline void ClubPrivilegeSet::clear_can_create_stream() {
   can_create_stream_ = false;
@@ -1615,13 +1649,13 @@ inline void ClubPrivilegeSet::set_can_create_stream(bool value) {
 
 // optional bool can_destroy_stream = 141;
 inline bool ClubPrivilegeSet::has_can_destroy_stream() const {
-  return (_has_bits_[1] & 0x00000001u) != 0;
+  return (_has_bits_[1] & 0x00000002u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_destroy_stream() {
-  _has_bits_[1] |= 0x00000001u;
+  _has_bits_[1] |= 0x00000002u;
 }
 inline void ClubPrivilegeSet::clear_has_can_destroy_stream() {
-  _has_bits_[1] &= ~0x00000001u;
+  _has_bits_[1] &= ~0x00000002u;
 }
 inline void ClubPrivilegeSet::clear_can_destroy_stream() {
   can_destroy_stream_ = false;
@@ -1639,13 +1673,13 @@ inline void ClubPrivilegeSet::set_can_destroy_stream(bool value) {
 
 // optional bool can_set_stream_position = 142;
 inline bool ClubPrivilegeSet::has_can_set_stream_position() const {
-  return (_has_bits_[1] & 0x00000002u) != 0;
+  return (_has_bits_[1] & 0x00000004u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_stream_position() {
-  _has_bits_[1] |= 0x00000002u;
+  _has_bits_[1] |= 0x00000004u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_stream_position() {
-  _has_bits_[1] &= ~0x00000002u;
+  _has_bits_[1] &= ~0x00000004u;
 }
 inline void ClubPrivilegeSet::clear_can_set_stream_position() {
   can_set_stream_position_ = false;
@@ -1663,13 +1697,13 @@ inline void ClubPrivilegeSet::set_can_set_stream_position(bool value) {
 
 // optional bool can_set_stream_attribute = 143;
 inline bool ClubPrivilegeSet::has_can_set_stream_attribute() const {
-  return (_has_bits_[1] & 0x00000004u) != 0;
+  return (_has_bits_[1] & 0x00000008u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_stream_attribute() {
-  _has_bits_[1] |= 0x00000004u;
+  _has_bits_[1] |= 0x00000008u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_stream_attribute() {
-  _has_bits_[1] &= ~0x00000004u;
+  _has_bits_[1] &= ~0x00000008u;
 }
 inline void ClubPrivilegeSet::clear_can_set_stream_attribute() {
   can_set_stream_attribute_ = false;
@@ -1687,13 +1721,13 @@ inline void ClubPrivilegeSet::set_can_set_stream_attribute(bool value) {
 
 // optional bool can_set_stream_name = 144;
 inline bool ClubPrivilegeSet::has_can_set_stream_name() const {
-  return (_has_bits_[1] & 0x00000008u) != 0;
+  return (_has_bits_[1] & 0x00000010u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_stream_name() {
-  _has_bits_[1] |= 0x00000008u;
+  _has_bits_[1] |= 0x00000010u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_stream_name() {
-  _has_bits_[1] &= ~0x00000008u;
+  _has_bits_[1] &= ~0x00000010u;
 }
 inline void ClubPrivilegeSet::clear_can_set_stream_name() {
   can_set_stream_name_ = false;
@@ -1711,13 +1745,13 @@ inline void ClubPrivilegeSet::set_can_set_stream_name(bool value) {
 
 // optional bool can_set_stream_subject = 145;
 inline bool ClubPrivilegeSet::has_can_set_stream_subject() const {
-  return (_has_bits_[1] & 0x00000010u) != 0;
+  return (_has_bits_[1] & 0x00000020u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_stream_subject() {
-  _has_bits_[1] |= 0x00000010u;
+  _has_bits_[1] |= 0x00000020u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_stream_subject() {
-  _has_bits_[1] &= ~0x00000010u;
+  _has_bits_[1] &= ~0x00000020u;
 }
 inline void ClubPrivilegeSet::clear_can_set_stream_subject() {
   can_set_stream_subject_ = false;
@@ -1735,13 +1769,13 @@ inline void ClubPrivilegeSet::set_can_set_stream_subject(bool value) {
 
 // optional bool can_set_stream_access = 146;
 inline bool ClubPrivilegeSet::has_can_set_stream_access() const {
-  return (_has_bits_[1] & 0x00000020u) != 0;
+  return (_has_bits_[1] & 0x00000040u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_stream_access() {
-  _has_bits_[1] |= 0x00000020u;
+  _has_bits_[1] |= 0x00000040u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_stream_access() {
-  _has_bits_[1] &= ~0x00000020u;
+  _has_bits_[1] &= ~0x00000040u;
 }
 inline void ClubPrivilegeSet::clear_can_set_stream_access() {
   can_set_stream_access_ = false;
@@ -1759,13 +1793,13 @@ inline void ClubPrivilegeSet::set_can_set_stream_access(bool value) {
 
 // optional bool can_set_stream_voice_level = 147;
 inline bool ClubPrivilegeSet::has_can_set_stream_voice_level() const {
-  return (_has_bits_[1] & 0x00000040u) != 0;
+  return (_has_bits_[1] & 0x00000080u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_set_stream_voice_level() {
-  _has_bits_[1] |= 0x00000040u;
+  _has_bits_[1] |= 0x00000080u;
 }
 inline void ClubPrivilegeSet::clear_has_can_set_stream_voice_level() {
-  _has_bits_[1] &= ~0x00000040u;
+  _has_bits_[1] &= ~0x00000080u;
 }
 inline void ClubPrivilegeSet::clear_can_set_stream_voice_level() {
   can_set_stream_voice_level_ = false;
@@ -1783,13 +1817,13 @@ inline void ClubPrivilegeSet::set_can_set_stream_voice_level(bool value) {
 
 // optional bool can_create_message = 180;
 inline bool ClubPrivilegeSet::has_can_create_message() const {
-  return (_has_bits_[1] & 0x00000080u) != 0;
+  return (_has_bits_[1] & 0x00000100u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_create_message() {
-  _has_bits_[1] |= 0x00000080u;
+  _has_bits_[1] |= 0x00000100u;
 }
 inline void ClubPrivilegeSet::clear_has_can_create_message() {
-  _has_bits_[1] &= ~0x00000080u;
+  _has_bits_[1] &= ~0x00000100u;
 }
 inline void ClubPrivilegeSet::clear_can_create_message() {
   can_create_message_ = false;
@@ -1807,13 +1841,13 @@ inline void ClubPrivilegeSet::set_can_create_message(bool value) {
 
 // optional bool can_destroy_own_message = 181;
 inline bool ClubPrivilegeSet::has_can_destroy_own_message() const {
-  return (_has_bits_[1] & 0x00000100u) != 0;
+  return (_has_bits_[1] & 0x00000200u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_destroy_own_message() {
-  _has_bits_[1] |= 0x00000100u;
+  _has_bits_[1] |= 0x00000200u;
 }
 inline void ClubPrivilegeSet::clear_has_can_destroy_own_message() {
-  _has_bits_[1] &= ~0x00000100u;
+  _has_bits_[1] &= ~0x00000200u;
 }
 inline void ClubPrivilegeSet::clear_can_destroy_own_message() {
   can_destroy_own_message_ = false;
@@ -1831,13 +1865,13 @@ inline void ClubPrivilegeSet::set_can_destroy_own_message(bool value) {
 
 // optional bool can_destroy_other_message = 182;
 inline bool ClubPrivilegeSet::has_can_destroy_other_message() const {
-  return (_has_bits_[1] & 0x00000200u) != 0;
+  return (_has_bits_[1] & 0x00000400u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_destroy_other_message() {
-  _has_bits_[1] |= 0x00000200u;
+  _has_bits_[1] |= 0x00000400u;
 }
 inline void ClubPrivilegeSet::clear_has_can_destroy_other_message() {
-  _has_bits_[1] &= ~0x00000200u;
+  _has_bits_[1] &= ~0x00000400u;
 }
 inline void ClubPrivilegeSet::clear_can_destroy_other_message() {
   can_destroy_other_message_ = false;
@@ -1855,13 +1889,13 @@ inline void ClubPrivilegeSet::set_can_destroy_other_message(bool value) {
 
 // optional bool can_edit_own_message = 183;
 inline bool ClubPrivilegeSet::has_can_edit_own_message() const {
-  return (_has_bits_[1] & 0x00000400u) != 0;
+  return (_has_bits_[1] & 0x00000800u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_edit_own_message() {
-  _has_bits_[1] |= 0x00000400u;
+  _has_bits_[1] |= 0x00000800u;
 }
 inline void ClubPrivilegeSet::clear_has_can_edit_own_message() {
-  _has_bits_[1] &= ~0x00000400u;
+  _has_bits_[1] &= ~0x00000800u;
 }
 inline void ClubPrivilegeSet::clear_can_edit_own_message() {
   can_edit_own_message_ = false;
@@ -1879,13 +1913,13 @@ inline void ClubPrivilegeSet::set_can_edit_own_message(bool value) {
 
 // optional bool can_pin_message = 184;
 inline bool ClubPrivilegeSet::has_can_pin_message() const {
-  return (_has_bits_[1] & 0x00000800u) != 0;
+  return (_has_bits_[1] & 0x00001000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_pin_message() {
-  _has_bits_[1] |= 0x00000800u;
+  _has_bits_[1] |= 0x00001000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_pin_message() {
-  _has_bits_[1] &= ~0x00000800u;
+  _has_bits_[1] &= ~0x00001000u;
 }
 inline void ClubPrivilegeSet::clear_can_pin_message() {
   can_pin_message_ = false;
@@ -1903,13 +1937,13 @@ inline void ClubPrivilegeSet::set_can_pin_message(bool value) {
 
 // optional bool can_mention_all = 185;
 inline bool ClubPrivilegeSet::has_can_mention_all() const {
-  return (_has_bits_[1] & 0x00001000u) != 0;
+  return (_has_bits_[1] & 0x00002000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_mention_all() {
-  _has_bits_[1] |= 0x00001000u;
+  _has_bits_[1] |= 0x00002000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_mention_all() {
-  _has_bits_[1] &= ~0x00001000u;
+  _has_bits_[1] &= ~0x00002000u;
 }
 inline void ClubPrivilegeSet::clear_can_mention_all() {
   can_mention_all_ = false;
@@ -1927,13 +1961,13 @@ inline void ClubPrivilegeSet::set_can_mention_all(bool value) {
 
 // optional bool can_mention_here = 186;
 inline bool ClubPrivilegeSet::has_can_mention_here() const {
-  return (_has_bits_[1] & 0x00002000u) != 0;
+  return (_has_bits_[1] & 0x00004000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_mention_here() {
-  _has_bits_[1] |= 0x00002000u;
+  _has_bits_[1] |= 0x00004000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_mention_here() {
-  _has_bits_[1] &= ~0x00002000u;
+  _has_bits_[1] &= ~0x00004000u;
 }
 inline void ClubPrivilegeSet::clear_can_mention_here() {
   can_mention_here_ = false;
@@ -1951,13 +1985,13 @@ inline void ClubPrivilegeSet::set_can_mention_here(bool value) {
 
 // optional bool can_mention_member = 187;
 inline bool ClubPrivilegeSet::has_can_mention_member() const {
-  return (_has_bits_[1] & 0x00004000u) != 0;
+  return (_has_bits_[1] & 0x00008000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_mention_member() {
-  _has_bits_[1] |= 0x00004000u;
+  _has_bits_[1] |= 0x00008000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_mention_member() {
-  _has_bits_[1] &= ~0x00004000u;
+  _has_bits_[1] &= ~0x00008000u;
 }
 inline void ClubPrivilegeSet::clear_can_mention_member() {
   can_mention_member_ = false;
@@ -1975,13 +2009,13 @@ inline void ClubPrivilegeSet::set_can_mention_member(bool value) {
 
 // optional bool can_mention_role = 188;
 inline bool ClubPrivilegeSet::has_can_mention_role() const {
-  return (_has_bits_[1] & 0x00008000u) != 0;
+  return (_has_bits_[1] & 0x00010000u) != 0;
 }
 inline void ClubPrivilegeSet::set_has_can_mention_role() {
-  _has_bits_[1] |= 0x00008000u;
+  _has_bits_[1] |= 0x00010000u;
 }
 inline void ClubPrivilegeSet::clear_has_can_mention_role() {
-  _has_bits_[1] &= ~0x00008000u;
+  _has_bits_[1] &= ~0x00010000u;
 }
 inline void ClubPrivilegeSet::clear_can_mention_role() {
   can_mention_role_ = false;
diff --git a/src/server/proto/Client/club_stream.pb.cc b/src/server/proto/Client/club_stream.pb.cc
index 18a16b0eeb6..814384c0b43 100644
--- a/src/server/proto/Client/club_stream.pb.cc
+++ b/src/server/proto/Client/club_stream.pb.cc
@@ -37,6 +37,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* Stream_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   Stream_reflection_ = NULL;
+const ::google::protobuf::Descriptor* StreamDescription_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  StreamDescription_reflection_ = NULL;
 const ::google::protobuf::Descriptor* MentionContent_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   MentionContent_reflection_ = NULL;
@@ -157,7 +160,23 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(Stream));
-  MentionContent_descriptor_ = file->message_type(4);
+  StreamDescription_descriptor_ = file->message_type(4);
+  static const int StreamDescription_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamDescription, id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamDescription, name_),
+  };
+  StreamDescription_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      StreamDescription_descriptor_,
+      StreamDescription::default_instance_,
+      StreamDescription_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamDescription, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamDescription, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(StreamDescription));
+  MentionContent_descriptor_ = file->message_type(5);
   static const int MentionContent_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MentionContent, all_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MentionContent, here_),
@@ -175,7 +194,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MentionContent));
-  CreateMessageOptions_descriptor_ = file->message_type(5);
+  CreateMessageOptions_descriptor_ = file->message_type(6);
   static const int CreateMessageOptions_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageOptions, content_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageOptions, mention_),
@@ -191,7 +210,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateMessageOptions));
-  ClubStreamMessageContainer_descriptor_ = file->message_type(6);
+  ClubStreamMessageContainer_descriptor_ = file->message_type(7);
   static const int ClubStreamMessageContainer_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubStreamMessageContainer, message_),
   };
@@ -206,7 +225,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ClubStreamMessageContainer));
-  ContentChain_descriptor_ = file->message_type(7);
+  ContentChain_descriptor_ = file->message_type(8);
   static const int ContentChain_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContentChain, content_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContentChain, embed_),
@@ -224,7 +243,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ContentChain));
-  StreamMessage_descriptor_ = file->message_type(8);
+  StreamMessage_descriptor_ = file->message_type(9);
   static const int StreamMessage_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessage, id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessage, author_),
@@ -244,7 +263,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamMessage));
-  StreamMention_descriptor_ = file->message_type(9);
+  StreamMention_descriptor_ = file->message_type(10);
   static const int StreamMention_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, club_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, stream_id_),
@@ -266,7 +285,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamMention));
-  StreamView_descriptor_ = file->message_type(10);
+  StreamView_descriptor_ = file->message_type(11);
   static const int StreamView_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamView, club_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamView, stream_id_),
@@ -283,7 +302,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamView));
-  StreamAdvanceViewTime_descriptor_ = file->message_type(11);
+  StreamAdvanceViewTime_descriptor_ = file->message_type(12);
   static const int StreamAdvanceViewTime_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAdvanceViewTime, stream_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAdvanceViewTime, view_time_),
@@ -299,7 +318,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamAdvanceViewTime));
-  StreamEventTime_descriptor_ = file->message_type(12);
+  StreamEventTime_descriptor_ = file->message_type(13);
   static const int StreamEventTime_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamEventTime, stream_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamEventTime, event_time_),
@@ -315,7 +334,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamEventTime));
-  StreamMentionView_descriptor_ = file->message_type(13);
+  StreamMentionView_descriptor_ = file->message_type(14);
   static const int StreamMentionView_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionView, club_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionView, stream_id_),
@@ -332,7 +351,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamMentionView));
-  StreamStateOptions_descriptor_ = file->message_type(14);
+  StreamStateOptions_descriptor_ = file->message_type(15);
   static const int StreamStateOptions_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateOptions, attribute_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateOptions, name_),
@@ -351,7 +370,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamStateOptions));
-  StreamStateAssignment_descriptor_ = file->message_type(15);
+  StreamStateAssignment_descriptor_ = file->message_type(16);
   static const int StreamStateAssignment_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateAssignment, stream_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateAssignment, attribute_),
@@ -372,7 +391,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamStateAssignment));
-  StreamTypingIndicator_descriptor_ = file->message_type(16);
+  StreamTypingIndicator_descriptor_ = file->message_type(17);
   static const int StreamTypingIndicator_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamTypingIndicator, author_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamTypingIndicator, indicator_),
@@ -410,6 +429,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     Stream_descriptor_, &Stream::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    StreamDescription_descriptor_, &StreamDescription::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     MentionContent_descriptor_, &MentionContent::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CreateMessageOptions_descriptor_, &CreateMessageOptions::default_instance());
@@ -448,6 +469,8 @@ void protobuf_ShutdownFile_club_5fstream_2eproto() {
   delete CreateStreamOptions_reflection_;
   delete Stream::default_instance_;
   delete Stream_reflection_;
+  delete StreamDescription::default_instance_;
+  delete StreamDescription_reflection_;
   delete MentionContent::default_instance_;
   delete MentionContent_reflection_;
   delete CreateMessageOptions::default_instance_;
@@ -508,63 +531,65 @@ void protobuf_AddDesc_club_5fstream_2eproto() {
     "\001(\t\0222\n\006access\030\006 \001(\0132\".bgs.protocol.club."
     "v1.StreamAccess\022;\n\013voice_level\030\007 \001(\0162&.b"
     "gs.protocol.club.v1.StreamVoiceLevel\022\025\n\r"
-    "creation_time\030\010 \001(\004\"p\n\016MentionContent\022\013\n"
-    "\003all\030\001 \001(\010\022\014\n\004here\030\002 \001(\010\0221\n\tmember_id\030\003 "
-    "\003(\0132\036.bgs.protocol.club.v1.MemberId\022\020\n\004r"
-    "ole\030\004 \003(\rB\002\020\001\"^\n\024CreateMessageOptions\022\017\n"
-    "\007content\030\002 \001(\t\0225\n\007mention\030\003 \001(\0132$.bgs.pr"
-    "otocol.club.v1.MentionContent\"R\n\032ClubStr"
-    "eamMessageContainer\0224\n\007message\030\001 \003(\0132#.b"
-    "gs.protocol.club.v1.StreamMessage\"\221\001\n\014Co"
-    "ntentChain\022\017\n\007content\030\005 \001(\t\022&\n\005embed\030\006 \003"
-    "(\0132\027.bgs.protocol.EmbedInfo\0225\n\007mention\030\007"
-    " \001(\0132$.bgs.protocol.club.v1.MentionConte"
-    "nt\022\021\n\tedit_time\030\010 \001(\004\"\215\002\n\rStreamMessage\022"
-    "#\n\002id\030\003 \001(\0132\027.bgs.protocol.MessageId\0227\n\006"
-    "author\030\004 \001(\0132\'.bgs.protocol.club.v1.Memb"
-    "erDescription\0229\n\rcontent_chain\030\006 \003(\0132\".b"
-    "gs.protocol.club.v1.ContentChain\022:\n\tdest"
-    "royer\030\017 \001(\0132\'.bgs.protocol.club.v1.Membe"
-    "rDescription\022\021\n\tdestroyed\030\020 \001(\010\022\024\n\014destr"
-    "oy_time\030\021 \001(\004\"\305\002\n\rStreamMention\022\017\n\007club_"
-    "id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022+\n\nmessage_i"
-    "d\030\003 \001(\0132\027.bgs.protocol.MessageId\0227\n\006auth"
-    "or\030\004 \001(\0132\'.bgs.protocol.club.v1.MemberDe"
-    "scription\022\021\n\tdestroyed\030\005 \001(\010\022.\n\nmention_"
-    "id\030\006 \001(\0132\032.bgs.protocol.TimeSeriesId\0221\n\t"
-    "member_id\030\007 \001(\0132\036.bgs.protocol.club.v1.M"
-    "emberId\0224\n\007message\030\010 \001(\0132#.bgs.protocol."
-    "club.v1.StreamMessage\"Z\n\nStreamView\022\017\n\007c"
-    "lub_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022(\n\006marke"
-    "r\030\003 \001(\0132\030.bgs.protocol.ViewMarker\"=\n\025Str"
-    "eamAdvanceViewTime\022\021\n\tstream_id\030\001 \001(\004\022\021\n"
-    "\tview_time\030\002 \001(\004\"8\n\017StreamEventTime\022\021\n\ts"
-    "tream_id\030\001 \001(\004\022\022\n\nevent_time\030\002 \001(\004\"a\n\021St"
-    "reamMentionView\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstre"
-    "am_id\030\002 \001(\004\022(\n\006marker\030\003 \001(\0132\030.bgs.protoc"
-    "ol.ViewMarker\"\323\001\n\022StreamStateOptions\022-\n\t"
-    "attribute\030\001 \003(\0132\032.bgs.protocol.v2.Attrib"
-    "ute\022\014\n\004name\030\002 \001(\t\022\017\n\007subject\030\003 \001(\t\0222\n\006ac"
-    "cess\030\004 \001(\0132\".bgs.protocol.club.v1.Stream"
-    "Access\022;\n\013voice_level\030\005 \001(\0162&.bgs.protoc"
-    "ol.club.v1.StreamVoiceLevel\"\216\002\n\025StreamSt"
-    "ateAssignment\022\021\n\tstream_id\030\001 \001(\004\022-\n\tattr"
-    "ibute\030\002 \003(\0132\032.bgs.protocol.v2.Attribute\022"
-    "\014\n\004name\030\003 \001(\t\022\017\n\007subject\030\004 \001(\t\0222\n\006access"
-    "\030\005 \001(\0132\".bgs.protocol.club.v1.StreamAcce"
-    "ss\022#\n\033stream_subscription_removed\030\006 \001(\010\022"
-    ";\n\013voice_level\030\007 \001(\0162&.bgs.protocol.club"
-    ".v1.StreamVoiceLevel\"\213\001\n\025StreamTypingInd"
-    "icator\0221\n\tauthor_id\030\001 \001(\0132\036.bgs.protocol"
-    ".club.v1.MemberId\0220\n\tindicator\030\002 \001(\0162\035.b"
-    "gs.protocol.TypingIndicator\022\r\n\005epoch\030\003 \001"
-    "(\004B\002H\001", 2726);
+    "creation_time\030\010 \001(\004\"-\n\021StreamDescription"
+    "\022\n\n\002id\030\002 \001(\004\022\014\n\004name\030\004 \001(\t\"p\n\016MentionCon"
+    "tent\022\013\n\003all\030\001 \001(\010\022\014\n\004here\030\002 \001(\010\0221\n\tmembe"
+    "r_id\030\003 \003(\0132\036.bgs.protocol.club.v1.Member"
+    "Id\022\020\n\004role\030\004 \003(\rB\002\020\001\"^\n\024CreateMessageOpt"
+    "ions\022\017\n\007content\030\002 \001(\t\0225\n\007mention\030\003 \001(\0132$"
+    ".bgs.protocol.club.v1.MentionContent\"R\n\032"
+    "ClubStreamMessageContainer\0224\n\007message\030\001 "
+    "\003(\0132#.bgs.protocol.club.v1.StreamMessage"
+    "\"\221\001\n\014ContentChain\022\017\n\007content\030\005 \001(\t\022&\n\005em"
+    "bed\030\006 \003(\0132\027.bgs.protocol.EmbedInfo\0225\n\007me"
+    "ntion\030\007 \001(\0132$.bgs.protocol.club.v1.Menti"
+    "onContent\022\021\n\tedit_time\030\010 \001(\004\"\215\002\n\rStreamM"
+    "essage\022#\n\002id\030\003 \001(\0132\027.bgs.protocol.Messag"
+    "eId\0227\n\006author\030\004 \001(\0132\'.bgs.protocol.club."
+    "v1.MemberDescription\0229\n\rcontent_chain\030\006 "
+    "\003(\0132\".bgs.protocol.club.v1.ContentChain\022"
+    ":\n\tdestroyer\030\017 \001(\0132\'.bgs.protocol.club.v"
+    "1.MemberDescription\022\021\n\tdestroyed\030\020 \001(\010\022\024"
+    "\n\014destroy_time\030\021 \001(\004\"\305\002\n\rStreamMention\022\017"
+    "\n\007club_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022+\n\nme"
+    "ssage_id\030\003 \001(\0132\027.bgs.protocol.MessageId\022"
+    "7\n\006author\030\004 \001(\0132\'.bgs.protocol.club.v1.M"
+    "emberDescription\022\021\n\tdestroyed\030\005 \001(\010\022.\n\nm"
+    "ention_id\030\006 \001(\0132\032.bgs.protocol.TimeSerie"
+    "sId\0221\n\tmember_id\030\007 \001(\0132\036.bgs.protocol.cl"
+    "ub.v1.MemberId\0224\n\007message\030\010 \001(\0132#.bgs.pr"
+    "otocol.club.v1.StreamMessage\"Z\n\nStreamVi"
+    "ew\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022("
+    "\n\006marker\030\003 \001(\0132\030.bgs.protocol.ViewMarker"
+    "\"=\n\025StreamAdvanceViewTime\022\021\n\tstream_id\030\001"
+    " \001(\004\022\021\n\tview_time\030\002 \001(\004\"8\n\017StreamEventTi"
+    "me\022\021\n\tstream_id\030\001 \001(\004\022\022\n\nevent_time\030\002 \001("
+    "\004\"a\n\021StreamMentionView\022\017\n\007club_id\030\001 \001(\004\022"
+    "\021\n\tstream_id\030\002 \001(\004\022(\n\006marker\030\003 \001(\0132\030.bgs"
+    ".protocol.ViewMarker\"\323\001\n\022StreamStateOpti"
+    "ons\022-\n\tattribute\030\001 \003(\0132\032.bgs.protocol.v2"
+    ".Attribute\022\014\n\004name\030\002 \001(\t\022\017\n\007subject\030\003 \001("
+    "\t\0222\n\006access\030\004 \001(\0132\".bgs.protocol.club.v1"
+    ".StreamAccess\022;\n\013voice_level\030\005 \001(\0162&.bgs"
+    ".protocol.club.v1.StreamVoiceLevel\"\216\002\n\025S"
+    "treamStateAssignment\022\021\n\tstream_id\030\001 \001(\004\022"
+    "-\n\tattribute\030\002 \003(\0132\032.bgs.protocol.v2.Att"
+    "ribute\022\014\n\004name\030\003 \001(\t\022\017\n\007subject\030\004 \001(\t\0222\n"
+    "\006access\030\005 \001(\0132\".bgs.protocol.club.v1.Str"
+    "eamAccess\022#\n\033stream_subscription_removed"
+    "\030\006 \001(\010\022;\n\013voice_level\030\007 \001(\0162&.bgs.protoc"
+    "ol.club.v1.StreamVoiceLevel\"\213\001\n\025StreamTy"
+    "pingIndicator\0221\n\tauthor_id\030\001 \001(\0132\036.bgs.p"
+    "rotocol.club.v1.MemberId\0220\n\tindicator\030\002 "
+    "\001(\0162\035.bgs.protocol.TypingIndicator\022\r\n\005ep"
+    "och\030\003 \001(\004B\002H\001", 2773);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "club_stream.proto", &protobuf_RegisterTypes);
   StreamPosition::default_instance_ = new StreamPosition();
   StreamAccess::default_instance_ = new StreamAccess();
   CreateStreamOptions::default_instance_ = new CreateStreamOptions();
   Stream::default_instance_ = new Stream();
+  StreamDescription::default_instance_ = new StreamDescription();
   MentionContent::default_instance_ = new MentionContent();
   CreateMessageOptions::default_instance_ = new CreateMessageOptions();
   ClubStreamMessageContainer::default_instance_ = new ClubStreamMessageContainer();
@@ -582,6 +607,7 @@ void protobuf_AddDesc_club_5fstream_2eproto() {
   StreamAccess::default_instance_->InitAsDefaultInstance();
   CreateStreamOptions::default_instance_->InitAsDefaultInstance();
   Stream::default_instance_->InitAsDefaultInstance();
+  StreamDescription::default_instance_->InitAsDefaultInstance();
   MentionContent::default_instance_->InitAsDefaultInstance();
   CreateMessageOptions::default_instance_->InitAsDefaultInstance();
   ClubStreamMessageContainer::default_instance_->InitAsDefaultInstance();
@@ -2088,6 +2114,290 @@ void Stream::Swap(Stream* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int StreamDescription::kIdFieldNumber;
+const int StreamDescription::kNameFieldNumber;
+#endif  // !_MSC_VER
+
+StreamDescription::StreamDescription()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.StreamDescription)
+}
+
+void StreamDescription::InitAsDefaultInstance() {
+}
+
+StreamDescription::StreamDescription(const StreamDescription& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+  // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.StreamDescription)
+}
+
+void StreamDescription::SharedCtor() {
+  ::google::protobuf::internal::GetEmptyString();
+  _cached_size_ = 0;
+  id_ = GOOGLE_ULONGLONG(0);
+  name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+StreamDescription::~StreamDescription() {
+  // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.StreamDescription)
+  SharedDtor();
+}
+
+void StreamDescription::SharedDtor() {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete name_;
+  }
+  if (this != default_instance_) {
+  }
+}
+
+void StreamDescription::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* StreamDescription::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return StreamDescription_descriptor_;
+}
+
+const StreamDescription& StreamDescription::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_club_5fstream_2eproto();
+  return *default_instance_;
+}
+
+StreamDescription* StreamDescription::default_instance_ = NULL;
+
+StreamDescription* StreamDescription::New() const {
+  return new StreamDescription;
+}
+
+void StreamDescription::Clear() {
+  if (_has_bits_[0 / 32] & 3) {
+    id_ = GOOGLE_ULONGLONG(0);
+    if (has_name()) {
+      if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        name_->clear();
+      }
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool StreamDescription::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.StreamDescription)
+  for (;;) {
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional uint64 id = 2;
+      case 2: {
+        if (tag == 16) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &id_)));
+          set_has_id();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(34)) goto parse_name;
+        break;
+      }
+
+      // optional string name = 4;
+      case 4: {
+        if (tag == 34) {
+         parse_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->name().data(), this->name().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "name");
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectAtEnd()) goto success;
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0 ||
+            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.StreamDescription)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.StreamDescription)
+  return false;
+#undef DO_
+}
+
+void StreamDescription::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.StreamDescription)
+  // optional uint64 id = 2;
+  if (has_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->id(), output);
+  }
+
+  // optional string name = 4;
+  if (has_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->name().data(), this->name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "name");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      4, this->name(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.StreamDescription)
+}
+
+::google::protobuf::uint8* StreamDescription::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.StreamDescription)
+  // optional uint64 id = 2;
+  if (has_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->id(), target);
+  }
+
+  // optional string name = 4;
+  if (has_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->name().data(), this->name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "name");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->name(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.StreamDescription)
+  return target;
+}
+
+int StreamDescription::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional uint64 id = 2;
+    if (has_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->id());
+    }
+
+    // optional string name = 4;
+    if (has_name()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->name());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void StreamDescription::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const StreamDescription* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const StreamDescription*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void StreamDescription::MergeFrom(const StreamDescription& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_id()) {
+      set_id(from.id());
+    }
+    if (from.has_name()) {
+      set_name(from.name());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void StreamDescription::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void StreamDescription::CopyFrom(const StreamDescription& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool StreamDescription::IsInitialized() const {
+
+  return true;
+}
+
+void StreamDescription::Swap(StreamDescription* other) {
+  if (other != this) {
+    std::swap(id_, other->id_);
+    std::swap(name_, other->name_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata StreamDescription::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = StreamDescription_descriptor_;
+  metadata.reflection = StreamDescription_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int MentionContent::kAllFieldNumber;
 const int MentionContent::kHereFieldNumber;
 const int MentionContent::kMemberIdFieldNumber;
diff --git a/src/server/proto/Client/club_stream.pb.h b/src/server/proto/Client/club_stream.pb.h
index 8ab586cf55f..a4a6a9230a5 100644
--- a/src/server/proto/Client/club_stream.pb.h
+++ b/src/server/proto/Client/club_stream.pb.h
@@ -48,6 +48,7 @@ class StreamPosition;
 class StreamAccess;
 class CreateStreamOptions;
 class Stream;
+class StreamDescription;
 class MentionContent;
 class CreateMessageOptions;
 class ClubStreamMessageContainer;
@@ -528,6 +529,100 @@ class TC_PROTO_API Stream : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class TC_PROTO_API StreamDescription : public ::google::protobuf::Message {
+ public:
+  StreamDescription();
+  virtual ~StreamDescription();
+
+  StreamDescription(const StreamDescription& from);
+
+  inline StreamDescription& operator=(const StreamDescription& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const StreamDescription& default_instance();
+
+  void Swap(StreamDescription* other);
+
+  // implements Message ----------------------------------------------
+
+  StreamDescription* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const StreamDescription& from);
+  void MergeFrom(const StreamDescription& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional uint64 id = 2;
+  inline bool has_id() const;
+  inline void clear_id();
+  static const int kIdFieldNumber = 2;
+  inline ::google::protobuf::uint64 id() const;
+  inline void set_id(::google::protobuf::uint64 value);
+
+  // optional string name = 4;
+  inline bool has_name() const;
+  inline void clear_name();
+  static const int kNameFieldNumber = 4;
+  inline const ::std::string& name() const;
+  inline void set_name(const ::std::string& value);
+  inline void set_name(const char* value);
+  inline void set_name(const char* value, size_t size);
+  inline ::std::string* mutable_name();
+  inline ::std::string* release_name();
+  inline void set_allocated_name(::std::string* name);
+
+  // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.StreamDescription)
+ private:
+  inline void set_has_id();
+  inline void clear_has_id();
+  inline void set_has_name();
+  inline void clear_has_name();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
+  ::google::protobuf::uint64 id_;
+  ::std::string* name_;
+  friend void TC_PROTO_API protobuf_AddDesc_club_5fstream_2eproto();
+  friend void protobuf_AssignDesc_club_5fstream_2eproto();
+  friend void protobuf_ShutdownFile_club_5fstream_2eproto();
+
+  void InitAsDefaultInstance();
+  static StreamDescription* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class TC_PROTO_API MentionContent : public ::google::protobuf::Message {
  public:
   MentionContent();
@@ -2657,6 +2752,110 @@ inline void Stream::set_creation_time(::google::protobuf::uint64 value) {
 
 // -------------------------------------------------------------------
 
+// StreamDescription
+
+// optional uint64 id = 2;
+inline bool StreamDescription::has_id() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void StreamDescription::set_has_id() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void StreamDescription::clear_has_id() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void StreamDescription::clear_id() {
+  id_ = GOOGLE_ULONGLONG(0);
+  clear_has_id();
+}
+inline ::google::protobuf::uint64 StreamDescription::id() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamDescription.id)
+  return id_;
+}
+inline void StreamDescription::set_id(::google::protobuf::uint64 value) {
+  set_has_id();
+  id_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.StreamDescription.id)
+}
+
+// optional string name = 4;
+inline bool StreamDescription::has_name() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void StreamDescription::set_has_name() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void StreamDescription::clear_has_name() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void StreamDescription::clear_name() {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    name_->clear();
+  }
+  clear_has_name();
+}
+inline const ::std::string& StreamDescription::name() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamDescription.name)
+  return *name_;
+}
+inline void StreamDescription::set_name(const ::std::string& value) {
+  set_has_name();
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    name_ = new ::std::string;
+  }
+  name_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.StreamDescription.name)
+}
+inline void StreamDescription::set_name(const char* value) {
+  set_has_name();
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    name_ = new ::std::string;
+  }
+  name_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.club.v1.StreamDescription.name)
+}
+inline void StreamDescription::set_name(const char* value, size_t size) {
+  set_has_name();
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    name_ = new ::std::string;
+  }
+  name_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.club.v1.StreamDescription.name)
+}
+inline ::std::string* StreamDescription::mutable_name() {
+  set_has_name();
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    name_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamDescription.name)
+  return name_;
+}
+inline ::std::string* StreamDescription::release_name() {
+  clear_has_name();
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = name_;
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void StreamDescription::set_allocated_name(::std::string* name) {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete name_;
+  }
+  if (name) {
+    set_has_name();
+    name_ = name;
+  } else {
+    clear_has_name();
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamDescription.name)
+}
+
+// -------------------------------------------------------------------
+
 // MentionContent
 
 // optional bool all = 1;
diff --git a/src/server/proto/Client/embed_types.pb.cc b/src/server/proto/Client/embed_types.pb.cc
index fd4ed159bd2..b41c13e226e 100644
--- a/src/server/proto/Client/embed_types.pb.cc
+++ b/src/server/proto/Client/embed_types.pb.cc
@@ -29,9 +29,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* Provider_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   Provider_reflection_ = NULL;
-const ::google::protobuf::Descriptor* Favicon_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  Favicon_reflection_ = NULL;
 const ::google::protobuf::Descriptor* EmbedHTML_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   EmbedHTML_reflection_ = NULL;
@@ -80,22 +77,7 @@ void protobuf_AssignDesc_embed_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(Provider));
-  Favicon_descriptor_ = file->message_type(2);
-  static const int Favicon_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Favicon, url_),
-  };
-  Favicon_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      Favicon_descriptor_,
-      Favicon::default_instance_,
-      Favicon_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Favicon, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Favicon, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(Favicon));
-  EmbedHTML_descriptor_ = file->message_type(3);
+  EmbedHTML_descriptor_ = file->message_type(2);
   static const int EmbedHTML_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedHTML, content_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedHTML, width_),
@@ -112,15 +94,14 @@ void protobuf_AssignDesc_embed_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(EmbedHTML));
-  EmbedInfo_descriptor_ = file->message_type(4);
-  static const int EmbedInfo_offsets_[8] = {
+  EmbedInfo_descriptor_ = file->message_type(3);
+  static const int EmbedInfo_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, title_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, original_url_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, thumbnail_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, provider_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, description_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, favicon_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, html_),
   };
   EmbedInfo_reflection_ =
@@ -151,8 +132,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     Provider_descriptor_, &Provider::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    Favicon_descriptor_, &Favicon::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     EmbedHTML_descriptor_, &EmbedHTML::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     EmbedInfo_descriptor_, &EmbedInfo::default_instance());
@@ -165,8 +144,6 @@ void protobuf_ShutdownFile_embed_5ftypes_2eproto() {
   delete EmbedImage_reflection_;
   delete Provider::default_instance_;
   delete Provider_reflection_;
-  delete Favicon::default_instance_;
-  delete Favicon_reflection_;
   delete EmbedHTML::default_instance_;
   delete EmbedHTML_reflection_;
   delete EmbedInfo::default_instance_;
@@ -182,26 +159,22 @@ void protobuf_AddDesc_embed_5ftypes_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\021embed_types.proto\022\014bgs.protocol\"8\n\nEmb"
     "edImage\022\013\n\003url\030\001 \001(\t\022\r\n\005width\030\002 \001(\r\022\016\n\006h"
-    "eight\030\003 \001(\r\"\030\n\010Provider\022\014\n\004name\030\001 \001(\t\"\026\n"
-    "\007Favicon\022\013\n\003url\030\001 \001(\t\";\n\tEmbedHTML\022\017\n\007co"
-    "ntent\030\001 \001(\t\022\r\n\005width\030\002 \001(\r\022\016\n\006height\030\003 \001"
-    "(\r\"\371\001\n\tEmbedInfo\022\r\n\005title\030\001 \001(\t\022\014\n\004type\030"
-    "\002 \001(\t\022\024\n\014original_url\030\003 \001(\t\022+\n\tthumbnail"
-    "\030\004 \001(\0132\030.bgs.protocol.EmbedImage\022(\n\010prov"
-    "ider\030\005 \001(\0132\026.bgs.protocol.Provider\022\023\n\013de"
-    "scription\030\006 \001(\t\022&\n\007favicon\030\007 \001(\0132\025.bgs.p"
-    "rotocol.Favicon\022%\n\004html\030\010 \001(\0132\027.bgs.prot"
-    "ocol.EmbedHTMLB\002H\001", 458);
+    "eight\030\003 \001(\r\"\030\n\010Provider\022\014\n\004name\030\001 \001(\t\";\n"
+    "\tEmbedHTML\022\017\n\007content\030\001 \001(\t\022\r\n\005width\030\002 \001"
+    "(\r\022\016\n\006height\030\003 \001(\r\"\321\001\n\tEmbedInfo\022\r\n\005titl"
+    "e\030\001 \001(\t\022\014\n\004type\030\002 \001(\t\022\024\n\014original_url\030\003 "
+    "\001(\t\022+\n\tthumbnail\030\004 \001(\0132\030.bgs.protocol.Em"
+    "bedImage\022(\n\010provider\030\005 \001(\0132\026.bgs.protoco"
+    "l.Provider\022\023\n\013description\030\006 \001(\t\022%\n\004html\030"
+    "\010 \001(\0132\027.bgs.protocol.EmbedHTMLB\002H\001", 394);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "embed_types.proto", &protobuf_RegisterTypes);
   EmbedImage::default_instance_ = new EmbedImage();
   Provider::default_instance_ = new Provider();
-  Favicon::default_instance_ = new Favicon();
   EmbedHTML::default_instance_ = new EmbedHTML();
   EmbedInfo::default_instance_ = new EmbedInfo();
   EmbedImage::default_instance_->InitAsDefaultInstance();
   Provider::default_instance_->InitAsDefaultInstance();
-  Favicon::default_instance_->InitAsDefaultInstance();
   EmbedHTML::default_instance_->InitAsDefaultInstance();
   EmbedInfo::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_embed_5ftypes_2eproto);
@@ -796,249 +769,6 @@ void Provider::Swap(Provider* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int Favicon::kUrlFieldNumber;
-#endif  // !_MSC_VER
-
-Favicon::Favicon()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.Favicon)
-}
-
-void Favicon::InitAsDefaultInstance() {
-}
-
-Favicon::Favicon(const Favicon& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.Favicon)
-}
-
-void Favicon::SharedCtor() {
-  ::google::protobuf::internal::GetEmptyString();
-  _cached_size_ = 0;
-  url_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-Favicon::~Favicon() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.Favicon)
-  SharedDtor();
-}
-
-void Favicon::SharedDtor() {
-  if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    delete url_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void Favicon::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Favicon::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return Favicon_descriptor_;
-}
-
-const Favicon& Favicon::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_embed_5ftypes_2eproto();
-  return *default_instance_;
-}
-
-Favicon* Favicon::default_instance_ = NULL;
-
-Favicon* Favicon::New() const {
-  return new Favicon;
-}
-
-void Favicon::Clear() {
-  if (has_url()) {
-    if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-      url_->clear();
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool Favicon::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.Favicon)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string url = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_url()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->url().data(), this->url().length(),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "url");
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.Favicon)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.Favicon)
-  return false;
-#undef DO_
-}
-
-void Favicon::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.Favicon)
-  // optional string url = 1;
-  if (has_url()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->url().data(), this->url().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "url");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->url(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.Favicon)
-}
-
-::google::protobuf::uint8* Favicon::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.Favicon)
-  // optional string url = 1;
-  if (has_url()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->url().data(), this->url().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "url");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->url(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.Favicon)
-  return target;
-}
-
-int Favicon::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional string url = 1;
-    if (has_url()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->url());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Favicon::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const Favicon* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const Favicon*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void Favicon::MergeFrom(const Favicon& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_url()) {
-      set_url(from.url());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void Favicon::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Favicon::CopyFrom(const Favicon& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Favicon::IsInitialized() const {
-
-  return true;
-}
-
-void Favicon::Swap(Favicon* other) {
-  if (other != this) {
-    std::swap(url_, other->url_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata Favicon::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = Favicon_descriptor_;
-  metadata.reflection = Favicon_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
 const int EmbedHTML::kContentFieldNumber;
 const int EmbedHTML::kWidthFieldNumber;
 const int EmbedHTML::kHeightFieldNumber;
@@ -1381,7 +1111,6 @@ const int EmbedInfo::kOriginalUrlFieldNumber;
 const int EmbedInfo::kThumbnailFieldNumber;
 const int EmbedInfo::kProviderFieldNumber;
 const int EmbedInfo::kDescriptionFieldNumber;
-const int EmbedInfo::kFaviconFieldNumber;
 const int EmbedInfo::kHtmlFieldNumber;
 #endif  // !_MSC_VER
 
@@ -1394,7 +1123,6 @@ EmbedInfo::EmbedInfo()
 void EmbedInfo::InitAsDefaultInstance() {
   thumbnail_ = const_cast< ::bgs::protocol::EmbedImage*>(&::bgs::protocol::EmbedImage::default_instance());
   provider_ = const_cast< ::bgs::protocol::Provider*>(&::bgs::protocol::Provider::default_instance());
-  favicon_ = const_cast< ::bgs::protocol::Favicon*>(&::bgs::protocol::Favicon::default_instance());
   html_ = const_cast< ::bgs::protocol::EmbedHTML*>(&::bgs::protocol::EmbedHTML::default_instance());
 }
 
@@ -1414,7 +1142,6 @@ void EmbedInfo::SharedCtor() {
   thumbnail_ = NULL;
   provider_ = NULL;
   description_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  favicon_ = NULL;
   html_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -1440,7 +1167,6 @@ void EmbedInfo::SharedDtor() {
   if (this != default_instance_) {
     delete thumbnail_;
     delete provider_;
-    delete favicon_;
     delete html_;
   }
 }
@@ -1467,7 +1193,7 @@ EmbedInfo* EmbedInfo::New() const {
 }
 
 void EmbedInfo::Clear() {
-  if (_has_bits_[0 / 32] & 255) {
+  if (_has_bits_[0 / 32] & 127) {
     if (has_title()) {
       if (title_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
         title_->clear();
@@ -1494,9 +1220,6 @@ void EmbedInfo::Clear() {
         description_->clear();
       }
     }
-    if (has_favicon()) {
-      if (favicon_ != NULL) favicon_->::bgs::protocol::Favicon::Clear();
-    }
     if (has_html()) {
       if (html_ != NULL) html_->::bgs::protocol::EmbedHTML::Clear();
     }
@@ -1604,19 +1327,6 @@ bool EmbedInfo::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(58)) goto parse_favicon;
-        break;
-      }
-
-      // optional .bgs.protocol.Favicon favicon = 7;
-      case 7: {
-        if (tag == 58) {
-         parse_favicon:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_favicon()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectTag(66)) goto parse_html;
         break;
       }
@@ -1711,12 +1421,6 @@ void EmbedInfo::SerializeWithCachedSizes(
       6, this->description(), output);
   }
 
-  // optional .bgs.protocol.Favicon favicon = 7;
-  if (has_favicon()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->favicon(), output);
-  }
-
   // optional .bgs.protocol.EmbedHTML html = 8;
   if (has_html()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
@@ -1791,13 +1495,6 @@ void EmbedInfo::SerializeWithCachedSizes(
         6, this->description(), target);
   }
 
-  // optional .bgs.protocol.Favicon favicon = 7;
-  if (has_favicon()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        7, this->favicon(), target);
-  }
-
   // optional .bgs.protocol.EmbedHTML html = 8;
   if (has_html()) {
     target = ::google::protobuf::internal::WireFormatLite::
@@ -1859,13 +1556,6 @@ int EmbedInfo::ByteSize() const {
           this->description());
     }
 
-    // optional .bgs.protocol.Favicon favicon = 7;
-    if (has_favicon()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->favicon());
-    }
-
     // optional .bgs.protocol.EmbedHTML html = 8;
     if (has_html()) {
       total_size += 1 +
@@ -1918,9 +1608,6 @@ void EmbedInfo::MergeFrom(const EmbedInfo& from) {
     if (from.has_description()) {
       set_description(from.description());
     }
-    if (from.has_favicon()) {
-      mutable_favicon()->::bgs::protocol::Favicon::MergeFrom(from.favicon());
-    }
     if (from.has_html()) {
       mutable_html()->::bgs::protocol::EmbedHTML::MergeFrom(from.html());
     }
@@ -1953,7 +1640,6 @@ void EmbedInfo::Swap(EmbedInfo* other) {
     std::swap(thumbnail_, other->thumbnail_);
     std::swap(provider_, other->provider_);
     std::swap(description_, other->description_);
-    std::swap(favicon_, other->favicon_);
     std::swap(html_, other->html_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
diff --git a/src/server/proto/Client/embed_types.pb.h b/src/server/proto/Client/embed_types.pb.h
index a5bff993b90..3317abab800 100644
--- a/src/server/proto/Client/embed_types.pb.h
+++ b/src/server/proto/Client/embed_types.pb.h
@@ -37,7 +37,6 @@ void protobuf_ShutdownFile_embed_5ftypes_2eproto();
 
 class EmbedImage;
 class Provider;
-class Favicon;
 class EmbedHTML;
 class EmbedInfo;
 
@@ -231,90 +230,6 @@ class TC_PROTO_API Provider : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class TC_PROTO_API Favicon : public ::google::protobuf::Message {
- public:
-  Favicon();
-  virtual ~Favicon();
-
-  Favicon(const Favicon& from);
-
-  inline Favicon& operator=(const Favicon& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Favicon& default_instance();
-
-  void Swap(Favicon* other);
-
-  // implements Message ----------------------------------------------
-
-  Favicon* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const Favicon& from);
-  void MergeFrom(const Favicon& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional string url = 1;
-  inline bool has_url() const;
-  inline void clear_url();
-  static const int kUrlFieldNumber = 1;
-  inline const ::std::string& url() const;
-  inline void set_url(const ::std::string& value);
-  inline void set_url(const char* value);
-  inline void set_url(const char* value, size_t size);
-  inline ::std::string* mutable_url();
-  inline ::std::string* release_url();
-  inline void set_allocated_url(::std::string* url);
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.Favicon)
- private:
-  inline void set_has_url();
-  inline void clear_has_url();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::std::string* url_;
-  friend void TC_PROTO_API protobuf_AddDesc_embed_5ftypes_2eproto();
-  friend void protobuf_AssignDesc_embed_5ftypes_2eproto();
-  friend void protobuf_ShutdownFile_embed_5ftypes_2eproto();
-
-  void InitAsDefaultInstance();
-  static Favicon* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class TC_PROTO_API EmbedHTML : public ::google::protobuf::Message {
  public:
   EmbedHTML();
@@ -538,15 +453,6 @@ class TC_PROTO_API EmbedInfo : public ::google::protobuf::Message {
   inline ::std::string* release_description();
   inline void set_allocated_description(::std::string* description);
 
-  // optional .bgs.protocol.Favicon favicon = 7;
-  inline bool has_favicon() const;
-  inline void clear_favicon();
-  static const int kFaviconFieldNumber = 7;
-  inline const ::bgs::protocol::Favicon& favicon() const;
-  inline ::bgs::protocol::Favicon* mutable_favicon();
-  inline ::bgs::protocol::Favicon* release_favicon();
-  inline void set_allocated_favicon(::bgs::protocol::Favicon* favicon);
-
   // optional .bgs.protocol.EmbedHTML html = 8;
   inline bool has_html() const;
   inline void clear_html();
@@ -570,8 +476,6 @@ class TC_PROTO_API EmbedInfo : public ::google::protobuf::Message {
   inline void clear_has_provider();
   inline void set_has_description();
   inline void clear_has_description();
-  inline void set_has_favicon();
-  inline void clear_has_favicon();
   inline void set_has_html();
   inline void clear_has_html();
 
@@ -585,7 +489,6 @@ class TC_PROTO_API EmbedInfo : public ::google::protobuf::Message {
   ::bgs::protocol::EmbedImage* thumbnail_;
   ::bgs::protocol::Provider* provider_;
   ::std::string* description_;
-  ::bgs::protocol::Favicon* favicon_;
   ::bgs::protocol::EmbedHTML* html_;
   friend void TC_PROTO_API protobuf_AddDesc_embed_5ftypes_2eproto();
   friend void protobuf_AssignDesc_embed_5ftypes_2eproto();
@@ -810,86 +713,6 @@ inline void Provider::set_allocated_name(::std::string* name) {
 
 // -------------------------------------------------------------------
 
-// Favicon
-
-// optional string url = 1;
-inline bool Favicon::has_url() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void Favicon::set_has_url() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Favicon::clear_has_url() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void Favicon::clear_url() {
-  if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    url_->clear();
-  }
-  clear_has_url();
-}
-inline const ::std::string& Favicon::url() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.Favicon.url)
-  return *url_;
-}
-inline void Favicon::set_url(const ::std::string& value) {
-  set_has_url();
-  if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    url_ = new ::std::string;
-  }
-  url_->assign(value);
-  // @@protoc_insertion_point(field_set:bgs.protocol.Favicon.url)
-}
-inline void Favicon::set_url(const char* value) {
-  set_has_url();
-  if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    url_ = new ::std::string;
-  }
-  url_->assign(value);
-  // @@protoc_insertion_point(field_set_char:bgs.protocol.Favicon.url)
-}
-inline void Favicon::set_url(const char* value, size_t size) {
-  set_has_url();
-  if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    url_ = new ::std::string;
-  }
-  url_->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.Favicon.url)
-}
-inline ::std::string* Favicon::mutable_url() {
-  set_has_url();
-  if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    url_ = new ::std::string;
-  }
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.Favicon.url)
-  return url_;
-}
-inline ::std::string* Favicon::release_url() {
-  clear_has_url();
-  if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    return NULL;
-  } else {
-    ::std::string* temp = url_;
-    url_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-    return temp;
-  }
-}
-inline void Favicon::set_allocated_url(::std::string* url) {
-  if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    delete url_;
-  }
-  if (url) {
-    set_has_url();
-    url_ = url;
-  } else {
-    clear_has_url();
-    url_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.Favicon.url)
-}
-
-// -------------------------------------------------------------------
-
 // EmbedHTML
 
 // optional string content = 1;
@@ -1406,56 +1229,15 @@ inline void EmbedInfo::set_allocated_description(::std::string* description) {
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.EmbedInfo.description)
 }
 
-// optional .bgs.protocol.Favicon favicon = 7;
-inline bool EmbedInfo::has_favicon() const {
-  return (_has_bits_[0] & 0x00000040u) != 0;
-}
-inline void EmbedInfo::set_has_favicon() {
-  _has_bits_[0] |= 0x00000040u;
-}
-inline void EmbedInfo::clear_has_favicon() {
-  _has_bits_[0] &= ~0x00000040u;
-}
-inline void EmbedInfo::clear_favicon() {
-  if (favicon_ != NULL) favicon_->::bgs::protocol::Favicon::Clear();
-  clear_has_favicon();
-}
-inline const ::bgs::protocol::Favicon& EmbedInfo::favicon() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.EmbedInfo.favicon)
-  return favicon_ != NULL ? *favicon_ : *default_instance_->favicon_;
-}
-inline ::bgs::protocol::Favicon* EmbedInfo::mutable_favicon() {
-  set_has_favicon();
-  if (favicon_ == NULL) favicon_ = new ::bgs::protocol::Favicon;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.EmbedInfo.favicon)
-  return favicon_;
-}
-inline ::bgs::protocol::Favicon* EmbedInfo::release_favicon() {
-  clear_has_favicon();
-  ::bgs::protocol::Favicon* temp = favicon_;
-  favicon_ = NULL;
-  return temp;
-}
-inline void EmbedInfo::set_allocated_favicon(::bgs::protocol::Favicon* favicon) {
-  delete favicon_;
-  favicon_ = favicon;
-  if (favicon) {
-    set_has_favicon();
-  } else {
-    clear_has_favicon();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.EmbedInfo.favicon)
-}
-
 // optional .bgs.protocol.EmbedHTML html = 8;
 inline bool EmbedInfo::has_html() const {
-  return (_has_bits_[0] & 0x00000080u) != 0;
+  return (_has_bits_[0] & 0x00000040u) != 0;
 }
 inline void EmbedInfo::set_has_html() {
-  _has_bits_[0] |= 0x00000080u;
+  _has_bits_[0] |= 0x00000040u;
 }
 inline void EmbedInfo::clear_has_html() {
-  _has_bits_[0] &= ~0x00000080u;
+  _has_bits_[0] &= ~0x00000040u;
 }
 inline void EmbedInfo::clear_html() {
   if (html_ != NULL) html_->::bgs::protocol::EmbedHTML::Clear();
diff --git a/src/server/proto/Client/friends_service.pb.cc b/src/server/proto/Client/friends_service.pb.cc
index 4f662cb77b3..7307f99dcaa 100644
--- a/src/server/proto/Client/friends_service.pb.cc
+++ b/src/server/proto/Client/friends_service.pb.cc
@@ -100,10 +100,9 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       "friends_service.proto");
   GOOGLE_CHECK(file != NULL);
   SubscribeRequest_descriptor_ = file->message_type(0);
-  static const int SubscribeRequest_offsets_[3] = {
+  static const int SubscribeRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeRequest, object_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeRequest, forward_),
   };
   SubscribeRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -117,10 +116,9 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SubscribeRequest));
   UnsubscribeRequest_descriptor_ = file->message_type(1);
-  static const int UnsubscribeRequest_offsets_[3] = {
+  static const int UnsubscribeRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeRequest, object_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeRequest, forward_),
   };
   UnsubscribeRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -200,10 +198,9 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DeclineInvitationRequest));
   IgnoreInvitationRequest_descriptor_ = file->message_type(6);
-  static const int IgnoreInvitationRequest_offsets_[3] = {
+  static const int IgnoreInvitationRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IgnoreInvitationRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IgnoreInvitationRequest, invitation_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IgnoreInvitationRequest, program_),
   };
   IgnoreInvitationRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -343,10 +340,9 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CreateFriendshipRequest));
   FriendNotification_descriptor_ = file->message_type(15);
-  static const int FriendNotification_offsets_[3] = {
+  static const int FriendNotification_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FriendNotification, target_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FriendNotification, account_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FriendNotification, forward_),
   };
   FriendNotification_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -360,10 +356,9 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FriendNotification));
   UpdateFriendStateNotification_descriptor_ = file->message_type(16);
-  static const int UpdateFriendStateNotification_offsets_[3] = {
+  static const int UpdateFriendStateNotification_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateFriendStateNotification, changed_friend_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateFriendStateNotification, account_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateFriendStateNotification, forward_),
   };
   UpdateFriendStateNotification_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -377,11 +372,10 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UpdateFriendStateNotification));
   InvitationNotification_descriptor_ = file->message_type(17);
-  static const int InvitationNotification_offsets_[4] = {
+  static const int InvitationNotification_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationNotification, invitation_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationNotification, reason_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationNotification, account_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationNotification, forward_),
   };
   InvitationNotification_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -395,10 +389,9 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(InvitationNotification));
   SentInvitationAddedNotification_descriptor_ = file->message_type(18);
-  static const int SentInvitationAddedNotification_offsets_[3] = {
+  static const int SentInvitationAddedNotification_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SentInvitationAddedNotification, account_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SentInvitationAddedNotification, invitation_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SentInvitationAddedNotification, forward_),
   };
   SentInvitationAddedNotification_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -412,11 +405,10 @@ void protobuf_AssignDesc_friends_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SentInvitationAddedNotification));
   SentInvitationRemovedNotification_descriptor_ = file->message_type(19);
-  static const int SentInvitationRemovedNotification_offsets_[4] = {
+  static const int SentInvitationRemovedNotification_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SentInvitationRemovedNotification, account_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SentInvitationRemovedNotification, invitation_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SentInvitationRemovedNotification, reason_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SentInvitationRemovedNotification, forward_),
   };
   SentInvitationRemovedNotification_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -545,130 +537,124 @@ void protobuf_AddDesc_friends_5fservice_2eproto() {
     "\n\025friends_service.proto\022\027bgs.protocol.fr"
     "iends.v1\032\025attribute_types.proto\032\022entity_"
     "types.proto\032\023friends_types.proto\032\026invita"
-    "tion_types.proto\032\017rpc_types.proto\"\201\001\n\020Su"
-    "bscribeRequest\022(\n\010agent_id\030\001 \001(\0132\026.bgs.p"
-    "rotocol.EntityId\022\021\n\tobject_id\030\002 \002(\004\0220\n\007f"
-    "orward\030\003 \001(\0132\033.bgs.protocol.ObjectAddres"
-    "sB\002\030\001\"\203\001\n\022UnsubscribeRequest\022(\n\010agent_id"
-    "\030\001 \001(\0132\026.bgs.protocol.EntityId\022\021\n\tobject"
-    "_id\030\002 \001(\004\0220\n\007forward\030\003 \001(\0132\033.bgs.protoco"
-    "l.ObjectAddressB\002\030\001\"\242\001\n\025SendInvitationRe"
-    "quest\022.\n\016agent_identity\030\001 \001(\0132\026.bgs.prot"
-    "ocol.Identity\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.p"
-    "rotocol.EntityId\022.\n\006params\030\003 \002(\0132\036.bgs.p"
-    "rotocol.InvitationParams\"Z\n\027RevokeInvita"
-    "tionRequest\022(\n\010agent_id\030\001 \001(\0132\026.bgs.prot"
-    "ocol.EntityId\022\025\n\rinvitation_id\030\002 \001(\006\"\235\001\n"
-    "\027AcceptInvitationRequest\022(\n\010agent_id\030\001 \001"
-    "(\0132\026.bgs.protocol.EntityId\022\025\n\rinvitation"
-    "_id\030\003 \002(\006\022A\n\007options\030\004 \001(\01320.bgs.protoco"
-    "l.friends.v1.AcceptInvitationOptions\"[\n\030"
-    "DeclineInvitationRequest\022(\n\010agent_id\030\001 \001"
-    "(\0132\026.bgs.protocol.EntityId\022\025\n\rinvitation"
-    "_id\030\003 \002(\006\"k\n\027IgnoreInvitationRequest\022(\n\010"
-    "agent_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022\025"
-    "\n\rinvitation_id\030\003 \002(\006\022\017\n\007program\030\004 \001(\007\"j"
-    "\n\023RemoveFriendRequest\022(\n\010agent_id\030\001 \001(\0132"
-    "\026.bgs.protocol.EntityId\022)\n\ttarget_id\030\002 \002"
-    "(\0132\026.bgs.protocol.EntityId\"G\n\033RevokeAllI"
-    "nvitationsRequest\022(\n\010agent_id\030\002 \001(\0132\026.bg"
-    "s.protocol.EntityId\"i\n\022ViewFriendsReques"
-    "t\022(\n\010agent_id\030\001 \001(\0132\026.bgs.protocol.Entit"
-    "yId\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.protocol.En"
-    "tityId\"O\n\023ViewFriendsResponse\0228\n\007friends"
-    "\030\001 \003(\0132\'.bgs.protocol.friends.v1.FriendO"
-    "fFriend\"\233\001\n\030UpdateFriendStateRequest\022(\n\010"
-    "agent_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022)"
-    "\n\ttarget_id\030\002 \002(\0132\026.bgs.protocol.EntityI"
-    "d\022*\n\tattribute\030\003 \003(\0132\027.bgs.protocol.Attr"
-    "ibute\"@\n\024GetFriendListRequest\022(\n\010agent_i"
-    "d\030\002 \001(\0132\026.bgs.protocol.EntityId\"I\n\025GetFr"
-    "iendListResponse\0220\n\007friends\030\001 \003(\0132\037.bgs."
-    "protocol.friends.v1.Friend\"\200\001\n\027CreateFri"
-    "endshipRequest\022(\n\010agent_id\030\001 \001(\0132\026.bgs.p"
-    "rotocol.EntityId\022)\n\ttarget_id\030\002 \001(\0132\026.bg"
-    "s.protocol.EntityId\022\020\n\004role\030\003 \003(\rB\002\020\001\"\243\001"
-    "\n\022FriendNotification\022/\n\006target\030\001 \002(\0132\037.b"
-    "gs.protocol.friends.v1.Friend\022*\n\naccount"
-    "_id\030\005 \001(\0132\026.bgs.protocol.EntityId\0220\n\007for"
-    "ward\030\006 \001(\0132\033.bgs.protocol.ObjectAddressB"
-    "\002\030\001\"\266\001\n\035UpdateFriendStateNotification\0227\n"
-    "\016changed_friend\030\001 \002(\0132\037.bgs.protocol.fri"
-    "ends.v1.Friend\022*\n\naccount_id\030\005 \001(\0132\026.bgs"
-    ".protocol.EntityId\0220\n\007forward\030\006 \001(\0132\033.bg"
-    "s.protocol.ObjectAddressB\002\030\001\"\312\001\n\026Invitat"
-    "ionNotification\022\?\n\ninvitation\030\001 \002(\0132+.bg"
-    "s.protocol.friends.v1.ReceivedInvitation"
-    "\022\021\n\006reason\030\003 \001(\r:\0010\022*\n\naccount_id\030\005 \001(\0132"
-    "\026.bgs.protocol.EntityId\0220\n\007forward\030\006 \001(\013"
-    "2\033.bgs.protocol.ObjectAddressB\002\030\001\"\274\001\n\037Se"
-    "ntInvitationAddedNotification\022*\n\naccount"
-    "_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022;\n\ninv"
-    "itation\030\002 \001(\0132\'.bgs.protocol.friends.v1."
-    "SentInvitation\0220\n\007forward\030\003 \001(\0132\033.bgs.pr"
-    "otocol.ObjectAddressB\002\030\001\"\250\001\n!SentInvitat"
-    "ionRemovedNotification\022*\n\naccount_id\030\001 \001"
-    "(\0132\026.bgs.protocol.EntityId\022\025\n\rinvitation"
-    "_id\030\002 \001(\006\022\016\n\006reason\030\003 \001(\r\0220\n\007forward\030\004 \001"
-    "(\0132\033.bgs.protocol.ObjectAddressB\002\030\0012\202\013\n\016"
-    "FriendsService\022j\n\tSubscribe\022).bgs.protoc"
-    "ol.friends.v1.SubscribeRequest\032*.bgs.pro"
-    "tocol.friends.v1.SubscribeResponse\"\006\202\371+\002"
-    "\010\001\022^\n\016SendInvitation\022..bgs.protocol.frie"
-    "nds.v1.SendInvitationRequest\032\024.bgs.proto"
-    "col.NoData\"\006\202\371+\002\010\002\022b\n\020AcceptInvitation\0220"
-    ".bgs.protocol.friends.v1.AcceptInvitatio"
-    "nRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\003\022b"
-    "\n\020RevokeInvitation\0220.bgs.protocol.friend"
-    "s.v1.RevokeInvitationRequest\032\024.bgs.proto"
-    "col.NoData\"\006\202\371+\002\010\004\022g\n\021DeclineInvitation\022"
-    "1.bgs.protocol.friends.v1.DeclineInvitat"
-    "ionRequest\032\024.bgs.protocol.NoData\"\t\210\002\001\202\371+"
-    "\002\010\005\022b\n\020IgnoreInvitation\0220.bgs.protocol.f"
-    "riends.v1.IgnoreInvitationRequest\032\024.bgs."
-    "protocol.NoData\"\006\202\371+\002\010\006\022Z\n\014RemoveFriend\022"
-    ",.bgs.protocol.friends.v1.RemoveFriendRe"
-    "quest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\010\022p\n\013V"
-    "iewFriends\022+.bgs.protocol.friends.v1.Vie"
-    "wFriendsRequest\032,.bgs.protocol.friends.v"
-    "1.ViewFriendsResponse\"\006\202\371+\002\010\t\022d\n\021UpdateF"
-    "riendState\0221.bgs.protocol.friends.v1.Upd"
-    "ateFriendStateRequest\032\024.bgs.protocol.NoD"
-    "ata\"\006\202\371+\002\010\n\022X\n\013Unsubscribe\022+.bgs.protoco"
-    "l.friends.v1.UnsubscribeRequest\032\024.bgs.pr"
-    "otocol.NoData\"\006\202\371+\002\010\013\022j\n\024RevokeAllInvita"
-    "tions\0224.bgs.protocol.friends.v1.RevokeAl"
-    "lInvitationsRequest\032\024.bgs.protocol.NoDat"
-    "a\"\006\202\371+\002\010\014\022v\n\rGetFriendList\022-.bgs.protoco"
-    "l.friends.v1.GetFriendListRequest\032..bgs."
-    "protocol.friends.v1.GetFriendListRespons"
-    "e\"\006\202\371+\002\010\r\022b\n\020CreateFriendship\0220.bgs.prot"
-    "ocol.friends.v1.CreateFriendshipRequest\032"
-    "\024.bgs.protocol.NoData\"\006\202\371+\002\010\016\0329\202\371+/\n$bne"
-    "t.protocol.friends.FriendsService*\007frien"
-    "ds\212\371+\002\020\0012\314\006\n\017FriendsListener\022_\n\rOnFriend"
-    "Added\022+.bgs.protocol.friends.v1.FriendNo"
-    "tification\032\031.bgs.protocol.NO_RESPONSE\"\006\202"
-    "\371+\002\010\001\022a\n\017OnFriendRemoved\022+.bgs.protocol."
-    "friends.v1.FriendNotification\032\031.bgs.prot"
-    "ocol.NO_RESPONSE\"\006\202\371+\002\010\002\022o\n\031OnReceivedIn"
-    "vitationAdded\022/.bgs.protocol.friends.v1."
-    "InvitationNotification\032\031.bgs.protocol.NO"
-    "_RESPONSE\"\006\202\371+\002\010\003\022q\n\033OnReceivedInvitatio"
-    "nRemoved\022/.bgs.protocol.friends.v1.Invit"
-    "ationNotification\032\031.bgs.protocol.NO_RESP"
-    "ONSE\"\006\202\371+\002\010\004\022t\n\025OnSentInvitationAdded\0228."
-    "bgs.protocol.friends.v1.SentInvitationAd"
-    "dedNotification\032\031.bgs.protocol.NO_RESPON"
-    "SE\"\006\202\371+\002\010\005\022x\n\027OnSentInvitationRemoved\022:."
-    "bgs.protocol.friends.v1.SentInvitationRe"
-    "movedNotification\032\031.bgs.protocol.NO_RESP"
-    "ONSE\"\006\202\371+\002\010\006\022p\n\023OnUpdateFriendState\0226.bg"
-    "s.protocol.friends.v1.UpdateFriendStateN"
-    "otification\032\031.bgs.protocol.NO_RESPONSE\"\006"
-    "\202\371+\002\010\007\032/\202\371+%\n#bnet.protocol.friends.Frie"
-    "ndsNotify\212\371+\002\010\001B7\n\030bnet.protocol.friends"
-    ".v1B\023FriendsServiceProtoH\001\200\001\000\210\001\001", 5072);
+    "tion_types.proto\032\017rpc_types.proto\"W\n\020Sub"
+    "scribeRequest\0220\n\010agent_id\030\001 \001(\0132\026.bgs.pr"
+    "otocol.EntityIdB\006\202\371+\002 \001\022\021\n\tobject_id\030\002 \002"
+    "(\004\"Y\n\022UnsubscribeRequest\0220\n\010agent_id\030\001 \001"
+    "(\0132\026.bgs.protocol.EntityIdB\006\202\371+\002 \001\022\021\n\tob"
+    "ject_id\030\002 \001(\004\"\252\001\n\025SendInvitationRequest\022"
+    "6\n\016agent_identity\030\001 \001(\0132\026.bgs.protocol.I"
+    "dentityB\006\202\371+\002 \001\022)\n\ttarget_id\030\002 \002(\0132\026.bgs"
+    ".protocol.EntityId\022.\n\006params\030\003 \002(\0132\036.bgs"
+    ".protocol.InvitationParams\"b\n\027RevokeInvi"
+    "tationRequest\0220\n\010agent_id\030\001 \001(\0132\026.bgs.pr"
+    "otocol.EntityIdB\006\202\371+\002 \001\022\025\n\rinvitation_id"
+    "\030\002 \001(\006\"\245\001\n\027AcceptInvitationRequest\0220\n\010ag"
+    "ent_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371"
+    "+\002 \001\022\025\n\rinvitation_id\030\003 \002(\006\022A\n\007options\030\004"
+    " \001(\01320.bgs.protocol.friends.v1.AcceptInv"
+    "itationOptions\"c\n\030DeclineInvitationReque"
+    "st\0220\n\010agent_id\030\001 \001(\0132\026.bgs.protocol.Enti"
+    "tyIdB\006\202\371+\002 \001\022\025\n\rinvitation_id\030\003 \002(\006\"b\n\027I"
+    "gnoreInvitationRequest\0220\n\010agent_id\030\001 \001(\013"
+    "2\026.bgs.protocol.EntityIdB\006\202\371+\002 \001\022\025\n\rinvi"
+    "tation_id\030\003 \002(\006\"r\n\023RemoveFriendRequest\0220"
+    "\n\010agent_id\030\001 \001(\0132\026.bgs.protocol.EntityId"
+    "B\006\202\371+\002 \001\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.protoc"
+    "ol.EntityId\"O\n\033RevokeAllInvitationsReque"
+    "st\0220\n\010agent_id\030\002 \001(\0132\026.bgs.protocol.Enti"
+    "tyIdB\006\202\371+\002\020\001\"q\n\022ViewFriendsRequest\0220\n\010ag"
+    "ent_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371"
+    "+\002 \001\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.protocol.E"
+    "ntityId\"O\n\023ViewFriendsResponse\0228\n\007friend"
+    "s\030\001 \003(\0132\'.bgs.protocol.friends.v1.Friend"
+    "OfFriend\"\243\001\n\030UpdateFriendStateRequest\0220\n"
+    "\010agent_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB"
+    "\006\202\371+\002 \001\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.protoco"
+    "l.EntityId\022*\n\tattribute\030\003 \003(\0132\027.bgs.prot"
+    "ocol.Attribute\"H\n\024GetFriendListRequest\0220"
+    "\n\010agent_id\030\002 \001(\0132\026.bgs.protocol.EntityId"
+    "B\006\202\371+\002\020\001\"I\n\025GetFriendListResponse\0220\n\007fri"
+    "ends\030\001 \003(\0132\037.bgs.protocol.friends.v1.Fri"
+    "end\"\224\001\n\027CreateFriendshipRequest\0220\n\010agent"
+    "_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371+\002\020"
+    "\001\022)\n\ttarget_id\030\002 \001(\0132\026.bgs.protocol.Enti"
+    "tyId\022\034\n\004role\030\003 \003(\rB\016\020\001\212\371+\010*\006\n\004\010\001\020\001\"q\n\022Fr"
+    "iendNotification\022/\n\006target\030\001 \002(\0132\037.bgs.p"
+    "rotocol.friends.v1.Friend\022*\n\naccount_id\030"
+    "\005 \001(\0132\026.bgs.protocol.EntityId\"\204\001\n\035Update"
+    "FriendStateNotification\0227\n\016changed_frien"
+    "d\030\001 \002(\0132\037.bgs.protocol.friends.v1.Friend"
+    "\022*\n\naccount_id\030\005 \001(\0132\026.bgs.protocol.Enti"
+    "tyId\"\230\001\n\026InvitationNotification\022\?\n\ninvit"
+    "ation\030\001 \002(\0132+.bgs.protocol.friends.v1.Re"
+    "ceivedInvitation\022\021\n\006reason\030\003 \001(\r:\0010\022*\n\na"
+    "ccount_id\030\005 \001(\0132\026.bgs.protocol.EntityId\""
+    "\212\001\n\037SentInvitationAddedNotification\022*\n\na"
+    "ccount_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022"
+    ";\n\ninvitation\030\002 \001(\0132\'.bgs.protocol.frien"
+    "ds.v1.SentInvitation\"v\n!SentInvitationRe"
+    "movedNotification\022*\n\naccount_id\030\001 \001(\0132\026."
+    "bgs.protocol.EntityId\022\025\n\rinvitation_id\030\002"
+    " \001(\006\022\016\n\006reason\030\003 \001(\r2\230\013\n\016FriendsService\022"
+    "l\n\tSubscribe\022).bgs.protocol.friends.v1.S"
+    "ubscribeRequest\032*.bgs.protocol.friends.v"
+    "1.SubscribeResponse\"\010\202\371+\004\010\001\020\001\022`\n\016SendInv"
+    "itation\022..bgs.protocol.friends.v1.SendIn"
+    "vitationRequest\032\024.bgs.protocol.NoData\"\010\202"
+    "\371+\004\010\002\020\001\022d\n\020AcceptInvitation\0220.bgs.protoc"
+    "ol.friends.v1.AcceptInvitationRequest\032\024."
+    "bgs.protocol.NoData\"\010\202\371+\004\010\003\020\001\022d\n\020RevokeI"
+    "nvitation\0220.bgs.protocol.friends.v1.Revo"
+    "keInvitationRequest\032\024.bgs.protocol.NoDat"
+    "a\"\010\202\371+\004\010\004\020\001\022i\n\021DeclineInvitation\0221.bgs.p"
+    "rotocol.friends.v1.DeclineInvitationRequ"
+    "est\032\024.bgs.protocol.NoData\"\013\210\002\001\202\371+\004\010\005\020\001\022d"
+    "\n\020IgnoreInvitation\0220.bgs.protocol.friend"
+    "s.v1.IgnoreInvitationRequest\032\024.bgs.proto"
+    "col.NoData\"\010\202\371+\004\010\006\020\001\022\\\n\014RemoveFriend\022,.b"
+    "gs.protocol.friends.v1.RemoveFriendReque"
+    "st\032\024.bgs.protocol.NoData\"\010\202\371+\004\010\010\020\001\022r\n\013Vi"
+    "ewFriends\022+.bgs.protocol.friends.v1.View"
+    "FriendsRequest\032,.bgs.protocol.friends.v1"
+    ".ViewFriendsResponse\"\010\202\371+\004\010\t\020\001\022f\n\021Update"
+    "FriendState\0221.bgs.protocol.friends.v1.Up"
+    "dateFriendStateRequest\032\024.bgs.protocol.No"
+    "Data\"\010\202\371+\004\010\n\020\001\022Z\n\013Unsubscribe\022+.bgs.prot"
+    "ocol.friends.v1.UnsubscribeRequest\032\024.bgs"
+    ".protocol.NoData\"\010\202\371+\004\010\013\020\001\022j\n\024RevokeAllI"
+    "nvitations\0224.bgs.protocol.friends.v1.Rev"
+    "okeAllInvitationsRequest\032\024.bgs.protocol."
+    "NoData\"\006\202\371+\002\010\014\022v\n\rGetFriendList\022-.bgs.pr"
+    "otocol.friends.v1.GetFriendListRequest\032."
+    ".bgs.protocol.friends.v1.GetFriendListRe"
+    "sponse\"\006\202\371+\002\010\r\022b\n\020CreateFriendship\0220.bgs"
+    ".protocol.friends.v1.CreateFriendshipReq"
+    "uest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\016\032;\202\371+1"
+    "\n$bnet.protocol.friends.FriendsService*\007"
+    "friends0\001\212\371+\002\020\0012\314\006\n\017FriendsListener\022_\n\rO"
+    "nFriendAdded\022+.bgs.protocol.friends.v1.F"
+    "riendNotification\032\031.bgs.protocol.NO_RESP"
+    "ONSE\"\006\202\371+\002\010\001\022a\n\017OnFriendRemoved\022+.bgs.pr"
+    "otocol.friends.v1.FriendNotification\032\031.b"
+    "gs.protocol.NO_RESPONSE\"\006\202\371+\002\010\002\022o\n\031OnRec"
+    "eivedInvitationAdded\022/.bgs.protocol.frie"
+    "nds.v1.InvitationNotification\032\031.bgs.prot"
+    "ocol.NO_RESPONSE\"\006\202\371+\002\010\003\022q\n\033OnReceivedIn"
+    "vitationRemoved\022/.bgs.protocol.friends.v"
+    "1.InvitationNotification\032\031.bgs.protocol."
+    "NO_RESPONSE\"\006\202\371+\002\010\004\022t\n\025OnSentInvitationA"
+    "dded\0228.bgs.protocol.friends.v1.SentInvit"
+    "ationAddedNotification\032\031.bgs.protocol.NO"
+    "_RESPONSE\"\006\202\371+\002\010\005\022x\n\027OnSentInvitationRem"
+    "oved\022:.bgs.protocol.friends.v1.SentInvit"
+    "ationRemovedNotification\032\031.bgs.protocol."
+    "NO_RESPONSE\"\006\202\371+\002\010\006\022p\n\023OnUpdateFriendSta"
+    "te\0226.bgs.protocol.friends.v1.UpdateFrien"
+    "dStateNotification\032\031.bgs.protocol.NO_RES"
+    "PONSE\"\006\202\371+\002\010\007\032/\202\371+%\n#bnet.protocol.frien"
+    "ds.FriendsNotify\212\371+\002\010\001B7\n\030bnet.protocol."
+    "friends.v1B\023FriendsServiceProtoH\001\200\001\000\210\001\001", 4839);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "friends_service.proto", &protobuf_RegisterTypes);
   SubscribeRequest::default_instance_ = new SubscribeRequest();
@@ -726,7 +712,6 @@ struct StaticDescriptorInitializer_friends_5fservice_2eproto {
 #ifndef _MSC_VER
 const int SubscribeRequest::kAgentIdFieldNumber;
 const int SubscribeRequest::kObjectIdFieldNumber;
-const int SubscribeRequest::kForwardFieldNumber;
 #endif  // !_MSC_VER
 
 SubscribeRequest::SubscribeRequest()
@@ -737,7 +722,6 @@ SubscribeRequest::SubscribeRequest()
 
 void SubscribeRequest::InitAsDefaultInstance() {
   agent_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-  forward_ = const_cast< ::bgs::protocol::ObjectAddress*>(&::bgs::protocol::ObjectAddress::default_instance());
 }
 
 SubscribeRequest::SubscribeRequest(const SubscribeRequest& from)
@@ -751,7 +735,6 @@ void SubscribeRequest::SharedCtor() {
   _cached_size_ = 0;
   agent_id_ = NULL;
   object_id_ = GOOGLE_ULONGLONG(0);
-  forward_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -763,7 +746,6 @@ SubscribeRequest::~SubscribeRequest() {
 void SubscribeRequest::SharedDtor() {
   if (this != default_instance_) {
     delete agent_id_;
-    delete forward_;
   }
 }
 
@@ -789,14 +771,11 @@ SubscribeRequest* SubscribeRequest::New() const {
 }
 
 void SubscribeRequest::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::EntityId::Clear();
     }
     object_id_ = GOOGLE_ULONGLONG(0);
-    if (has_forward()) {
-      if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -835,19 +814,6 @@ bool SubscribeRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(26)) goto parse_forward;
-        break;
-      }
-
-      // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-      case 3: {
-        if (tag == 26) {
-         parse_forward:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_forward()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -888,12 +854,6 @@ void SubscribeRequest::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->object_id(), output);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  if (has_forward()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->forward(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -916,13 +876,6 @@ void SubscribeRequest::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->object_id(), target);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  if (has_forward()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->forward(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -949,13 +902,6 @@ int SubscribeRequest::ByteSize() const {
           this->object_id());
     }
 
-    // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-    if (has_forward()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->forward());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -989,9 +935,6 @@ void SubscribeRequest::MergeFrom(const SubscribeRequest& from) {
     if (from.has_object_id()) {
       set_object_id(from.object_id());
     }
-    if (from.has_forward()) {
-      mutable_forward()->::bgs::protocol::ObjectAddress::MergeFrom(from.forward());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -1014,9 +957,6 @@ bool SubscribeRequest::IsInitialized() const {
   if (has_agent_id()) {
     if (!this->agent_id().IsInitialized()) return false;
   }
-  if (has_forward()) {
-    if (!this->forward().IsInitialized()) return false;
-  }
   return true;
 }
 
@@ -1024,7 +964,6 @@ void SubscribeRequest::Swap(SubscribeRequest* other) {
   if (other != this) {
     std::swap(agent_id_, other->agent_id_);
     std::swap(object_id_, other->object_id_);
-    std::swap(forward_, other->forward_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -1045,7 +984,6 @@ void SubscribeRequest::Swap(SubscribeRequest* other) {
 #ifndef _MSC_VER
 const int UnsubscribeRequest::kAgentIdFieldNumber;
 const int UnsubscribeRequest::kObjectIdFieldNumber;
-const int UnsubscribeRequest::kForwardFieldNumber;
 #endif  // !_MSC_VER
 
 UnsubscribeRequest::UnsubscribeRequest()
@@ -1056,7 +994,6 @@ UnsubscribeRequest::UnsubscribeRequest()
 
 void UnsubscribeRequest::InitAsDefaultInstance() {
   agent_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-  forward_ = const_cast< ::bgs::protocol::ObjectAddress*>(&::bgs::protocol::ObjectAddress::default_instance());
 }
 
 UnsubscribeRequest::UnsubscribeRequest(const UnsubscribeRequest& from)
@@ -1070,7 +1007,6 @@ void UnsubscribeRequest::SharedCtor() {
   _cached_size_ = 0;
   agent_id_ = NULL;
   object_id_ = GOOGLE_ULONGLONG(0);
-  forward_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -1082,7 +1018,6 @@ UnsubscribeRequest::~UnsubscribeRequest() {
 void UnsubscribeRequest::SharedDtor() {
   if (this != default_instance_) {
     delete agent_id_;
-    delete forward_;
   }
 }
 
@@ -1108,14 +1043,11 @@ UnsubscribeRequest* UnsubscribeRequest::New() const {
 }
 
 void UnsubscribeRequest::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::EntityId::Clear();
     }
     object_id_ = GOOGLE_ULONGLONG(0);
-    if (has_forward()) {
-      if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -1154,19 +1086,6 @@ bool UnsubscribeRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(26)) goto parse_forward;
-        break;
-      }
-
-      // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-      case 3: {
-        if (tag == 26) {
-         parse_forward:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_forward()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -1207,12 +1126,6 @@ void UnsubscribeRequest::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->object_id(), output);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  if (has_forward()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->forward(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -1235,13 +1148,6 @@ void UnsubscribeRequest::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->object_id(), target);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  if (has_forward()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->forward(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -1268,13 +1174,6 @@ int UnsubscribeRequest::ByteSize() const {
           this->object_id());
     }
 
-    // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-    if (has_forward()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->forward());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -1308,9 +1207,6 @@ void UnsubscribeRequest::MergeFrom(const UnsubscribeRequest& from) {
     if (from.has_object_id()) {
       set_object_id(from.object_id());
     }
-    if (from.has_forward()) {
-      mutable_forward()->::bgs::protocol::ObjectAddress::MergeFrom(from.forward());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -1332,9 +1228,6 @@ bool UnsubscribeRequest::IsInitialized() const {
   if (has_agent_id()) {
     if (!this->agent_id().IsInitialized()) return false;
   }
-  if (has_forward()) {
-    if (!this->forward().IsInitialized()) return false;
-  }
   return true;
 }
 
@@ -1342,7 +1235,6 @@ void UnsubscribeRequest::Swap(UnsubscribeRequest* other) {
   if (other != this) {
     std::swap(agent_id_, other->agent_id_);
     std::swap(object_id_, other->object_id_);
-    std::swap(forward_, other->forward_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -2543,7 +2435,6 @@ void DeclineInvitationRequest::Swap(DeclineInvitationRequest* other) {
 #ifndef _MSC_VER
 const int IgnoreInvitationRequest::kAgentIdFieldNumber;
 const int IgnoreInvitationRequest::kInvitationIdFieldNumber;
-const int IgnoreInvitationRequest::kProgramFieldNumber;
 #endif  // !_MSC_VER
 
 IgnoreInvitationRequest::IgnoreInvitationRequest()
@@ -2567,7 +2458,6 @@ void IgnoreInvitationRequest::SharedCtor() {
   _cached_size_ = 0;
   agent_id_ = NULL;
   invitation_id_ = GOOGLE_ULONGLONG(0);
-  program_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -2604,26 +2494,12 @@ IgnoreInvitationRequest* IgnoreInvitationRequest::New() const {
 }
 
 void IgnoreInvitationRequest::Clear() {
-#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
-  &reinterpret_cast<IgnoreInvitationRequest*>(16)->f) - \
-   reinterpret_cast<char*>(16))
-
-#define ZR_(first, last) do {                              \
-    size_t f = OFFSET_OF_FIELD_(first);                    \
-    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
-    ::memset(&first, 0, n);                                \
-  } while (0)
-
-  if (_has_bits_[0 / 32] & 7) {
-    ZR_(invitation_id_, program_);
+  if (_has_bits_[0 / 32] & 3) {
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::EntityId::Clear();
     }
+    invitation_id_ = GOOGLE_ULONGLONG(0);
   }
-
-#undef OFFSET_OF_FIELD_
-#undef ZR_
-
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
@@ -2661,21 +2537,6 @@ bool IgnoreInvitationRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(37)) goto parse_program;
-        break;
-      }
-
-      // optional fixed32 program = 4;
-      case 4: {
-        if (tag == 37) {
-         parse_program:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>(
-                 input, &program_)));
-          set_has_program();
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -2716,11 +2577,6 @@ void IgnoreInvitationRequest::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteFixed64(3, this->invitation_id(), output);
   }
 
-  // optional fixed32 program = 4;
-  if (has_program()) {
-    ::google::protobuf::internal::WireFormatLite::WriteFixed32(4, this->program(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2743,11 +2599,6 @@ void IgnoreInvitationRequest::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteFixed64ToArray(3, this->invitation_id(), target);
   }
 
-  // optional fixed32 program = 4;
-  if (has_program()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(4, this->program(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -2772,11 +2623,6 @@ int IgnoreInvitationRequest::ByteSize() const {
       total_size += 1 + 8;
     }
 
-    // optional fixed32 program = 4;
-    if (has_program()) {
-      total_size += 1 + 4;
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -2810,9 +2656,6 @@ void IgnoreInvitationRequest::MergeFrom(const IgnoreInvitationRequest& from) {
     if (from.has_invitation_id()) {
       set_invitation_id(from.invitation_id());
     }
-    if (from.has_program()) {
-      set_program(from.program());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -2842,7 +2685,6 @@ void IgnoreInvitationRequest::Swap(IgnoreInvitationRequest* other) {
   if (other != this) {
     std::swap(agent_id_, other->agent_id_);
     std::swap(invitation_id_, other->invitation_id_);
-    std::swap(program_, other->program_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -4986,7 +4828,6 @@ void CreateFriendshipRequest::Swap(CreateFriendshipRequest* other) {
 #ifndef _MSC_VER
 const int FriendNotification::kTargetFieldNumber;
 const int FriendNotification::kAccountIdFieldNumber;
-const int FriendNotification::kForwardFieldNumber;
 #endif  // !_MSC_VER
 
 FriendNotification::FriendNotification()
@@ -4998,7 +4839,6 @@ FriendNotification::FriendNotification()
 void FriendNotification::InitAsDefaultInstance() {
   target_ = const_cast< ::bgs::protocol::friends::v1::Friend*>(&::bgs::protocol::friends::v1::Friend::default_instance());
   account_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-  forward_ = const_cast< ::bgs::protocol::ObjectAddress*>(&::bgs::protocol::ObjectAddress::default_instance());
 }
 
 FriendNotification::FriendNotification(const FriendNotification& from)
@@ -5012,7 +4852,6 @@ void FriendNotification::SharedCtor() {
   _cached_size_ = 0;
   target_ = NULL;
   account_id_ = NULL;
-  forward_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -5025,7 +4864,6 @@ void FriendNotification::SharedDtor() {
   if (this != default_instance_) {
     delete target_;
     delete account_id_;
-    delete forward_;
   }
 }
 
@@ -5051,16 +4889,13 @@ FriendNotification* FriendNotification::New() const {
 }
 
 void FriendNotification::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_target()) {
       if (target_ != NULL) target_->::bgs::protocol::friends::v1::Friend::Clear();
     }
     if (has_account_id()) {
       if (account_id_ != NULL) account_id_->::bgs::protocol::EntityId::Clear();
     }
-    if (has_forward()) {
-      if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -5097,19 +4932,6 @@ bool FriendNotification::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(50)) goto parse_forward;
-        break;
-      }
-
-      // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-      case 6: {
-        if (tag == 50) {
-         parse_forward:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_forward()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -5151,12 +4973,6 @@ void FriendNotification::SerializeWithCachedSizes(
       5, this->account_id(), output);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  if (has_forward()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->forward(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -5181,13 +4997,6 @@ void FriendNotification::SerializeWithCachedSizes(
         5, this->account_id(), target);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  if (has_forward()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->forward(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -5214,13 +5023,6 @@ int FriendNotification::ByteSize() const {
           this->account_id());
     }
 
-    // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-    if (has_forward()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->forward());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -5254,9 +5056,6 @@ void FriendNotification::MergeFrom(const FriendNotification& from) {
     if (from.has_account_id()) {
       mutable_account_id()->::bgs::protocol::EntityId::MergeFrom(from.account_id());
     }
-    if (from.has_forward()) {
-      mutable_forward()->::bgs::protocol::ObjectAddress::MergeFrom(from.forward());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -5282,9 +5081,6 @@ bool FriendNotification::IsInitialized() const {
   if (has_account_id()) {
     if (!this->account_id().IsInitialized()) return false;
   }
-  if (has_forward()) {
-    if (!this->forward().IsInitialized()) return false;
-  }
   return true;
 }
 
@@ -5292,7 +5088,6 @@ void FriendNotification::Swap(FriendNotification* other) {
   if (other != this) {
     std::swap(target_, other->target_);
     std::swap(account_id_, other->account_id_);
-    std::swap(forward_, other->forward_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -5313,7 +5108,6 @@ void FriendNotification::Swap(FriendNotification* other) {
 #ifndef _MSC_VER
 const int UpdateFriendStateNotification::kChangedFriendFieldNumber;
 const int UpdateFriendStateNotification::kAccountIdFieldNumber;
-const int UpdateFriendStateNotification::kForwardFieldNumber;
 #endif  // !_MSC_VER
 
 UpdateFriendStateNotification::UpdateFriendStateNotification()
@@ -5325,7 +5119,6 @@ UpdateFriendStateNotification::UpdateFriendStateNotification()
 void UpdateFriendStateNotification::InitAsDefaultInstance() {
   changed_friend_ = const_cast< ::bgs::protocol::friends::v1::Friend*>(&::bgs::protocol::friends::v1::Friend::default_instance());
   account_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-  forward_ = const_cast< ::bgs::protocol::ObjectAddress*>(&::bgs::protocol::ObjectAddress::default_instance());
 }
 
 UpdateFriendStateNotification::UpdateFriendStateNotification(const UpdateFriendStateNotification& from)
@@ -5339,7 +5132,6 @@ void UpdateFriendStateNotification::SharedCtor() {
   _cached_size_ = 0;
   changed_friend_ = NULL;
   account_id_ = NULL;
-  forward_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -5352,7 +5144,6 @@ void UpdateFriendStateNotification::SharedDtor() {
   if (this != default_instance_) {
     delete changed_friend_;
     delete account_id_;
-    delete forward_;
   }
 }
 
@@ -5378,16 +5169,13 @@ UpdateFriendStateNotification* UpdateFriendStateNotification::New() const {
 }
 
 void UpdateFriendStateNotification::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_changed_friend()) {
       if (changed_friend_ != NULL) changed_friend_->::bgs::protocol::friends::v1::Friend::Clear();
     }
     if (has_account_id()) {
       if (account_id_ != NULL) account_id_->::bgs::protocol::EntityId::Clear();
     }
-    if (has_forward()) {
-      if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -5424,19 +5212,6 @@ bool UpdateFriendStateNotification::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(50)) goto parse_forward;
-        break;
-      }
-
-      // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-      case 6: {
-        if (tag == 50) {
-         parse_forward:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_forward()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -5478,12 +5253,6 @@ void UpdateFriendStateNotification::SerializeWithCachedSizes(
       5, this->account_id(), output);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  if (has_forward()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->forward(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -5508,13 +5277,6 @@ void UpdateFriendStateNotification::SerializeWithCachedSizes(
         5, this->account_id(), target);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  if (has_forward()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->forward(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -5541,13 +5303,6 @@ int UpdateFriendStateNotification::ByteSize() const {
           this->account_id());
     }
 
-    // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-    if (has_forward()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->forward());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -5581,9 +5336,6 @@ void UpdateFriendStateNotification::MergeFrom(const UpdateFriendStateNotificatio
     if (from.has_account_id()) {
       mutable_account_id()->::bgs::protocol::EntityId::MergeFrom(from.account_id());
     }
-    if (from.has_forward()) {
-      mutable_forward()->::bgs::protocol::ObjectAddress::MergeFrom(from.forward());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -5609,9 +5361,6 @@ bool UpdateFriendStateNotification::IsInitialized() const {
   if (has_account_id()) {
     if (!this->account_id().IsInitialized()) return false;
   }
-  if (has_forward()) {
-    if (!this->forward().IsInitialized()) return false;
-  }
   return true;
 }
 
@@ -5619,7 +5368,6 @@ void UpdateFriendStateNotification::Swap(UpdateFriendStateNotification* other) {
   if (other != this) {
     std::swap(changed_friend_, other->changed_friend_);
     std::swap(account_id_, other->account_id_);
-    std::swap(forward_, other->forward_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -5641,7 +5389,6 @@ void UpdateFriendStateNotification::Swap(UpdateFriendStateNotification* other) {
 const int InvitationNotification::kInvitationFieldNumber;
 const int InvitationNotification::kReasonFieldNumber;
 const int InvitationNotification::kAccountIdFieldNumber;
-const int InvitationNotification::kForwardFieldNumber;
 #endif  // !_MSC_VER
 
 InvitationNotification::InvitationNotification()
@@ -5653,7 +5400,6 @@ InvitationNotification::InvitationNotification()
 void InvitationNotification::InitAsDefaultInstance() {
   invitation_ = const_cast< ::bgs::protocol::friends::v1::ReceivedInvitation*>(&::bgs::protocol::friends::v1::ReceivedInvitation::default_instance());
   account_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-  forward_ = const_cast< ::bgs::protocol::ObjectAddress*>(&::bgs::protocol::ObjectAddress::default_instance());
 }
 
 InvitationNotification::InvitationNotification(const InvitationNotification& from)
@@ -5668,7 +5414,6 @@ void InvitationNotification::SharedCtor() {
   invitation_ = NULL;
   reason_ = 0u;
   account_id_ = NULL;
-  forward_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -5681,7 +5426,6 @@ void InvitationNotification::SharedDtor() {
   if (this != default_instance_) {
     delete invitation_;
     delete account_id_;
-    delete forward_;
   }
 }
 
@@ -5707,7 +5451,7 @@ InvitationNotification* InvitationNotification::New() const {
 }
 
 void InvitationNotification::Clear() {
-  if (_has_bits_[0 / 32] & 15) {
+  if (_has_bits_[0 / 32] & 7) {
     if (has_invitation()) {
       if (invitation_ != NULL) invitation_->::bgs::protocol::friends::v1::ReceivedInvitation::Clear();
     }
@@ -5715,9 +5459,6 @@ void InvitationNotification::Clear() {
     if (has_account_id()) {
       if (account_id_ != NULL) account_id_->::bgs::protocol::EntityId::Clear();
     }
-    if (has_forward()) {
-      if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -5769,19 +5510,6 @@ bool InvitationNotification::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(50)) goto parse_forward;
-        break;
-      }
-
-      // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-      case 6: {
-        if (tag == 50) {
-         parse_forward:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_forward()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -5828,12 +5556,6 @@ void InvitationNotification::SerializeWithCachedSizes(
       5, this->account_id(), output);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  if (has_forward()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->forward(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -5863,13 +5585,6 @@ void InvitationNotification::SerializeWithCachedSizes(
         5, this->account_id(), target);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  if (has_forward()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->forward(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -5903,13 +5618,6 @@ int InvitationNotification::ByteSize() const {
           this->account_id());
     }
 
-    // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-    if (has_forward()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->forward());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -5946,9 +5654,6 @@ void InvitationNotification::MergeFrom(const InvitationNotification& from) {
     if (from.has_account_id()) {
       mutable_account_id()->::bgs::protocol::EntityId::MergeFrom(from.account_id());
     }
-    if (from.has_forward()) {
-      mutable_forward()->::bgs::protocol::ObjectAddress::MergeFrom(from.forward());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -5974,9 +5679,6 @@ bool InvitationNotification::IsInitialized() const {
   if (has_account_id()) {
     if (!this->account_id().IsInitialized()) return false;
   }
-  if (has_forward()) {
-    if (!this->forward().IsInitialized()) return false;
-  }
   return true;
 }
 
@@ -5985,7 +5687,6 @@ void InvitationNotification::Swap(InvitationNotification* other) {
     std::swap(invitation_, other->invitation_);
     std::swap(reason_, other->reason_);
     std::swap(account_id_, other->account_id_);
-    std::swap(forward_, other->forward_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -6006,7 +5707,6 @@ void InvitationNotification::Swap(InvitationNotification* other) {
 #ifndef _MSC_VER
 const int SentInvitationAddedNotification::kAccountIdFieldNumber;
 const int SentInvitationAddedNotification::kInvitationFieldNumber;
-const int SentInvitationAddedNotification::kForwardFieldNumber;
 #endif  // !_MSC_VER
 
 SentInvitationAddedNotification::SentInvitationAddedNotification()
@@ -6018,7 +5718,6 @@ SentInvitationAddedNotification::SentInvitationAddedNotification()
 void SentInvitationAddedNotification::InitAsDefaultInstance() {
   account_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
   invitation_ = const_cast< ::bgs::protocol::friends::v1::SentInvitation*>(&::bgs::protocol::friends::v1::SentInvitation::default_instance());
-  forward_ = const_cast< ::bgs::protocol::ObjectAddress*>(&::bgs::protocol::ObjectAddress::default_instance());
 }
 
 SentInvitationAddedNotification::SentInvitationAddedNotification(const SentInvitationAddedNotification& from)
@@ -6032,7 +5731,6 @@ void SentInvitationAddedNotification::SharedCtor() {
   _cached_size_ = 0;
   account_id_ = NULL;
   invitation_ = NULL;
-  forward_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -6045,7 +5743,6 @@ void SentInvitationAddedNotification::SharedDtor() {
   if (this != default_instance_) {
     delete account_id_;
     delete invitation_;
-    delete forward_;
   }
 }
 
@@ -6071,16 +5768,13 @@ SentInvitationAddedNotification* SentInvitationAddedNotification::New() const {
 }
 
 void SentInvitationAddedNotification::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_account_id()) {
       if (account_id_ != NULL) account_id_->::bgs::protocol::EntityId::Clear();
     }
     if (has_invitation()) {
       if (invitation_ != NULL) invitation_->::bgs::protocol::friends::v1::SentInvitation::Clear();
     }
-    if (has_forward()) {
-      if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -6117,19 +5811,6 @@ bool SentInvitationAddedNotification::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(26)) goto parse_forward;
-        break;
-      }
-
-      // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-      case 3: {
-        if (tag == 26) {
-         parse_forward:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_forward()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -6171,12 +5852,6 @@ void SentInvitationAddedNotification::SerializeWithCachedSizes(
       2, this->invitation(), output);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  if (has_forward()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->forward(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -6201,13 +5876,6 @@ void SentInvitationAddedNotification::SerializeWithCachedSizes(
         2, this->invitation(), target);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  if (has_forward()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->forward(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -6234,13 +5902,6 @@ int SentInvitationAddedNotification::ByteSize() const {
           this->invitation());
     }
 
-    // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-    if (has_forward()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->forward());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -6274,9 +5935,6 @@ void SentInvitationAddedNotification::MergeFrom(const SentInvitationAddedNotific
     if (from.has_invitation()) {
       mutable_invitation()->::bgs::protocol::friends::v1::SentInvitation::MergeFrom(from.invitation());
     }
-    if (from.has_forward()) {
-      mutable_forward()->::bgs::protocol::ObjectAddress::MergeFrom(from.forward());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -6301,9 +5959,6 @@ bool SentInvitationAddedNotification::IsInitialized() const {
   if (has_invitation()) {
     if (!this->invitation().IsInitialized()) return false;
   }
-  if (has_forward()) {
-    if (!this->forward().IsInitialized()) return false;
-  }
   return true;
 }
 
@@ -6311,7 +5966,6 @@ void SentInvitationAddedNotification::Swap(SentInvitationAddedNotification* othe
   if (other != this) {
     std::swap(account_id_, other->account_id_);
     std::swap(invitation_, other->invitation_);
-    std::swap(forward_, other->forward_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -6333,7 +5987,6 @@ void SentInvitationAddedNotification::Swap(SentInvitationAddedNotification* othe
 const int SentInvitationRemovedNotification::kAccountIdFieldNumber;
 const int SentInvitationRemovedNotification::kInvitationIdFieldNumber;
 const int SentInvitationRemovedNotification::kReasonFieldNumber;
-const int SentInvitationRemovedNotification::kForwardFieldNumber;
 #endif  // !_MSC_VER
 
 SentInvitationRemovedNotification::SentInvitationRemovedNotification()
@@ -6344,7 +5997,6 @@ SentInvitationRemovedNotification::SentInvitationRemovedNotification()
 
 void SentInvitationRemovedNotification::InitAsDefaultInstance() {
   account_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-  forward_ = const_cast< ::bgs::protocol::ObjectAddress*>(&::bgs::protocol::ObjectAddress::default_instance());
 }
 
 SentInvitationRemovedNotification::SentInvitationRemovedNotification(const SentInvitationRemovedNotification& from)
@@ -6359,7 +6011,6 @@ void SentInvitationRemovedNotification::SharedCtor() {
   account_id_ = NULL;
   invitation_id_ = GOOGLE_ULONGLONG(0);
   reason_ = 0u;
-  forward_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -6371,7 +6022,6 @@ SentInvitationRemovedNotification::~SentInvitationRemovedNotification() {
 void SentInvitationRemovedNotification::SharedDtor() {
   if (this != default_instance_) {
     delete account_id_;
-    delete forward_;
   }
 }
 
@@ -6397,16 +6047,26 @@ SentInvitationRemovedNotification* SentInvitationRemovedNotification::New() cons
 }
 
 void SentInvitationRemovedNotification::Clear() {
-  if (_has_bits_[0 / 32] & 15) {
+#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
+  &reinterpret_cast<SentInvitationRemovedNotification*>(16)->f) - \
+   reinterpret_cast<char*>(16))
+
+#define ZR_(first, last) do {                              \
+    size_t f = OFFSET_OF_FIELD_(first);                    \
+    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
+    ::memset(&first, 0, n);                                \
+  } while (0)
+
+  if (_has_bits_[0 / 32] & 7) {
+    ZR_(invitation_id_, reason_);
     if (has_account_id()) {
       if (account_id_ != NULL) account_id_->::bgs::protocol::EntityId::Clear();
     }
-    invitation_id_ = GOOGLE_ULONGLONG(0);
-    reason_ = 0u;
-    if (has_forward()) {
-      if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-    }
   }
+
+#undef OFFSET_OF_FIELD_
+#undef ZR_
+
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
@@ -6459,19 +6119,6 @@ bool SentInvitationRemovedNotification::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(34)) goto parse_forward;
-        break;
-      }
-
-      // optional .bgs.protocol.ObjectAddress forward = 4 [deprecated = true];
-      case 4: {
-        if (tag == 34) {
-         parse_forward:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_forward()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -6517,12 +6164,6 @@ void SentInvitationRemovedNotification::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->reason(), output);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 4 [deprecated = true];
-  if (has_forward()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->forward(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -6550,13 +6191,6 @@ void SentInvitationRemovedNotification::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->reason(), target);
   }
 
-  // optional .bgs.protocol.ObjectAddress forward = 4 [deprecated = true];
-  if (has_forward()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->forward(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -6588,13 +6222,6 @@ int SentInvitationRemovedNotification::ByteSize() const {
           this->reason());
     }
 
-    // optional .bgs.protocol.ObjectAddress forward = 4 [deprecated = true];
-    if (has_forward()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->forward());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -6631,9 +6258,6 @@ void SentInvitationRemovedNotification::MergeFrom(const SentInvitationRemovedNot
     if (from.has_reason()) {
       set_reason(from.reason());
     }
-    if (from.has_forward()) {
-      mutable_forward()->::bgs::protocol::ObjectAddress::MergeFrom(from.forward());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -6655,9 +6279,6 @@ bool SentInvitationRemovedNotification::IsInitialized() const {
   if (has_account_id()) {
     if (!this->account_id().IsInitialized()) return false;
   }
-  if (has_forward()) {
-    if (!this->forward().IsInitialized()) return false;
-  }
   return true;
 }
 
@@ -6666,7 +6287,6 @@ void SentInvitationRemovedNotification::Swap(SentInvitationRemovedNotification*
     std::swap(account_id_, other->account_id_);
     std::swap(invitation_id_, other->invitation_id_);
     std::swap(reason_, other->reason_);
-    std::swap(forward_, other->forward_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/friends_service.pb.h b/src/server/proto/Client/friends_service.pb.h
index 73b9f6faad3..f413736807e 100644
--- a/src/server/proto/Client/friends_service.pb.h
+++ b/src/server/proto/Client/friends_service.pb.h
@@ -137,23 +137,12 @@ class TC_PROTO_API SubscribeRequest : public ::google::protobuf::Message {
   inline ::google::protobuf::uint64 object_id() const;
   inline void set_object_id(::google::protobuf::uint64 value);
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  inline bool has_forward() const PROTOBUF_DEPRECATED;
-  inline void clear_forward() PROTOBUF_DEPRECATED;
-  static const int kForwardFieldNumber = 3;
-  inline const ::bgs::protocol::ObjectAddress& forward() const PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* mutable_forward() PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* release_forward() PROTOBUF_DEPRECATED;
-  inline void set_allocated_forward(::bgs::protocol::ObjectAddress* forward) PROTOBUF_DEPRECATED;
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.SubscribeRequest)
  private:
   inline void set_has_agent_id();
   inline void clear_has_agent_id();
   inline void set_has_object_id();
   inline void clear_has_object_id();
-  inline void set_has_forward();
-  inline void clear_has_forward();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -161,7 +150,6 @@ class TC_PROTO_API SubscribeRequest : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* agent_id_;
   ::google::protobuf::uint64 object_id_;
-  ::bgs::protocol::ObjectAddress* forward_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
   friend void protobuf_ShutdownFile_friends_5fservice_2eproto();
@@ -240,23 +228,12 @@ class TC_PROTO_API UnsubscribeRequest : public ::google::protobuf::Message {
   inline ::google::protobuf::uint64 object_id() const;
   inline void set_object_id(::google::protobuf::uint64 value);
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  inline bool has_forward() const PROTOBUF_DEPRECATED;
-  inline void clear_forward() PROTOBUF_DEPRECATED;
-  static const int kForwardFieldNumber = 3;
-  inline const ::bgs::protocol::ObjectAddress& forward() const PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* mutable_forward() PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* release_forward() PROTOBUF_DEPRECATED;
-  inline void set_allocated_forward(::bgs::protocol::ObjectAddress* forward) PROTOBUF_DEPRECATED;
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.UnsubscribeRequest)
  private:
   inline void set_has_agent_id();
   inline void clear_has_agent_id();
   inline void set_has_object_id();
   inline void clear_has_object_id();
-  inline void set_has_forward();
-  inline void clear_has_forward();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -264,7 +241,6 @@ class TC_PROTO_API UnsubscribeRequest : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* agent_id_;
   ::google::protobuf::uint64 object_id_;
-  ::bgs::protocol::ObjectAddress* forward_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
   friend void protobuf_ShutdownFile_friends_5fservice_2eproto();
@@ -733,21 +709,12 @@ class TC_PROTO_API IgnoreInvitationRequest : public ::google::protobuf::Message
   inline ::google::protobuf::uint64 invitation_id() const;
   inline void set_invitation_id(::google::protobuf::uint64 value);
 
-  // optional fixed32 program = 4;
-  inline bool has_program() const;
-  inline void clear_program();
-  static const int kProgramFieldNumber = 4;
-  inline ::google::protobuf::uint32 program() const;
-  inline void set_program(::google::protobuf::uint32 value);
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.IgnoreInvitationRequest)
  private:
   inline void set_has_agent_id();
   inline void clear_has_agent_id();
   inline void set_has_invitation_id();
   inline void clear_has_invitation_id();
-  inline void set_has_program();
-  inline void clear_has_program();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -755,7 +722,6 @@ class TC_PROTO_API IgnoreInvitationRequest : public ::google::protobuf::Message
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* agent_id_;
   ::google::protobuf::uint64 invitation_id_;
-  ::google::protobuf::uint32 program_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
   friend void protobuf_ShutdownFile_friends_5fservice_2eproto();
@@ -1561,23 +1527,12 @@ class TC_PROTO_API FriendNotification : public ::google::protobuf::Message {
   inline ::bgs::protocol::EntityId* release_account_id();
   inline void set_allocated_account_id(::bgs::protocol::EntityId* account_id);
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  inline bool has_forward() const PROTOBUF_DEPRECATED;
-  inline void clear_forward() PROTOBUF_DEPRECATED;
-  static const int kForwardFieldNumber = 6;
-  inline const ::bgs::protocol::ObjectAddress& forward() const PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* mutable_forward() PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* release_forward() PROTOBUF_DEPRECATED;
-  inline void set_allocated_forward(::bgs::protocol::ObjectAddress* forward) PROTOBUF_DEPRECATED;
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.FriendNotification)
  private:
   inline void set_has_target();
   inline void clear_has_target();
   inline void set_has_account_id();
   inline void clear_has_account_id();
-  inline void set_has_forward();
-  inline void clear_has_forward();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1585,7 +1540,6 @@ class TC_PROTO_API FriendNotification : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::bgs::protocol::friends::v1::Friend* target_;
   ::bgs::protocol::EntityId* account_id_;
-  ::bgs::protocol::ObjectAddress* forward_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
   friend void protobuf_ShutdownFile_friends_5fservice_2eproto();
@@ -1666,23 +1620,12 @@ class TC_PROTO_API UpdateFriendStateNotification : public ::google::protobuf::Me
   inline ::bgs::protocol::EntityId* release_account_id();
   inline void set_allocated_account_id(::bgs::protocol::EntityId* account_id);
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  inline bool has_forward() const PROTOBUF_DEPRECATED;
-  inline void clear_forward() PROTOBUF_DEPRECATED;
-  static const int kForwardFieldNumber = 6;
-  inline const ::bgs::protocol::ObjectAddress& forward() const PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* mutable_forward() PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* release_forward() PROTOBUF_DEPRECATED;
-  inline void set_allocated_forward(::bgs::protocol::ObjectAddress* forward) PROTOBUF_DEPRECATED;
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.UpdateFriendStateNotification)
  private:
   inline void set_has_changed_friend();
   inline void clear_has_changed_friend();
   inline void set_has_account_id();
   inline void clear_has_account_id();
-  inline void set_has_forward();
-  inline void clear_has_forward();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1690,7 +1633,6 @@ class TC_PROTO_API UpdateFriendStateNotification : public ::google::protobuf::Me
   mutable int _cached_size_;
   ::bgs::protocol::friends::v1::Friend* changed_friend_;
   ::bgs::protocol::EntityId* account_id_;
-  ::bgs::protocol::ObjectAddress* forward_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
   friend void protobuf_ShutdownFile_friends_5fservice_2eproto();
@@ -1778,15 +1720,6 @@ class TC_PROTO_API InvitationNotification : public ::google::protobuf::Message {
   inline ::bgs::protocol::EntityId* release_account_id();
   inline void set_allocated_account_id(::bgs::protocol::EntityId* account_id);
 
-  // optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-  inline bool has_forward() const PROTOBUF_DEPRECATED;
-  inline void clear_forward() PROTOBUF_DEPRECATED;
-  static const int kForwardFieldNumber = 6;
-  inline const ::bgs::protocol::ObjectAddress& forward() const PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* mutable_forward() PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* release_forward() PROTOBUF_DEPRECATED;
-  inline void set_allocated_forward(::bgs::protocol::ObjectAddress* forward) PROTOBUF_DEPRECATED;
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.InvitationNotification)
  private:
   inline void set_has_invitation();
@@ -1795,8 +1728,6 @@ class TC_PROTO_API InvitationNotification : public ::google::protobuf::Message {
   inline void clear_has_reason();
   inline void set_has_account_id();
   inline void clear_has_account_id();
-  inline void set_has_forward();
-  inline void clear_has_forward();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1804,7 +1735,6 @@ class TC_PROTO_API InvitationNotification : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::bgs::protocol::friends::v1::ReceivedInvitation* invitation_;
   ::bgs::protocol::EntityId* account_id_;
-  ::bgs::protocol::ObjectAddress* forward_;
   ::google::protobuf::uint32 reason_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
@@ -1886,23 +1816,12 @@ class TC_PROTO_API SentInvitationAddedNotification : public ::google::protobuf::
   inline ::bgs::protocol::friends::v1::SentInvitation* release_invitation();
   inline void set_allocated_invitation(::bgs::protocol::friends::v1::SentInvitation* invitation);
 
-  // optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-  inline bool has_forward() const PROTOBUF_DEPRECATED;
-  inline void clear_forward() PROTOBUF_DEPRECATED;
-  static const int kForwardFieldNumber = 3;
-  inline const ::bgs::protocol::ObjectAddress& forward() const PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* mutable_forward() PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* release_forward() PROTOBUF_DEPRECATED;
-  inline void set_allocated_forward(::bgs::protocol::ObjectAddress* forward) PROTOBUF_DEPRECATED;
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.SentInvitationAddedNotification)
  private:
   inline void set_has_account_id();
   inline void clear_has_account_id();
   inline void set_has_invitation();
   inline void clear_has_invitation();
-  inline void set_has_forward();
-  inline void clear_has_forward();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1910,7 +1829,6 @@ class TC_PROTO_API SentInvitationAddedNotification : public ::google::protobuf::
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* account_id_;
   ::bgs::protocol::friends::v1::SentInvitation* invitation_;
-  ::bgs::protocol::ObjectAddress* forward_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
   friend void protobuf_ShutdownFile_friends_5fservice_2eproto();
@@ -1996,15 +1914,6 @@ class TC_PROTO_API SentInvitationRemovedNotification : public ::google::protobuf
   inline ::google::protobuf::uint32 reason() const;
   inline void set_reason(::google::protobuf::uint32 value);
 
-  // optional .bgs.protocol.ObjectAddress forward = 4 [deprecated = true];
-  inline bool has_forward() const PROTOBUF_DEPRECATED;
-  inline void clear_forward() PROTOBUF_DEPRECATED;
-  static const int kForwardFieldNumber = 4;
-  inline const ::bgs::protocol::ObjectAddress& forward() const PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* mutable_forward() PROTOBUF_DEPRECATED;
-  inline ::bgs::protocol::ObjectAddress* release_forward() PROTOBUF_DEPRECATED;
-  inline void set_allocated_forward(::bgs::protocol::ObjectAddress* forward) PROTOBUF_DEPRECATED;
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.friends.v1.SentInvitationRemovedNotification)
  private:
   inline void set_has_account_id();
@@ -2013,8 +1922,6 @@ class TC_PROTO_API SentInvitationRemovedNotification : public ::google::protobuf
   inline void clear_has_invitation_id();
   inline void set_has_reason();
   inline void clear_has_reason();
-  inline void set_has_forward();
-  inline void clear_has_forward();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -2022,7 +1929,6 @@ class TC_PROTO_API SentInvitationRemovedNotification : public ::google::protobuf
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* account_id_;
   ::google::protobuf::uint64 invitation_id_;
-  ::bgs::protocol::ObjectAddress* forward_;
   ::google::protobuf::uint32 reason_;
   friend void TC_PROTO_API protobuf_AddDesc_friends_5fservice_2eproto();
   friend void protobuf_AssignDesc_friends_5fservice_2eproto();
@@ -2172,47 +2078,6 @@ inline void SubscribeRequest::set_object_id(::google::protobuf::uint64 value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.SubscribeRequest.object_id)
 }
 
-// optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-inline bool SubscribeRequest::has_forward() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void SubscribeRequest::set_has_forward() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void SubscribeRequest::clear_has_forward() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void SubscribeRequest::clear_forward() {
-  if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-  clear_has_forward();
-}
-inline const ::bgs::protocol::ObjectAddress& SubscribeRequest::forward() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.SubscribeRequest.forward)
-  return forward_ != NULL ? *forward_ : *default_instance_->forward_;
-}
-inline ::bgs::protocol::ObjectAddress* SubscribeRequest::mutable_forward() {
-  set_has_forward();
-  if (forward_ == NULL) forward_ = new ::bgs::protocol::ObjectAddress;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.SubscribeRequest.forward)
-  return forward_;
-}
-inline ::bgs::protocol::ObjectAddress* SubscribeRequest::release_forward() {
-  clear_has_forward();
-  ::bgs::protocol::ObjectAddress* temp = forward_;
-  forward_ = NULL;
-  return temp;
-}
-inline void SubscribeRequest::set_allocated_forward(::bgs::protocol::ObjectAddress* forward) {
-  delete forward_;
-  forward_ = forward;
-  if (forward) {
-    set_has_forward();
-  } else {
-    clear_has_forward();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.SubscribeRequest.forward)
-}
-
 // -------------------------------------------------------------------
 
 // UnsubscribeRequest
@@ -2282,47 +2147,6 @@ inline void UnsubscribeRequest::set_object_id(::google::protobuf::uint64 value)
   // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.UnsubscribeRequest.object_id)
 }
 
-// optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-inline bool UnsubscribeRequest::has_forward() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void UnsubscribeRequest::set_has_forward() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void UnsubscribeRequest::clear_has_forward() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void UnsubscribeRequest::clear_forward() {
-  if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-  clear_has_forward();
-}
-inline const ::bgs::protocol::ObjectAddress& UnsubscribeRequest::forward() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.UnsubscribeRequest.forward)
-  return forward_ != NULL ? *forward_ : *default_instance_->forward_;
-}
-inline ::bgs::protocol::ObjectAddress* UnsubscribeRequest::mutable_forward() {
-  set_has_forward();
-  if (forward_ == NULL) forward_ = new ::bgs::protocol::ObjectAddress;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.UnsubscribeRequest.forward)
-  return forward_;
-}
-inline ::bgs::protocol::ObjectAddress* UnsubscribeRequest::release_forward() {
-  clear_has_forward();
-  ::bgs::protocol::ObjectAddress* temp = forward_;
-  forward_ = NULL;
-  return temp;
-}
-inline void UnsubscribeRequest::set_allocated_forward(::bgs::protocol::ObjectAddress* forward) {
-  delete forward_;
-  forward_ = forward;
-  if (forward) {
-    set_has_forward();
-  } else {
-    clear_has_forward();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.UnsubscribeRequest.forward)
-}
-
 // -------------------------------------------------------------------
 
 // SendInvitationRequest
@@ -2767,30 +2591,6 @@ inline void IgnoreInvitationRequest::set_invitation_id(::google::protobuf::uint6
   // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.IgnoreInvitationRequest.invitation_id)
 }
 
-// optional fixed32 program = 4;
-inline bool IgnoreInvitationRequest::has_program() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void IgnoreInvitationRequest::set_has_program() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void IgnoreInvitationRequest::clear_has_program() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void IgnoreInvitationRequest::clear_program() {
-  program_ = 0u;
-  clear_has_program();
-}
-inline ::google::protobuf::uint32 IgnoreInvitationRequest::program() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.IgnoreInvitationRequest.program)
-  return program_;
-}
-inline void IgnoreInvitationRequest::set_program(::google::protobuf::uint32 value) {
-  set_has_program();
-  program_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.IgnoreInvitationRequest.program)
-}
-
 // -------------------------------------------------------------------
 
 // RemoveFriendRequest
@@ -3439,47 +3239,6 @@ inline void FriendNotification::set_allocated_account_id(::bgs::protocol::Entity
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.FriendNotification.account_id)
 }
 
-// optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-inline bool FriendNotification::has_forward() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void FriendNotification::set_has_forward() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void FriendNotification::clear_has_forward() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void FriendNotification::clear_forward() {
-  if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-  clear_has_forward();
-}
-inline const ::bgs::protocol::ObjectAddress& FriendNotification::forward() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.FriendNotification.forward)
-  return forward_ != NULL ? *forward_ : *default_instance_->forward_;
-}
-inline ::bgs::protocol::ObjectAddress* FriendNotification::mutable_forward() {
-  set_has_forward();
-  if (forward_ == NULL) forward_ = new ::bgs::protocol::ObjectAddress;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.FriendNotification.forward)
-  return forward_;
-}
-inline ::bgs::protocol::ObjectAddress* FriendNotification::release_forward() {
-  clear_has_forward();
-  ::bgs::protocol::ObjectAddress* temp = forward_;
-  forward_ = NULL;
-  return temp;
-}
-inline void FriendNotification::set_allocated_forward(::bgs::protocol::ObjectAddress* forward) {
-  delete forward_;
-  forward_ = forward;
-  if (forward) {
-    set_has_forward();
-  } else {
-    clear_has_forward();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.FriendNotification.forward)
-}
-
 // -------------------------------------------------------------------
 
 // UpdateFriendStateNotification
@@ -3566,47 +3325,6 @@ inline void UpdateFriendStateNotification::set_allocated_account_id(::bgs::proto
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.UpdateFriendStateNotification.account_id)
 }
 
-// optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-inline bool UpdateFriendStateNotification::has_forward() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void UpdateFriendStateNotification::set_has_forward() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void UpdateFriendStateNotification::clear_has_forward() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void UpdateFriendStateNotification::clear_forward() {
-  if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-  clear_has_forward();
-}
-inline const ::bgs::protocol::ObjectAddress& UpdateFriendStateNotification::forward() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.UpdateFriendStateNotification.forward)
-  return forward_ != NULL ? *forward_ : *default_instance_->forward_;
-}
-inline ::bgs::protocol::ObjectAddress* UpdateFriendStateNotification::mutable_forward() {
-  set_has_forward();
-  if (forward_ == NULL) forward_ = new ::bgs::protocol::ObjectAddress;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.UpdateFriendStateNotification.forward)
-  return forward_;
-}
-inline ::bgs::protocol::ObjectAddress* UpdateFriendStateNotification::release_forward() {
-  clear_has_forward();
-  ::bgs::protocol::ObjectAddress* temp = forward_;
-  forward_ = NULL;
-  return temp;
-}
-inline void UpdateFriendStateNotification::set_allocated_forward(::bgs::protocol::ObjectAddress* forward) {
-  delete forward_;
-  forward_ = forward;
-  if (forward) {
-    set_has_forward();
-  } else {
-    clear_has_forward();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.UpdateFriendStateNotification.forward)
-}
-
 // -------------------------------------------------------------------
 
 // InvitationNotification
@@ -3717,47 +3435,6 @@ inline void InvitationNotification::set_allocated_account_id(::bgs::protocol::En
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.InvitationNotification.account_id)
 }
 
-// optional .bgs.protocol.ObjectAddress forward = 6 [deprecated = true];
-inline bool InvitationNotification::has_forward() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void InvitationNotification::set_has_forward() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void InvitationNotification::clear_has_forward() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void InvitationNotification::clear_forward() {
-  if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-  clear_has_forward();
-}
-inline const ::bgs::protocol::ObjectAddress& InvitationNotification::forward() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.InvitationNotification.forward)
-  return forward_ != NULL ? *forward_ : *default_instance_->forward_;
-}
-inline ::bgs::protocol::ObjectAddress* InvitationNotification::mutable_forward() {
-  set_has_forward();
-  if (forward_ == NULL) forward_ = new ::bgs::protocol::ObjectAddress;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.InvitationNotification.forward)
-  return forward_;
-}
-inline ::bgs::protocol::ObjectAddress* InvitationNotification::release_forward() {
-  clear_has_forward();
-  ::bgs::protocol::ObjectAddress* temp = forward_;
-  forward_ = NULL;
-  return temp;
-}
-inline void InvitationNotification::set_allocated_forward(::bgs::protocol::ObjectAddress* forward) {
-  delete forward_;
-  forward_ = forward;
-  if (forward) {
-    set_has_forward();
-  } else {
-    clear_has_forward();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.InvitationNotification.forward)
-}
-
 // -------------------------------------------------------------------
 
 // SentInvitationAddedNotification
@@ -3844,47 +3521,6 @@ inline void SentInvitationAddedNotification::set_allocated_invitation(::bgs::pro
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.SentInvitationAddedNotification.invitation)
 }
 
-// optional .bgs.protocol.ObjectAddress forward = 3 [deprecated = true];
-inline bool SentInvitationAddedNotification::has_forward() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void SentInvitationAddedNotification::set_has_forward() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void SentInvitationAddedNotification::clear_has_forward() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void SentInvitationAddedNotification::clear_forward() {
-  if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-  clear_has_forward();
-}
-inline const ::bgs::protocol::ObjectAddress& SentInvitationAddedNotification::forward() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.SentInvitationAddedNotification.forward)
-  return forward_ != NULL ? *forward_ : *default_instance_->forward_;
-}
-inline ::bgs::protocol::ObjectAddress* SentInvitationAddedNotification::mutable_forward() {
-  set_has_forward();
-  if (forward_ == NULL) forward_ = new ::bgs::protocol::ObjectAddress;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.SentInvitationAddedNotification.forward)
-  return forward_;
-}
-inline ::bgs::protocol::ObjectAddress* SentInvitationAddedNotification::release_forward() {
-  clear_has_forward();
-  ::bgs::protocol::ObjectAddress* temp = forward_;
-  forward_ = NULL;
-  return temp;
-}
-inline void SentInvitationAddedNotification::set_allocated_forward(::bgs::protocol::ObjectAddress* forward) {
-  delete forward_;
-  forward_ = forward;
-  if (forward) {
-    set_has_forward();
-  } else {
-    clear_has_forward();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.SentInvitationAddedNotification.forward)
-}
-
 // -------------------------------------------------------------------
 
 // SentInvitationRemovedNotification
@@ -3978,47 +3614,6 @@ inline void SentInvitationRemovedNotification::set_reason(::google::protobuf::ui
   // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.SentInvitationRemovedNotification.reason)
 }
 
-// optional .bgs.protocol.ObjectAddress forward = 4 [deprecated = true];
-inline bool SentInvitationRemovedNotification::has_forward() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void SentInvitationRemovedNotification::set_has_forward() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void SentInvitationRemovedNotification::clear_has_forward() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void SentInvitationRemovedNotification::clear_forward() {
-  if (forward_ != NULL) forward_->::bgs::protocol::ObjectAddress::Clear();
-  clear_has_forward();
-}
-inline const ::bgs::protocol::ObjectAddress& SentInvitationRemovedNotification::forward() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.SentInvitationRemovedNotification.forward)
-  return forward_ != NULL ? *forward_ : *default_instance_->forward_;
-}
-inline ::bgs::protocol::ObjectAddress* SentInvitationRemovedNotification::mutable_forward() {
-  set_has_forward();
-  if (forward_ == NULL) forward_ = new ::bgs::protocol::ObjectAddress;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.SentInvitationRemovedNotification.forward)
-  return forward_;
-}
-inline ::bgs::protocol::ObjectAddress* SentInvitationRemovedNotification::release_forward() {
-  clear_has_forward();
-  ::bgs::protocol::ObjectAddress* temp = forward_;
-  forward_ = NULL;
-  return temp;
-}
-inline void SentInvitationRemovedNotification::set_allocated_forward(::bgs::protocol::ObjectAddress* forward) {
-  delete forward_;
-  forward_ = forward;
-  if (forward) {
-    set_has_forward();
-  } else {
-    clear_has_forward();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.SentInvitationRemovedNotification.forward)
-}
-
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/src/server/proto/Client/friends_types.pb.cc b/src/server/proto/Client/friends_types.pb.cc
index 5a409436bea..7def9d8a4a4 100644
--- a/src/server/proto/Client/friends_types.pb.cc
+++ b/src/server/proto/Client/friends_types.pb.cc
@@ -269,56 +269,60 @@ void protobuf_AddDesc_friends_5ftypes_2eproto() {
   already_here = true;
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
+  ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto();
   ::bgs::protocol::protobuf_AddDesc_attribute_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_entity_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_invitation_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_role_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\023friends_types.proto\022\027bgs.protocol.frie"
-    "nds.v1\032\025attribute_types.proto\032\022entity_ty"
-    "pes.proto\032\026invitation_types.proto\032\020role_"
-    "types.proto\"\273\001\n\006Friend\022*\n\naccount_id\030\001 \002"
-    "(\0132\026.bgs.protocol.EntityId\022*\n\tattribute\030"
-    "\002 \003(\0132\027.bgs.protocol.Attribute\022\020\n\004role\030\003"
-    " \003(\rB\002\020\001\022\022\n\nprivileges\030\004 \001(\004\022\034\n\020attribut"
-    "es_epoch\030\005 \001(\004B\002\030\001\022\025\n\rcreation_time\030\006 \001("
-    "\004\"\211\001\n\016FriendOfFriend\022*\n\naccount_id\030\001 \001(\013"
-    "2\026.bgs.protocol.EntityId\022\020\n\004role\030\003 \003(\rB\002"
-    "\020\001\022\022\n\nprivileges\030\004 \001(\004\022\021\n\tfull_name\030\006 \001("
-    "\t\022\022\n\nbattle_tag\030\007 \001(\t\"\337\001\n\022ReceivedInvita"
-    "tion\022\n\n\002id\030\001 \002(\006\0220\n\020inviter_identity\030\002 \002"
-    "(\0132\026.bgs.protocol.Identity\0220\n\020invitee_id"
-    "entity\030\003 \002(\0132\026.bgs.protocol.Identity\022\024\n\014"
-    "inviter_name\030\004 \001(\t\022\024\n\014invitee_name\030\005 \001(\t"
-    "\022\025\n\rcreation_time\030\007 \001(\004\022\017\n\007program\030\t \001(\007"
-    "*\005\010d\020\220N\"\303\001\n\020FriendInvitation\022\020\n\004role\030\002 \003"
-    "(\rB\002\020\001\022*\n\tattribute\030\003 \003(\0132\027.bgs.protocol"
-    ".Attribute2q\n\021friend_invitation\022+.bgs.pr"
-    "otocol.friends.v1.ReceivedInvitation\030g \001"
-    "(\0132).bgs.protocol.friends.v1.FriendInvit"
-    "ation\"\223\001\n\016SentInvitation\022\n\n\002id\030\001 \001(\006\022\023\n\013"
-    "target_name\030\002 \001(\t\022\014\n\004role\030\003 \001(\r\022*\n\tattri"
-    "bute\030\004 \003(\0132\027.bgs.protocol.Attribute\022\025\n\rc"
-    "reation_time\030\005 \001(\004\022\017\n\007program\030\006 \001(\007\"\231\002\n\026"
-    "FriendInvitationParams\022\024\n\014target_email\030\001"
-    " \001(\t\022\031\n\021target_battle_tag\030\002 \001(\t\022\020\n\004role\030"
-    "\006 \003(\rB\002\020\001\022*\n\tattribute\030\010 \003(\0132\027.bgs.proto"
-    "col.Attribute\022\023\n\013target_name\030\t \001(\t\022\023\n\007pr"
-    "ogram\030\n \001(\007B\002\030\0012f\n\rfriend_params\022\036.bgs.p"
-    "rotocol.InvitationParams\030g \001(\0132/.bgs.pro"
-    "tocol.friends.v1.FriendInvitationParams\""
-    "\326\002\n\021SubscribeResponse\022\027\n\013max_friends\030\001 \001"
-    "(\rB\002\030\001\022$\n\030max_received_invitations\030\002 \001(\r"
-    "B\002\030\001\022 \n\024max_sent_invitations\030\003 \001(\rB\002\030\001\022 "
-    "\n\004role\030\004 \003(\0132\022.bgs.protocol.Role\0220\n\007frie"
-    "nds\030\005 \003(\0132\037.bgs.protocol.friends.v1.Frie"
-    "nd\022I\n\024received_invitations\030\007 \003(\0132+.bgs.p"
-    "rotocol.friends.v1.ReceivedInvitation\022A\n"
-    "\020sent_invitations\030\010 \003(\0132\'.bgs.protocol.f"
-    "riends.v1.SentInvitation\"8\n\027AcceptInvita"
-    "tionOptions\022\014\n\004role\030\001 \001(\r\022\017\n\007program\030\002 \001"
-    "(\007B/\n\030bnet.protocol.friends.v1B\021FriendsT"
-    "ypesProtoH\001", 1771);
+    "nds.v1\032%global_extensions/field_options."
+    "proto\032\025attribute_types.proto\032\022entity_typ"
+    "es.proto\032\026invitation_types.proto\032\020role_t"
+    "ypes.proto\"\273\001\n\006Friend\022*\n\naccount_id\030\001 \002("
+    "\0132\026.bgs.protocol.EntityId\022*\n\tattribute\030\002"
+    " \003(\0132\027.bgs.protocol.Attribute\022\020\n\004role\030\003 "
+    "\003(\rB\002\020\001\022\022\n\nprivileges\030\004 \001(\004\022\034\n\020attribute"
+    "s_epoch\030\005 \001(\004B\002\030\001\022\025\n\rcreation_time\030\006 \001(\004"
+    "\"\245\001\n\016FriendOfFriend\022*\n\naccount_id\030\001 \001(\0132"
+    "\026.bgs.protocol.EntityId\022\034\n\004role\030\003 \003(\rB\016\020"
+    "\001\212\371+\010*\006\n\004\010\001\020\001\022\022\n\nprivileges\030\004 \001(\004\022\031\n\tful"
+    "l_name\030\006 \001(\tB\006\202\371+\002\010\001\022\032\n\nbattle_tag\030\007 \001(\t"
+    "B\006\202\371+\002\010\001\"\337\001\n\022ReceivedInvitation\022\n\n\002id\030\001 "
+    "\002(\006\0220\n\020inviter_identity\030\002 \002(\0132\026.bgs.prot"
+    "ocol.Identity\0220\n\020invitee_identity\030\003 \002(\0132"
+    "\026.bgs.protocol.Identity\022\024\n\014inviter_name\030"
+    "\004 \001(\t\022\024\n\014invitee_name\030\005 \001(\t\022\025\n\rcreation_"
+    "time\030\007 \001(\004\022\017\n\007program\030\t \001(\007*\005\010d\020\220N\"\317\001\n\020F"
+    "riendInvitation\022\034\n\004role\030\002 \003(\rB\016\020\001\212\371+\010*\006\n"
+    "\004\010\001\020\001\022*\n\tattribute\030\003 \003(\0132\027.bgs.protocol."
+    "Attribute2q\n\021friend_invitation\022+.bgs.pro"
+    "tocol.friends.v1.ReceivedInvitation\030g \001("
+    "\0132).bgs.protocol.friends.v1.FriendInvita"
+    "tion\"\223\001\n\016SentInvitation\022\n\n\002id\030\001 \001(\006\022\023\n\013t"
+    "arget_name\030\002 \001(\t\022\014\n\004role\030\003 \001(\r\022*\n\tattrib"
+    "ute\030\004 \003(\0132\027.bgs.protocol.Attribute\022\025\n\rcr"
+    "eation_time\030\005 \001(\004\022\017\n\007program\030\006 \001(\007\"\265\002\n\026F"
+    "riendInvitationParams\022\034\n\014target_email\030\001 "
+    "\001(\tB\006\202\371+\002\010\001\022!\n\021target_battle_tag\030\002 \001(\tB\006"
+    "\202\371+\002\010\001\022\034\n\004role\030\006 \003(\rB\016\020\001\212\371+\010*\006\n\004\010\001\020\001\022*\n\t"
+    "attribute\030\010 \003(\0132\027.bgs.protocol.Attribute"
+    "\022\023\n\013target_name\030\t \001(\t\022\023\n\007program\030\n \001(\007B\002"
+    "\030\0012f\n\rfriend_params\022\036.bgs.protocol.Invit"
+    "ationParams\030g \001(\0132/.bgs.protocol.friends"
+    ".v1.FriendInvitationParams\"\326\002\n\021Subscribe"
+    "Response\022\027\n\013max_friends\030\001 \001(\rB\002\030\001\022$\n\030max"
+    "_received_invitations\030\002 \001(\rB\002\030\001\022 \n\024max_s"
+    "ent_invitations\030\003 \001(\rB\002\030\001\022 \n\004role\030\004 \003(\0132"
+    "\022.bgs.protocol.Role\0220\n\007friends\030\005 \003(\0132\037.b"
+    "gs.protocol.friends.v1.Friend\022I\n\024receive"
+    "d_invitations\030\007 \003(\0132+.bgs.protocol.frien"
+    "ds.v1.ReceivedInvitation\022A\n\020sent_invitat"
+    "ions\030\010 \003(\0132\'.bgs.protocol.friends.v1.Sen"
+    "tInvitation\"F\n\027AcceptInvitationOptions\022\032"
+    "\n\004role\030\001 \001(\rB\014\212\371+\010\022\006\n\004\010\000\020\002\022\017\n\007program\030\002 "
+    "\001(\007B/\n\030bnet.protocol.friends.v1B\021Friends"
+    "TypesProtoH\001P\000", 1894);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "friends_types.proto", &protobuf_RegisterTypes);
   Friend::default_instance_ = new Friend();
diff --git a/src/server/proto/Client/friends_types.pb.h b/src/server/proto/Client/friends_types.pb.h
index 1f82a8db2d4..ac21179c278 100644
--- a/src/server/proto/Client/friends_types.pb.h
+++ b/src/server/proto/Client/friends_types.pb.h
@@ -24,6 +24,7 @@
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/extension_set.h>
 #include <google/protobuf/unknown_field_set.h>
+#include "global_extensions/field_options.pb.h"  // IWYU pragma: export
 #include "attribute_types.pb.h"
 #include "entity_types.pb.h"
 #include "invitation_types.pb.h"
diff --git a/src/server/proto/Client/game_utilities_service.pb.cc b/src/server/proto/Client/game_utilities_service.pb.cc
index 8e7a1ef9b7e..91366e3858f 100644
--- a/src/server/proto/Client/game_utilities_service.pb.cc
+++ b/src/server/proto/Client/game_utilities_service.pb.cc
@@ -42,24 +42,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* PresenceChannelCreatedRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   PresenceChannelCreatedRequest_reflection_ = NULL;
-const ::google::protobuf::Descriptor* GetPlayerVariablesRequest_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  GetPlayerVariablesRequest_reflection_ = NULL;
-const ::google::protobuf::Descriptor* GetPlayerVariablesResponse_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  GetPlayerVariablesResponse_reflection_ = NULL;
 const ::google::protobuf::Descriptor* GameAccountOnlineNotification_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   GameAccountOnlineNotification_reflection_ = NULL;
 const ::google::protobuf::Descriptor* GameAccountOfflineNotification_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   GameAccountOfflineNotification_reflection_ = NULL;
-const ::google::protobuf::Descriptor* GetAchievementsFileRequest_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  GetAchievementsFileRequest_reflection_ = NULL;
-const ::google::protobuf::Descriptor* GetAchievementsFileResponse_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  GetAchievementsFileResponse_reflection_ = NULL;
 const ::google::protobuf::Descriptor* GetAllValuesForAttributeRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   GetAllValuesForAttributeRequest_reflection_ = NULL;
@@ -171,38 +159,7 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PresenceChannelCreatedRequest));
-  GetPlayerVariablesRequest_descriptor_ = file->message_type(5);
-  static const int GetPlayerVariablesRequest_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetPlayerVariablesRequest, player_variables_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetPlayerVariablesRequest, host_),
-  };
-  GetPlayerVariablesRequest_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      GetPlayerVariablesRequest_descriptor_,
-      GetPlayerVariablesRequest::default_instance_,
-      GetPlayerVariablesRequest_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetPlayerVariablesRequest, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetPlayerVariablesRequest, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(GetPlayerVariablesRequest));
-  GetPlayerVariablesResponse_descriptor_ = file->message_type(6);
-  static const int GetPlayerVariablesResponse_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetPlayerVariablesResponse, player_variables_),
-  };
-  GetPlayerVariablesResponse_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      GetPlayerVariablesResponse_descriptor_,
-      GetPlayerVariablesResponse::default_instance_,
-      GetPlayerVariablesResponse_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetPlayerVariablesResponse, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetPlayerVariablesResponse, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(GetPlayerVariablesResponse));
-  GameAccountOnlineNotification_descriptor_ = file->message_type(7);
+  GameAccountOnlineNotification_descriptor_ = file->message_type(5);
   static const int GameAccountOnlineNotification_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountOnlineNotification, game_account_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountOnlineNotification, host_),
@@ -219,7 +176,7 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountOnlineNotification));
-  GameAccountOfflineNotification_descriptor_ = file->message_type(8);
+  GameAccountOfflineNotification_descriptor_ = file->message_type(6);
   static const int GameAccountOfflineNotification_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountOfflineNotification, game_account_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountOfflineNotification, host_),
@@ -236,37 +193,7 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GameAccountOfflineNotification));
-  GetAchievementsFileRequest_descriptor_ = file->message_type(9);
-  static const int GetAchievementsFileRequest_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAchievementsFileRequest, host_),
-  };
-  GetAchievementsFileRequest_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      GetAchievementsFileRequest_descriptor_,
-      GetAchievementsFileRequest::default_instance_,
-      GetAchievementsFileRequest_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAchievementsFileRequest, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAchievementsFileRequest, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(GetAchievementsFileRequest));
-  GetAchievementsFileResponse_descriptor_ = file->message_type(10);
-  static const int GetAchievementsFileResponse_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAchievementsFileResponse, content_handle_),
-  };
-  GetAchievementsFileResponse_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      GetAchievementsFileResponse_descriptor_,
-      GetAchievementsFileResponse::default_instance_,
-      GetAchievementsFileResponse_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAchievementsFileResponse, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAchievementsFileResponse, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(GetAchievementsFileResponse));
-  GetAllValuesForAttributeRequest_descriptor_ = file->message_type(11);
+  GetAllValuesForAttributeRequest_descriptor_ = file->message_type(7);
   static const int GetAllValuesForAttributeRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAllValuesForAttributeRequest, attribute_key_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAllValuesForAttributeRequest, agent_id_),
@@ -283,7 +210,7 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetAllValuesForAttributeRequest));
-  GetAllValuesForAttributeResponse_descriptor_ = file->message_type(12);
+  GetAllValuesForAttributeResponse_descriptor_ = file->message_type(8);
   static const int GetAllValuesForAttributeResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetAllValuesForAttributeResponse, attribute_value_),
   };
@@ -298,7 +225,7 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(GetAllValuesForAttributeResponse));
-  RegisterUtilitiesRequest_descriptor_ = file->message_type(13);
+  RegisterUtilitiesRequest_descriptor_ = file->message_type(9);
   static const int RegisterUtilitiesRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesRequest, attribute_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesRequest, program_),
@@ -314,7 +241,7 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RegisterUtilitiesRequest));
-  RegisterUtilitiesResponse_descriptor_ = file->message_type(14);
+  RegisterUtilitiesResponse_descriptor_ = file->message_type(10);
   static const int RegisterUtilitiesResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesResponse, client_id_),
   };
@@ -329,7 +256,7 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RegisterUtilitiesResponse));
-  UnregisterUtilitiesRequest_descriptor_ = file->message_type(15);
+  UnregisterUtilitiesRequest_descriptor_ = file->message_type(11);
   static const int UnregisterUtilitiesRequest_offsets_[1] = {
   };
   UnregisterUtilitiesRequest_reflection_ =
@@ -367,18 +294,10 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     PresenceChannelCreatedRequest_descriptor_, &PresenceChannelCreatedRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    GetPlayerVariablesRequest_descriptor_, &GetPlayerVariablesRequest::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    GetPlayerVariablesResponse_descriptor_, &GetPlayerVariablesResponse::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GameAccountOnlineNotification_descriptor_, &GameAccountOnlineNotification::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GameAccountOfflineNotification_descriptor_, &GameAccountOfflineNotification::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    GetAchievementsFileRequest_descriptor_, &GetAchievementsFileRequest::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    GetAchievementsFileResponse_descriptor_, &GetAchievementsFileResponse::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GetAllValuesForAttributeRequest_descriptor_, &GetAllValuesForAttributeRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     GetAllValuesForAttributeResponse_descriptor_, &GetAllValuesForAttributeResponse::default_instance());
@@ -403,18 +322,10 @@ void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto() {
   delete ServerResponse_reflection_;
   delete PresenceChannelCreatedRequest::default_instance_;
   delete PresenceChannelCreatedRequest_reflection_;
-  delete GetPlayerVariablesRequest::default_instance_;
-  delete GetPlayerVariablesRequest_reflection_;
-  delete GetPlayerVariablesResponse::default_instance_;
-  delete GetPlayerVariablesResponse_reflection_;
   delete GameAccountOnlineNotification::default_instance_;
   delete GameAccountOnlineNotification_reflection_;
   delete GameAccountOfflineNotification::default_instance_;
   delete GameAccountOfflineNotification_reflection_;
-  delete GetAchievementsFileRequest::default_instance_;
-  delete GetAchievementsFileRequest_reflection_;
-  delete GetAchievementsFileResponse::default_instance_;
-  delete GetAchievementsFileResponse_reflection_;
   delete GetAllValuesForAttributeRequest::default_instance_;
   delete GetAllValuesForAttributeRequest_reflection_;
   delete GetAllValuesForAttributeResponse::default_instance_;
@@ -434,98 +345,81 @@ void protobuf_AddDesc_game_5futilities_5fservice_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   ::bgs::protocol::protobuf_AddDesc_attribute_5ftypes_2eproto();
-  ::bgs::protocol::protobuf_AddDesc_content_5fhandle_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_entity_5ftypes_2eproto();
   ::bgs::protocol::game_utilities::v1::protobuf_AddDesc_game_5futilities_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\034game_utilities_service.proto\022\036bgs.prot"
     "ocol.game_utilities.v1\032\025attribute_types."
-    "proto\032\032content_handle_types.proto\032\022entit"
-    "y_types.proto\032\032game_utilities_types.prot"
-    "o\032\017rpc_types.proto\"\221\002\n\rClientRequest\022*\n\t"
-    "attribute\030\001 \003(\0132\027.bgs.protocol.Attribute"
-    "\022%\n\004host\030\002 \001(\0132\027.bgs.protocol.ProcessId\022"
-    "*\n\naccount_id\030\003 \001(\0132\026.bgs.protocol.Entit"
-    "yId\022/\n\017game_account_id\030\004 \001(\0132\026.bgs.proto"
-    "col.EntityId\022\017\n\007program\030\005 \001(\007\022\?\n\013client_"
-    "info\030\006 \001(\0132*.bgs.protocol.game_utilities"
-    ".v1.ClientInfo\"<\n\016ClientResponse\022*\n\tattr"
-    "ibute\030\001 \003(\0132\027.bgs.protocol.Attribute\"s\n\r"
-    "ServerRequest\022*\n\tattribute\030\001 \003(\0132\027.bgs.p"
-    "rotocol.Attribute\022\017\n\007program\030\002 \002(\007\022%\n\004ho"
-    "st\030\003 \001(\0132\027.bgs.protocol.ProcessId\"<\n\016Ser"
-    "verResponse\022*\n\tattribute\030\001 \003(\0132\027.bgs.pro"
-    "tocol.Attribute\"\307\001\n\035PresenceChannelCreat"
-    "edRequest\022\"\n\002id\030\001 \002(\0132\026.bgs.protocol.Ent"
-    "ityId\022/\n\017game_account_id\030\003 \001(\0132\026.bgs.pro"
-    "tocol.EntityId\022*\n\naccount_id\030\004 \001(\0132\026.bgs"
-    ".protocol.EntityId\022%\n\004host\030\005 \001(\0132\027.bgs.p"
-    "rotocol.ProcessId\"\215\001\n\031GetPlayerVariables"
-    "Request\022I\n\020player_variables\030\001 \003(\0132/.bgs."
-    "protocol.game_utilities.v1.PlayerVariabl"
-    "es\022%\n\004host\030\002 \001(\0132\027.bgs.protocol.ProcessI"
-    "d\"g\n\032GetPlayerVariablesResponse\022I\n\020playe"
-    "r_variables\030\001 \003(\0132/.bgs.protocol.game_ut"
-    "ilities.v1.PlayerVariables\"\213\001\n\035GameAccou"
-    "ntOnlineNotification\022/\n\017game_account_id\030"
-    "\001 \002(\0132\026.bgs.protocol.EntityId\022%\n\004host\030\002 "
-    "\001(\0132\027.bgs.protocol.ProcessId\022\022\n\nsession_"
-    "id\030\003 \001(\t\"\214\001\n\036GameAccountOfflineNotificat"
+    "proto\032\022entity_types.proto\032\032game_utilitie"
+    "s_types.proto\032\017rpc_types.proto\"\235\002\n\rClien"
+    "tRequest\022*\n\tattribute\030\001 \003(\0132\027.bgs.protoc"
+    "ol.Attribute\022)\n\004host\030\002 \001(\0132\027.bgs.protoco"
+    "l.ProcessIdB\002\030\001\022*\n\naccount_id\030\003 \001(\0132\026.bg"
+    "s.protocol.EntityId\022/\n\017game_account_id\030\004"
+    " \001(\0132\026.bgs.protocol.EntityId\022\017\n\007program\030"
+    "\005 \001(\007\022\?\n\013client_info\030\006 \001(\0132*.bgs.protoco"
+    "l.game_utilities.v1.ClientInfo:\006\202\371+\002\010\001\"<"
+    "\n\016ClientResponse\022*\n\tattribute\030\001 \003(\0132\027.bg"
+    "s.protocol.Attribute\"w\n\rServerRequest\022*\n"
+    "\tattribute\030\001 \003(\0132\027.bgs.protocol.Attribut"
+    "e\022\017\n\007program\030\002 \002(\007\022)\n\004host\030\003 \001(\0132\027.bgs.p"
+    "rotocol.ProcessIdB\002\030\001\"<\n\016ServerResponse\022"
+    "*\n\tattribute\030\001 \003(\0132\027.bgs.protocol.Attrib"
+    "ute\"\313\001\n\035PresenceChannelCreatedRequest\022\"\n"
+    "\002id\030\001 \002(\0132\026.bgs.protocol.EntityId\022/\n\017gam"
+    "e_account_id\030\003 \001(\0132\026.bgs.protocol.Entity"
+    "Id\022*\n\naccount_id\030\004 \001(\0132\026.bgs.protocol.En"
+    "tityId\022)\n\004host\030\005 \001(\0132\027.bgs.protocol.Proc"
+    "essIdB\002\030\001\"\217\001\n\035GameAccountOnlineNotificat"
     "ion\022/\n\017game_account_id\030\001 \002(\0132\026.bgs.proto"
-    "col.EntityId\022%\n\004host\030\002 \001(\0132\027.bgs.protoco"
-    "l.ProcessId\022\022\n\nsession_id\030\003 \001(\t\"C\n\032GetAc"
-    "hievementsFileRequest\022%\n\004host\030\001 \001(\0132\027.bg"
-    "s.protocol.ProcessId\"R\n\033GetAchievementsF"
-    "ileResponse\0223\n\016content_handle\030\001 \001(\0132\033.bg"
-    "s.protocol.ContentHandle\"s\n\037GetAllValues"
-    "ForAttributeRequest\022\025\n\rattribute_key\030\001 \001"
-    "(\t\022(\n\010agent_id\030\002 \001(\0132\026.bgs.protocol.Enti"
-    "tyId\022\017\n\007program\030\005 \001(\007\"R\n GetAllValuesFor"
-    "AttributeResponse\022.\n\017attribute_value\030\001 \003"
-    "(\0132\025.bgs.protocol.Variant\"W\n\030RegisterUti"
-    "litiesRequest\022*\n\tattribute\030\001 \003(\0132\027.bgs.p"
-    "rotocol.Attribute\022\017\n\007program\030\002 \001(\007\".\n\031Re"
-    "gisterUtilitiesResponse\022\021\n\tclient_id\030\001 \001"
-    "(\t\"\034\n\032UnregisterUtilitiesRequest2\251\013\n\024Gam"
-    "eUtilitiesService\022}\n\024ProcessClientReques"
-    "t\022-.bgs.protocol.game_utilities.v1.Clien"
-    "tRequest\032..bgs.protocol.game_utilities.v"
-    "1.ClientResponse\"\006\202\371+\002\010\001\022u\n\026PresenceChan"
-    "nelCreated\022=.bgs.protocol.game_utilities"
-    ".v1.PresenceChannelCreatedRequest\032\024.bgs."
-    "protocol.NoData\"\006\202\371+\002\010\002\022\223\001\n\022GetPlayerVar"
-    "iables\0229.bgs.protocol.game_utilities.v1."
-    "GetPlayerVariablesRequest\032:.bgs.protocol"
-    ".game_utilities.v1.GetPlayerVariablesRes"
-    "ponse\"\006\202\371+\002\010\003\022}\n\024ProcessServerRequest\022-."
-    "bgs.protocol.game_utilities.v1.ServerReq"
-    "uest\032..bgs.protocol.game_utilities.v1.Se"
-    "rverResponse\"\006\202\371+\002\010\006\022w\n\023OnGameAccountOnl"
-    "ine\022=.bgs.protocol.game_utilities.v1.Gam"
-    "eAccountOnlineNotification\032\031.bgs.protoco"
-    "l.NO_RESPONSE\"\006\202\371+\002\010\007\022y\n\024OnGameAccountOf"
-    "fline\022>.bgs.protocol.game_utilities.v1.G"
-    "ameAccountOfflineNotification\032\031.bgs.prot"
-    "ocol.NO_RESPONSE\"\006\202\371+\002\010\010\022\226\001\n\023GetAchievem"
-    "entsFile\022:.bgs.protocol.game_utilities.v"
-    "1.GetAchievementsFileRequest\032;.bgs.proto"
-    "col.game_utilities.v1.GetAchievementsFil"
-    "eResponse\"\006\202\371+\002\010\t\022\245\001\n\030GetAllValuesForAtt"
-    "ribute\022\?.bgs.protocol.game_utilities.v1."
-    "GetAllValuesForAttributeRequest\032@.bgs.pr"
-    "otocol.game_utilities.v1.GetAllValuesFor"
-    "AttributeResponse\"\006\202\371+\002\010\n\022\220\001\n\021RegisterUt"
-    "ilities\0228.bgs.protocol.game_utilities.v1"
-    ".RegisterUtilitiesRequest\0329.bgs.protocol"
-    ".game_utilities.v1.RegisterUtilitiesResp"
-    "onse\"\006\202\371+\002\010\013\022t\n\023UnregisterUtilities\022:.bg"
-    "s.protocol.game_utilities.v1.UnregisterU"
-    "tilitiesRequest\032\031.bgs.protocol.NO_RESPON"
-    "SE\"\006\202\371+\002\010\014\032H\202\371+<\n*bnet.protocol.game_uti"
-    "lities.GameUtilities*\016game_utilities\212\371+\004"
-    "\010\001\020\001BD\n\037bnet.protocol.game_utilities.v1B"
-    "\031GameUtilitiesServiceProtoH\001\200\001\000\210\001\001", 3474);
+    "col.EntityId\022)\n\004host\030\002 \001(\0132\027.bgs.protoco"
+    "l.ProcessIdB\002\030\001\022\022\n\nsession_id\030\003 \001(\t\"\220\001\n\036"
+    "GameAccountOfflineNotification\022/\n\017game_a"
+    "ccount_id\030\001 \002(\0132\026.bgs.protocol.EntityId\022"
+    ")\n\004host\030\002 \001(\0132\027.bgs.protocol.ProcessIdB\002"
+    "\030\001\022\022\n\nsession_id\030\003 \001(\t\"\212\001\n\037GetAllValuesF"
+    "orAttributeRequest\022$\n\rattribute_key\030\001 \001("
+    "\tB\r\212\371+\t\"\007\n\005\010\001\020\200\002\022(\n\010agent_id\030\002 \001(\0132\026.bgs"
+    ".protocol.EntityId\022\017\n\007program\030\005 \001(\007:\006\202\371+"
+    "\002\010\001\"R\n GetAllValuesForAttributeResponse\022"
+    ".\n\017attribute_value\030\001 \003(\0132\025.bgs.protocol."
+    "Variant\"a\n\030RegisterUtilitiesRequest\022*\n\ta"
+    "ttribute\030\001 \003(\0132\027.bgs.protocol.Attribute\022"
+    "\031\n\007program\030\002 \001(\007B\010\212\371+\004\022\002\020\000\".\n\031RegisterUt"
+    "ilitiesResponse\022\021\n\tclient_id\030\001 \001(\t\"\034\n\032Un"
+    "registerUtilitiesRequest2\376\010\n\024GameUtiliti"
+    "esService\022}\n\024ProcessClientRequest\022-.bgs."
+    "protocol.game_utilities.v1.ClientRequest"
+    "\032..bgs.protocol.game_utilities.v1.Client"
+    "Response\"\006\202\371+\002\010\001\022u\n\026PresenceChannelCreat"
+    "ed\022=.bgs.protocol.game_utilities.v1.Pres"
+    "enceChannelCreatedRequest\032\024.bgs.protocol"
+    ".NoData\"\006\202\371+\002\010\002\022}\n\024ProcessServerRequest\022"
+    "-.bgs.protocol.game_utilities.v1.ServerR"
+    "equest\032..bgs.protocol.game_utilities.v1."
+    "ServerResponse\"\006\202\371+\002\010\006\022w\n\023OnGameAccountO"
+    "nline\022=.bgs.protocol.game_utilities.v1.G"
+    "ameAccountOnlineNotification\032\031.bgs.proto"
+    "col.NO_RESPONSE\"\006\202\371+\002\010\007\022y\n\024OnGameAccount"
+    "Offline\022>.bgs.protocol.game_utilities.v1"
+    ".GameAccountOfflineNotification\032\031.bgs.pr"
+    "otocol.NO_RESPONSE\"\006\202\371+\002\010\010\022\245\001\n\030GetAllVal"
+    "uesForAttribute\022\?.bgs.protocol.game_util"
+    "ities.v1.GetAllValuesForAttributeRequest"
+    "\032@.bgs.protocol.game_utilities.v1.GetAll"
+    "ValuesForAttributeResponse\"\006\202\371+\002\010\n\022\222\001\n\021R"
+    "egisterUtilities\0228.bgs.protocol.game_uti"
+    "lities.v1.RegisterUtilitiesRequest\0329.bgs"
+    ".protocol.game_utilities.v1.RegisterUtil"
+    "itiesResponse\"\010\202\371+\004\010\013\020\003\022v\n\023UnregisterUti"
+    "lities\022:.bgs.protocol.game_utilities.v1."
+    "UnregisterUtilitiesRequest\032\031.bgs.protoco"
+    "l.NO_RESPONSE\"\010\202\371+\004\010\014\020\003\032H\202\371+<\n*bnet.prot"
+    "ocol.game_utilities.GameUtilities*\016game_"
+    "utilities\212\371+\004\010\001\020\001BD\n\037bnet.protocol.game_"
+    "utilities.v1B\031GameUtilitiesServiceProtoH"
+    "\001\200\001\000\210\001\001", 2807);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "game_utilities_service.proto", &protobuf_RegisterTypes);
   ClientRequest::default_instance_ = new ClientRequest();
@@ -533,12 +427,8 @@ void protobuf_AddDesc_game_5futilities_5fservice_2eproto() {
   ServerRequest::default_instance_ = new ServerRequest();
   ServerResponse::default_instance_ = new ServerResponse();
   PresenceChannelCreatedRequest::default_instance_ = new PresenceChannelCreatedRequest();
-  GetPlayerVariablesRequest::default_instance_ = new GetPlayerVariablesRequest();
-  GetPlayerVariablesResponse::default_instance_ = new GetPlayerVariablesResponse();
   GameAccountOnlineNotification::default_instance_ = new GameAccountOnlineNotification();
   GameAccountOfflineNotification::default_instance_ = new GameAccountOfflineNotification();
-  GetAchievementsFileRequest::default_instance_ = new GetAchievementsFileRequest();
-  GetAchievementsFileResponse::default_instance_ = new GetAchievementsFileResponse();
   GetAllValuesForAttributeRequest::default_instance_ = new GetAllValuesForAttributeRequest();
   GetAllValuesForAttributeResponse::default_instance_ = new GetAllValuesForAttributeResponse();
   RegisterUtilitiesRequest::default_instance_ = new RegisterUtilitiesRequest();
@@ -549,12 +439,8 @@ void protobuf_AddDesc_game_5futilities_5fservice_2eproto() {
   ServerRequest::default_instance_->InitAsDefaultInstance();
   ServerResponse::default_instance_->InitAsDefaultInstance();
   PresenceChannelCreatedRequest::default_instance_->InitAsDefaultInstance();
-  GetPlayerVariablesRequest::default_instance_->InitAsDefaultInstance();
-  GetPlayerVariablesResponse::default_instance_->InitAsDefaultInstance();
   GameAccountOnlineNotification::default_instance_->InitAsDefaultInstance();
   GameAccountOfflineNotification::default_instance_->InitAsDefaultInstance();
-  GetAchievementsFileRequest::default_instance_->InitAsDefaultInstance();
-  GetAchievementsFileResponse::default_instance_->InitAsDefaultInstance();
   GetAllValuesForAttributeRequest::default_instance_->InitAsDefaultInstance();
   GetAllValuesForAttributeResponse::default_instance_->InitAsDefaultInstance();
   RegisterUtilitiesRequest::default_instance_->InitAsDefaultInstance();
@@ -691,7 +577,7 @@ bool ClientRequest::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .bgs.protocol.ProcessId host = 2;
+      // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
       case 2: {
         if (tag == 18) {
          parse_host:
@@ -789,7 +675,7 @@ void ClientRequest::SerializeWithCachedSizes(
       1, this->attribute(i), output);
   }
 
-  // optional .bgs.protocol.ProcessId host = 2;
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
   if (has_host()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->host(), output);
@@ -835,7 +721,7 @@ void ClientRequest::SerializeWithCachedSizes(
         1, this->attribute(i), target);
   }
 
-  // optional .bgs.protocol.ProcessId host = 2;
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
   if (has_host()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -880,7 +766,7 @@ int ClientRequest::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
-    // optional .bgs.protocol.ProcessId host = 2;
+    // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
     if (has_host()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -1353,7 +1239,7 @@ bool ServerRequest::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .bgs.protocol.ProcessId host = 3;
+      // optional .bgs.protocol.ProcessId host = 3 [deprecated = true];
       case 3: {
         if (tag == 26) {
          parse_host:
@@ -1402,7 +1288,7 @@ void ServerRequest::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteFixed32(2, this->program(), output);
   }
 
-  // optional .bgs.protocol.ProcessId host = 3;
+  // optional .bgs.protocol.ProcessId host = 3 [deprecated = true];
   if (has_host()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->host(), output);
@@ -1430,7 +1316,7 @@ void ServerRequest::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(2, this->program(), target);
   }
 
-  // optional .bgs.protocol.ProcessId host = 3;
+  // optional .bgs.protocol.ProcessId host = 3 [deprecated = true];
   if (has_host()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -1454,7 +1340,7 @@ int ServerRequest::ByteSize() const {
       total_size += 1 + 4;
     }
 
-    // optional .bgs.protocol.ProcessId host = 3;
+    // optional .bgs.protocol.ProcessId host = 3 [deprecated = true];
     if (has_host()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -1909,7 +1795,7 @@ bool PresenceChannelCreatedRequest::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .bgs.protocol.ProcessId host = 5;
+      // optional .bgs.protocol.ProcessId host = 5 [deprecated = true];
       case 5: {
         if (tag == 42) {
          parse_host:
@@ -1965,7 +1851,7 @@ void PresenceChannelCreatedRequest::SerializeWithCachedSizes(
       4, this->account_id(), output);
   }
 
-  // optional .bgs.protocol.ProcessId host = 5;
+  // optional .bgs.protocol.ProcessId host = 5 [deprecated = true];
   if (has_host()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       5, this->host(), output);
@@ -2002,7 +1888,7 @@ void PresenceChannelCreatedRequest::SerializeWithCachedSizes(
         4, this->account_id(), target);
   }
 
-  // optional .bgs.protocol.ProcessId host = 5;
+  // optional .bgs.protocol.ProcessId host = 5 [deprecated = true];
   if (has_host()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -2042,7 +1928,7 @@ int PresenceChannelCreatedRequest::ByteSize() const {
           this->account_id());
     }
 
-    // optional .bgs.protocol.ProcessId host = 5;
+    // optional .bgs.protocol.ProcessId host = 5 [deprecated = true];
     if (has_host()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -2146,497 +2032,6 @@ void PresenceChannelCreatedRequest::Swap(PresenceChannelCreatedRequest* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int GetPlayerVariablesRequest::kPlayerVariablesFieldNumber;
-const int GetPlayerVariablesRequest::kHostFieldNumber;
-#endif  // !_MSC_VER
-
-GetPlayerVariablesRequest::GetPlayerVariablesRequest()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-}
-
-void GetPlayerVariablesRequest::InitAsDefaultInstance() {
-  host_ = const_cast< ::bgs::protocol::ProcessId*>(&::bgs::protocol::ProcessId::default_instance());
-}
-
-GetPlayerVariablesRequest::GetPlayerVariablesRequest(const GetPlayerVariablesRequest& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-}
-
-void GetPlayerVariablesRequest::SharedCtor() {
-  _cached_size_ = 0;
-  host_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-GetPlayerVariablesRequest::~GetPlayerVariablesRequest() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-  SharedDtor();
-}
-
-void GetPlayerVariablesRequest::SharedDtor() {
-  if (this != default_instance_) {
-    delete host_;
-  }
-}
-
-void GetPlayerVariablesRequest::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* GetPlayerVariablesRequest::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return GetPlayerVariablesRequest_descriptor_;
-}
-
-const GetPlayerVariablesRequest& GetPlayerVariablesRequest::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  return *default_instance_;
-}
-
-GetPlayerVariablesRequest* GetPlayerVariablesRequest::default_instance_ = NULL;
-
-GetPlayerVariablesRequest* GetPlayerVariablesRequest::New() const {
-  return new GetPlayerVariablesRequest;
-}
-
-void GetPlayerVariablesRequest::Clear() {
-  if (has_host()) {
-    if (host_ != NULL) host_->::bgs::protocol::ProcessId::Clear();
-  }
-  player_variables_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool GetPlayerVariablesRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-      case 1: {
-        if (tag == 10) {
-         parse_player_variables:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_player_variables()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(10)) goto parse_player_variables;
-        if (input->ExpectTag(18)) goto parse_host;
-        break;
-      }
-
-      // optional .bgs.protocol.ProcessId host = 2;
-      case 2: {
-        if (tag == 18) {
-         parse_host:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_host()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-  return false;
-#undef DO_
-}
-
-void GetPlayerVariablesRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  for (int i = 0; i < this->player_variables_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->player_variables(i), output);
-  }
-
-  // optional .bgs.protocol.ProcessId host = 2;
-  if (has_host()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->host(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-}
-
-::google::protobuf::uint8* GetPlayerVariablesRequest::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  for (int i = 0; i < this->player_variables_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->player_variables(i), target);
-  }
-
-  // optional .bgs.protocol.ProcessId host = 2;
-  if (has_host()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->host(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
-  return target;
-}
-
-int GetPlayerVariablesRequest::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
-    // optional .bgs.protocol.ProcessId host = 2;
-    if (has_host()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->host());
-    }
-
-  }
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  total_size += 1 * this->player_variables_size();
-  for (int i = 0; i < this->player_variables_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->player_variables(i));
-  }
-
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void GetPlayerVariablesRequest::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const GetPlayerVariablesRequest* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const GetPlayerVariablesRequest*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void GetPlayerVariablesRequest::MergeFrom(const GetPlayerVariablesRequest& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  player_variables_.MergeFrom(from.player_variables_);
-  if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) {
-    if (from.has_host()) {
-      mutable_host()->::bgs::protocol::ProcessId::MergeFrom(from.host());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void GetPlayerVariablesRequest::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void GetPlayerVariablesRequest::CopyFrom(const GetPlayerVariablesRequest& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GetPlayerVariablesRequest::IsInitialized() const {
-
-  if (!::google::protobuf::internal::AllAreInitialized(this->player_variables())) return false;
-  if (has_host()) {
-    if (!this->host().IsInitialized()) return false;
-  }
-  return true;
-}
-
-void GetPlayerVariablesRequest::Swap(GetPlayerVariablesRequest* other) {
-  if (other != this) {
-    player_variables_.Swap(&other->player_variables_);
-    std::swap(host_, other->host_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata GetPlayerVariablesRequest::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = GetPlayerVariablesRequest_descriptor_;
-  metadata.reflection = GetPlayerVariablesRequest_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int GetPlayerVariablesResponse::kPlayerVariablesFieldNumber;
-#endif  // !_MSC_VER
-
-GetPlayerVariablesResponse::GetPlayerVariablesResponse()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-}
-
-void GetPlayerVariablesResponse::InitAsDefaultInstance() {
-}
-
-GetPlayerVariablesResponse::GetPlayerVariablesResponse(const GetPlayerVariablesResponse& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-}
-
-void GetPlayerVariablesResponse::SharedCtor() {
-  _cached_size_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-GetPlayerVariablesResponse::~GetPlayerVariablesResponse() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-  SharedDtor();
-}
-
-void GetPlayerVariablesResponse::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void GetPlayerVariablesResponse::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* GetPlayerVariablesResponse::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return GetPlayerVariablesResponse_descriptor_;
-}
-
-const GetPlayerVariablesResponse& GetPlayerVariablesResponse::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  return *default_instance_;
-}
-
-GetPlayerVariablesResponse* GetPlayerVariablesResponse::default_instance_ = NULL;
-
-GetPlayerVariablesResponse* GetPlayerVariablesResponse::New() const {
-  return new GetPlayerVariablesResponse;
-}
-
-void GetPlayerVariablesResponse::Clear() {
-  player_variables_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool GetPlayerVariablesResponse::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-      case 1: {
-        if (tag == 10) {
-         parse_player_variables:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_player_variables()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(10)) goto parse_player_variables;
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-  return false;
-#undef DO_
-}
-
-void GetPlayerVariablesResponse::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  for (int i = 0; i < this->player_variables_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->player_variables(i), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-}
-
-::google::protobuf::uint8* GetPlayerVariablesResponse::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  for (int i = 0; i < this->player_variables_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->player_variables(i), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
-  return target;
-}
-
-int GetPlayerVariablesResponse::ByteSize() const {
-  int total_size = 0;
-
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  total_size += 1 * this->player_variables_size();
-  for (int i = 0; i < this->player_variables_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->player_variables(i));
-  }
-
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void GetPlayerVariablesResponse::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const GetPlayerVariablesResponse* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const GetPlayerVariablesResponse*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void GetPlayerVariablesResponse::MergeFrom(const GetPlayerVariablesResponse& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  player_variables_.MergeFrom(from.player_variables_);
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void GetPlayerVariablesResponse::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void GetPlayerVariablesResponse::CopyFrom(const GetPlayerVariablesResponse& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GetPlayerVariablesResponse::IsInitialized() const {
-
-  if (!::google::protobuf::internal::AllAreInitialized(this->player_variables())) return false;
-  return true;
-}
-
-void GetPlayerVariablesResponse::Swap(GetPlayerVariablesResponse* other) {
-  if (other != this) {
-    player_variables_.Swap(&other->player_variables_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata GetPlayerVariablesResponse::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = GetPlayerVariablesResponse_descriptor_;
-  metadata.reflection = GetPlayerVariablesResponse_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
 const int GameAccountOnlineNotification::kGameAccountIdFieldNumber;
 const int GameAccountOnlineNotification::kHostFieldNumber;
 const int GameAccountOnlineNotification::kSessionIdFieldNumber;
@@ -2745,7 +2140,7 @@ bool GameAccountOnlineNotification::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .bgs.protocol.ProcessId host = 2;
+      // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
       case 2: {
         if (tag == 18) {
          parse_host:
@@ -2806,7 +2201,7 @@ void GameAccountOnlineNotification::SerializeWithCachedSizes(
       1, this->game_account_id(), output);
   }
 
-  // optional .bgs.protocol.ProcessId host = 2;
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
   if (has_host()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->host(), output);
@@ -2839,7 +2234,7 @@ void GameAccountOnlineNotification::SerializeWithCachedSizes(
         1, this->game_account_id(), target);
   }
 
-  // optional .bgs.protocol.ProcessId host = 2;
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
   if (has_host()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -2876,7 +2271,7 @@ int GameAccountOnlineNotification::ByteSize() const {
           this->game_account_id());
     }
 
-    // optional .bgs.protocol.ProcessId host = 2;
+    // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
     if (has_host()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -3085,7 +2480,7 @@ bool GameAccountOfflineNotification::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .bgs.protocol.ProcessId host = 2;
+      // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
       case 2: {
         if (tag == 18) {
          parse_host:
@@ -3146,7 +2541,7 @@ void GameAccountOfflineNotification::SerializeWithCachedSizes(
       1, this->game_account_id(), output);
   }
 
-  // optional .bgs.protocol.ProcessId host = 2;
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
   if (has_host()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->host(), output);
@@ -3179,7 +2574,7 @@ void GameAccountOfflineNotification::SerializeWithCachedSizes(
         1, this->game_account_id(), target);
   }
 
-  // optional .bgs.protocol.ProcessId host = 2;
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
   if (has_host()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -3216,7 +2611,7 @@ int GameAccountOfflineNotification::ByteSize() const {
           this->game_account_id());
     }
 
-    // optional .bgs.protocol.ProcessId host = 2;
+    // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
     if (has_host()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -3317,466 +2712,6 @@ void GameAccountOfflineNotification::Swap(GameAccountOfflineNotification* other)
 // ===================================================================
 
 #ifndef _MSC_VER
-const int GetAchievementsFileRequest::kHostFieldNumber;
-#endif  // !_MSC_VER
-
-GetAchievementsFileRequest::GetAchievementsFileRequest()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-}
-
-void GetAchievementsFileRequest::InitAsDefaultInstance() {
-  host_ = const_cast< ::bgs::protocol::ProcessId*>(&::bgs::protocol::ProcessId::default_instance());
-}
-
-GetAchievementsFileRequest::GetAchievementsFileRequest(const GetAchievementsFileRequest& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-}
-
-void GetAchievementsFileRequest::SharedCtor() {
-  _cached_size_ = 0;
-  host_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-GetAchievementsFileRequest::~GetAchievementsFileRequest() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-  SharedDtor();
-}
-
-void GetAchievementsFileRequest::SharedDtor() {
-  if (this != default_instance_) {
-    delete host_;
-  }
-}
-
-void GetAchievementsFileRequest::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* GetAchievementsFileRequest::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return GetAchievementsFileRequest_descriptor_;
-}
-
-const GetAchievementsFileRequest& GetAchievementsFileRequest::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  return *default_instance_;
-}
-
-GetAchievementsFileRequest* GetAchievementsFileRequest::default_instance_ = NULL;
-
-GetAchievementsFileRequest* GetAchievementsFileRequest::New() const {
-  return new GetAchievementsFileRequest;
-}
-
-void GetAchievementsFileRequest::Clear() {
-  if (has_host()) {
-    if (host_ != NULL) host_->::bgs::protocol::ProcessId::Clear();
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool GetAchievementsFileRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .bgs.protocol.ProcessId host = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_host()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-  return false;
-#undef DO_
-}
-
-void GetAchievementsFileRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-  // optional .bgs.protocol.ProcessId host = 1;
-  if (has_host()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->host(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-}
-
-::google::protobuf::uint8* GetAchievementsFileRequest::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-  // optional .bgs.protocol.ProcessId host = 1;
-  if (has_host()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->host(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
-  return target;
-}
-
-int GetAchievementsFileRequest::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .bgs.protocol.ProcessId host = 1;
-    if (has_host()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->host());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void GetAchievementsFileRequest::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const GetAchievementsFileRequest* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const GetAchievementsFileRequest*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void GetAchievementsFileRequest::MergeFrom(const GetAchievementsFileRequest& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_host()) {
-      mutable_host()->::bgs::protocol::ProcessId::MergeFrom(from.host());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void GetAchievementsFileRequest::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void GetAchievementsFileRequest::CopyFrom(const GetAchievementsFileRequest& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GetAchievementsFileRequest::IsInitialized() const {
-
-  if (has_host()) {
-    if (!this->host().IsInitialized()) return false;
-  }
-  return true;
-}
-
-void GetAchievementsFileRequest::Swap(GetAchievementsFileRequest* other) {
-  if (other != this) {
-    std::swap(host_, other->host_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata GetAchievementsFileRequest::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = GetAchievementsFileRequest_descriptor_;
-  metadata.reflection = GetAchievementsFileRequest_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int GetAchievementsFileResponse::kContentHandleFieldNumber;
-#endif  // !_MSC_VER
-
-GetAchievementsFileResponse::GetAchievementsFileResponse()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-}
-
-void GetAchievementsFileResponse::InitAsDefaultInstance() {
-  content_handle_ = const_cast< ::bgs::protocol::ContentHandle*>(&::bgs::protocol::ContentHandle::default_instance());
-}
-
-GetAchievementsFileResponse::GetAchievementsFileResponse(const GetAchievementsFileResponse& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-}
-
-void GetAchievementsFileResponse::SharedCtor() {
-  _cached_size_ = 0;
-  content_handle_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-GetAchievementsFileResponse::~GetAchievementsFileResponse() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-  SharedDtor();
-}
-
-void GetAchievementsFileResponse::SharedDtor() {
-  if (this != default_instance_) {
-    delete content_handle_;
-  }
-}
-
-void GetAchievementsFileResponse::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* GetAchievementsFileResponse::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return GetAchievementsFileResponse_descriptor_;
-}
-
-const GetAchievementsFileResponse& GetAchievementsFileResponse::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  return *default_instance_;
-}
-
-GetAchievementsFileResponse* GetAchievementsFileResponse::default_instance_ = NULL;
-
-GetAchievementsFileResponse* GetAchievementsFileResponse::New() const {
-  return new GetAchievementsFileResponse;
-}
-
-void GetAchievementsFileResponse::Clear() {
-  if (has_content_handle()) {
-    if (content_handle_ != NULL) content_handle_->::bgs::protocol::ContentHandle::Clear();
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool GetAchievementsFileResponse::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .bgs.protocol.ContentHandle content_handle = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_content_handle()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-  return false;
-#undef DO_
-}
-
-void GetAchievementsFileResponse::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-  // optional .bgs.protocol.ContentHandle content_handle = 1;
-  if (has_content_handle()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->content_handle(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-}
-
-::google::protobuf::uint8* GetAchievementsFileResponse::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-  // optional .bgs.protocol.ContentHandle content_handle = 1;
-  if (has_content_handle()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->content_handle(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
-  return target;
-}
-
-int GetAchievementsFileResponse::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .bgs.protocol.ContentHandle content_handle = 1;
-    if (has_content_handle()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->content_handle());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void GetAchievementsFileResponse::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const GetAchievementsFileResponse* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const GetAchievementsFileResponse*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void GetAchievementsFileResponse::MergeFrom(const GetAchievementsFileResponse& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_content_handle()) {
-      mutable_content_handle()->::bgs::protocol::ContentHandle::MergeFrom(from.content_handle());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void GetAchievementsFileResponse::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void GetAchievementsFileResponse::CopyFrom(const GetAchievementsFileResponse& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GetAchievementsFileResponse::IsInitialized() const {
-
-  if (has_content_handle()) {
-    if (!this->content_handle().IsInitialized()) return false;
-  }
-  return true;
-}
-
-void GetAchievementsFileResponse::Swap(GetAchievementsFileResponse* other) {
-  if (other != this) {
-    std::swap(content_handle_, other->content_handle_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata GetAchievementsFileResponse::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = GetAchievementsFileResponse_descriptor_;
-  metadata.reflection = GetAchievementsFileResponse_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
 const int GetAllValuesForAttributeRequest::kAttributeKeyFieldNumber;
 const int GetAllValuesForAttributeRequest::kAgentIdFieldNumber;
 const int GetAllValuesForAttributeRequest::kProgramFieldNumber;
@@ -5036,17 +3971,6 @@ void GameUtilitiesService::PresenceChannelCreated(::bgs::protocol::game_utilitie
   SendRequest(service_hash_, 2 | (client ? 0x40000000 : 0) | (server ? 0x80000000 : 0), request, std::move(callback));
 }
 
-void GameUtilitiesService::GetPlayerVariables(::bgs::protocol::game_utilities::v1::GetPlayerVariablesRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse const*)> responseCallback, bool client /*= false*/, bool server /*= false*/) {
-  TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.GetPlayerVariables(bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest{ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
-  std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
-    ::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse response;
-    if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize()))
-      responseCallback(&response);
-  };
-  SendRequest(service_hash_, 3 | (client ? 0x40000000 : 0) | (server ? 0x80000000 : 0), request, std::move(callback));
-}
-
 void GameUtilitiesService::ProcessServerRequest(::bgs::protocol::game_utilities::v1::ServerRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ServerResponse const*)> responseCallback, bool client /*= false*/, bool server /*= false*/) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.ProcessServerRequest(bgs.protocol.game_utilities.v1.ServerRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
@@ -5070,17 +3994,6 @@ void GameUtilitiesService::OnGameAccountOffline(::bgs::protocol::game_utilities:
   SendRequest(service_hash_, 8 | (client ? 0x40000000 : 0) | (server ? 0x80000000 : 0), request);
 }
 
-void GameUtilitiesService::GetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse const*)> responseCallback, bool client /*= false*/, bool server /*= false*/) {
-  TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.GetAchievementsFile(bgs.protocol.game_utilities.v1.GetAchievementsFileRequest{ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
-  std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
-    ::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse response;
-    if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize()))
-      responseCallback(&response);
-  };
-  SendRequest(service_hash_, 9 | (client ? 0x40000000 : 0) | (server ? 0x80000000 : 0), request, std::move(callback));
-}
-
 void GameUtilitiesService::GetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse const*)> responseCallback, bool client /*= false*/, bool server /*= false*/) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.GetAllValuesForAttribute(bgs.protocol.game_utilities.v1.GetAllValuesForAttributeRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
@@ -5163,32 +4076,6 @@ void GameUtilitiesService::CallServerMethod(uint32 token, uint32 methodId, Messa
         continuation(this, status, &response);
       break;
     }
-    case 3: {
-      ::bgs::protocol::game_utilities::v1::GetPlayerVariablesRequest request;
-      if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
-        TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for GameUtilitiesService.GetPlayerVariables server method call.", GetCallerInfo().c_str());
-        SendResponse(service_hash_, methodId, token, ERROR_RPC_MALFORMED_REQUEST);
-        return;
-      }
-      TC_LOG_DEBUG("service.protobuf", "%s Client called server method GameUtilitiesService.GetPlayerVariables(bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest{ %s }).",
-        GetCallerInfo().c_str(), request.ShortDebugString().c_str());
-      std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token, methodId](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response)
-      {
-        ASSERT(response->GetDescriptor() == ::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse::descriptor());
-        GameUtilitiesService* self = static_cast<GameUtilitiesService*>(service);
-        TC_LOG_DEBUG("service.protobuf", "%s Client called server method GameUtilitiesService.GetPlayerVariables() returned bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse{ %s } status %u.",
-          self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status);
-        if (!status)
-          self->SendResponse(self->service_hash_, methodId, token, response);
-        else
-          self->SendResponse(self->service_hash_, methodId, token, status);
-      };
-      ::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse response;
-      uint32 status = HandleGetPlayerVariables(&request, &response, continuation);
-      if (continuation)
-        continuation(this, status, &response);
-      break;
-    }
     case 6: {
       ::bgs::protocol::game_utilities::v1::ServerRequest request;
       if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
@@ -5243,32 +4130,6 @@ void GameUtilitiesService::CallServerMethod(uint32 token, uint32 methodId, Messa
         SendResponse(service_hash_, methodId, token, status);
       break;
     }
-    case 9: {
-      ::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest request;
-      if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
-        TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for GameUtilitiesService.GetAchievementsFile server method call.", GetCallerInfo().c_str());
-        SendResponse(service_hash_, methodId, token, ERROR_RPC_MALFORMED_REQUEST);
-        return;
-      }
-      TC_LOG_DEBUG("service.protobuf", "%s Client called server method GameUtilitiesService.GetAchievementsFile(bgs.protocol.game_utilities.v1.GetAchievementsFileRequest{ %s }).",
-        GetCallerInfo().c_str(), request.ShortDebugString().c_str());
-      std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token, methodId](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response)
-      {
-        ASSERT(response->GetDescriptor() == ::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse::descriptor());
-        GameUtilitiesService* self = static_cast<GameUtilitiesService*>(service);
-        TC_LOG_DEBUG("service.protobuf", "%s Client called server method GameUtilitiesService.GetAchievementsFile() returned bgs.protocol.game_utilities.v1.GetAchievementsFileResponse{ %s } status %u.",
-          self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status);
-        if (!status)
-          self->SendResponse(self->service_hash_, methodId, token, response);
-        else
-          self->SendResponse(self->service_hash_, methodId, token, status);
-      };
-      ::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse response;
-      uint32 status = HandleGetAchievementsFile(&request, &response, continuation);
-      if (continuation)
-        continuation(this, status, &response);
-      break;
-    }
     case 10: {
       ::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest request;
       if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
@@ -5354,12 +4215,6 @@ uint32 GameUtilitiesService::HandlePresenceChannelCreated(::bgs::protocol::game_
   return ERROR_RPC_NOT_IMPLEMENTED;
 }
 
-uint32 GameUtilitiesService::HandleGetPlayerVariables(::bgs::protocol::game_utilities::v1::GetPlayerVariablesRequest const* request, ::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
-  TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method GameUtilitiesService.GetPlayerVariables({ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
-  return ERROR_RPC_NOT_IMPLEMENTED;
-}
-
 uint32 GameUtilitiesService::HandleProcessServerRequest(::bgs::protocol::game_utilities::v1::ServerRequest const* request, ::bgs::protocol::game_utilities::v1::ServerResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
   TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method GameUtilitiesService.ProcessServerRequest({ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
@@ -5378,12 +4233,6 @@ uint32 GameUtilitiesService::HandleOnGameAccountOffline(::bgs::protocol::game_ut
   return ERROR_RPC_NOT_IMPLEMENTED;
 }
 
-uint32 GameUtilitiesService::HandleGetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, ::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
-  TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method GameUtilitiesService.GetAchievementsFile({ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
-  return ERROR_RPC_NOT_IMPLEMENTED;
-}
-
 uint32 GameUtilitiesService::HandleGetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, ::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
   TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method GameUtilitiesService.GetAllValuesForAttribute({ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
diff --git a/src/server/proto/Client/game_utilities_service.pb.h b/src/server/proto/Client/game_utilities_service.pb.h
index 1b7b375f5d5..14e4e0ddd71 100644
--- a/src/server/proto/Client/game_utilities_service.pb.h
+++ b/src/server/proto/Client/game_utilities_service.pb.h
@@ -25,7 +25,6 @@
 #include <google/protobuf/extension_set.h>
 #include <google/protobuf/unknown_field_set.h>
 #include "attribute_types.pb.h"
-#include "content_handle_types.pb.h"
 #include "entity_types.pb.h"
 #include "game_utilities_types.pb.h"
 #include "rpc_types.pb.h"
@@ -50,12 +49,8 @@ class ClientResponse;
 class ServerRequest;
 class ServerResponse;
 class PresenceChannelCreatedRequest;
-class GetPlayerVariablesRequest;
-class GetPlayerVariablesResponse;
 class GameAccountOnlineNotification;
 class GameAccountOfflineNotification;
-class GetAchievementsFileRequest;
-class GetAchievementsFileResponse;
 class GetAllValuesForAttributeRequest;
 class GetAllValuesForAttributeResponse;
 class RegisterUtilitiesRequest;
@@ -129,14 +124,14 @@ class TC_PROTO_API ClientRequest : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute >*
       mutable_attribute();
 
-  // optional .bgs.protocol.ProcessId host = 2;
-  inline bool has_host() const;
-  inline void clear_host();
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
+  inline bool has_host() const PROTOBUF_DEPRECATED;
+  inline void clear_host() PROTOBUF_DEPRECATED;
   static const int kHostFieldNumber = 2;
-  inline const ::bgs::protocol::ProcessId& host() const;
-  inline ::bgs::protocol::ProcessId* mutable_host();
-  inline ::bgs::protocol::ProcessId* release_host();
-  inline void set_allocated_host(::bgs::protocol::ProcessId* host);
+  inline const ::bgs::protocol::ProcessId& host() const PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* mutable_host() PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* release_host() PROTOBUF_DEPRECATED;
+  inline void set_allocated_host(::bgs::protocol::ProcessId* host) PROTOBUF_DEPRECATED;
 
   // optional .bgs.protocol.EntityId account_id = 3;
   inline bool has_account_id() const;
@@ -358,14 +353,14 @@ class TC_PROTO_API ServerRequest : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 program() const;
   inline void set_program(::google::protobuf::uint32 value);
 
-  // optional .bgs.protocol.ProcessId host = 3;
-  inline bool has_host() const;
-  inline void clear_host();
+  // optional .bgs.protocol.ProcessId host = 3 [deprecated = true];
+  inline bool has_host() const PROTOBUF_DEPRECATED;
+  inline void clear_host() PROTOBUF_DEPRECATED;
   static const int kHostFieldNumber = 3;
-  inline const ::bgs::protocol::ProcessId& host() const;
-  inline ::bgs::protocol::ProcessId* mutable_host();
-  inline ::bgs::protocol::ProcessId* release_host();
-  inline void set_allocated_host(::bgs::protocol::ProcessId* host);
+  inline const ::bgs::protocol::ProcessId& host() const PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* mutable_host() PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* release_host() PROTOBUF_DEPRECATED;
+  inline void set_allocated_host(::bgs::protocol::ProcessId* host) PROTOBUF_DEPRECATED;
 
   // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.ServerRequest)
  private:
@@ -552,14 +547,14 @@ class TC_PROTO_API PresenceChannelCreatedRequest : public ::google::protobuf::Me
   inline ::bgs::protocol::EntityId* release_account_id();
   inline void set_allocated_account_id(::bgs::protocol::EntityId* account_id);
 
-  // optional .bgs.protocol.ProcessId host = 5;
-  inline bool has_host() const;
-  inline void clear_host();
+  // optional .bgs.protocol.ProcessId host = 5 [deprecated = true];
+  inline bool has_host() const PROTOBUF_DEPRECATED;
+  inline void clear_host() PROTOBUF_DEPRECATED;
   static const int kHostFieldNumber = 5;
-  inline const ::bgs::protocol::ProcessId& host() const;
-  inline ::bgs::protocol::ProcessId* mutable_host();
-  inline ::bgs::protocol::ProcessId* release_host();
-  inline void set_allocated_host(::bgs::protocol::ProcessId* host);
+  inline const ::bgs::protocol::ProcessId& host() const PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* mutable_host() PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* release_host() PROTOBUF_DEPRECATED;
+  inline void set_allocated_host(::bgs::protocol::ProcessId* host) PROTOBUF_DEPRECATED;
 
   // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.PresenceChannelCreatedRequest)
  private:
@@ -589,182 +584,6 @@ class TC_PROTO_API PresenceChannelCreatedRequest : public ::google::protobuf::Me
 };
 // -------------------------------------------------------------------
 
-class TC_PROTO_API GetPlayerVariablesRequest : public ::google::protobuf::Message {
- public:
-  GetPlayerVariablesRequest();
-  virtual ~GetPlayerVariablesRequest();
-
-  GetPlayerVariablesRequest(const GetPlayerVariablesRequest& from);
-
-  inline GetPlayerVariablesRequest& operator=(const GetPlayerVariablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const GetPlayerVariablesRequest& default_instance();
-
-  void Swap(GetPlayerVariablesRequest* other);
-
-  // implements Message ----------------------------------------------
-
-  GetPlayerVariablesRequest* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const GetPlayerVariablesRequest& from);
-  void MergeFrom(const GetPlayerVariablesRequest& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  inline int player_variables_size() const;
-  inline void clear_player_variables();
-  static const int kPlayerVariablesFieldNumber = 1;
-  inline const ::bgs::protocol::game_utilities::v1::PlayerVariables& player_variables(int index) const;
-  inline ::bgs::protocol::game_utilities::v1::PlayerVariables* mutable_player_variables(int index);
-  inline ::bgs::protocol::game_utilities::v1::PlayerVariables* add_player_variables();
-  inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >&
-      player_variables() const;
-  inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >*
-      mutable_player_variables();
-
-  // optional .bgs.protocol.ProcessId host = 2;
-  inline bool has_host() const;
-  inline void clear_host();
-  static const int kHostFieldNumber = 2;
-  inline const ::bgs::protocol::ProcessId& host() const;
-  inline ::bgs::protocol::ProcessId* mutable_host();
-  inline ::bgs::protocol::ProcessId* release_host();
-  inline void set_allocated_host(::bgs::protocol::ProcessId* host);
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest)
- private:
-  inline void set_has_host();
-  inline void clear_has_host();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables > player_variables_;
-  ::bgs::protocol::ProcessId* host_;
-  friend void TC_PROTO_API protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_AssignDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto();
-
-  void InitAsDefaultInstance();
-  static GetPlayerVariablesRequest* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class TC_PROTO_API GetPlayerVariablesResponse : public ::google::protobuf::Message {
- public:
-  GetPlayerVariablesResponse();
-  virtual ~GetPlayerVariablesResponse();
-
-  GetPlayerVariablesResponse(const GetPlayerVariablesResponse& from);
-
-  inline GetPlayerVariablesResponse& operator=(const GetPlayerVariablesResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const GetPlayerVariablesResponse& default_instance();
-
-  void Swap(GetPlayerVariablesResponse* other);
-
-  // implements Message ----------------------------------------------
-
-  GetPlayerVariablesResponse* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const GetPlayerVariablesResponse& from);
-  void MergeFrom(const GetPlayerVariablesResponse& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-  inline int player_variables_size() const;
-  inline void clear_player_variables();
-  static const int kPlayerVariablesFieldNumber = 1;
-  inline const ::bgs::protocol::game_utilities::v1::PlayerVariables& player_variables(int index) const;
-  inline ::bgs::protocol::game_utilities::v1::PlayerVariables* mutable_player_variables(int index);
-  inline ::bgs::protocol::game_utilities::v1::PlayerVariables* add_player_variables();
-  inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >&
-      player_variables() const;
-  inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >*
-      mutable_player_variables();
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse)
- private:
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables > player_variables_;
-  friend void TC_PROTO_API protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_AssignDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto();
-
-  void InitAsDefaultInstance();
-  static GetPlayerVariablesResponse* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class TC_PROTO_API GameAccountOnlineNotification : public ::google::protobuf::Message {
  public:
   GameAccountOnlineNotification();
@@ -827,14 +646,14 @@ class TC_PROTO_API GameAccountOnlineNotification : public ::google::protobuf::Me
   inline ::bgs::protocol::EntityId* release_game_account_id();
   inline void set_allocated_game_account_id(::bgs::protocol::EntityId* game_account_id);
 
-  // optional .bgs.protocol.ProcessId host = 2;
-  inline bool has_host() const;
-  inline void clear_host();
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
+  inline bool has_host() const PROTOBUF_DEPRECATED;
+  inline void clear_host() PROTOBUF_DEPRECATED;
   static const int kHostFieldNumber = 2;
-  inline const ::bgs::protocol::ProcessId& host() const;
-  inline ::bgs::protocol::ProcessId* mutable_host();
-  inline ::bgs::protocol::ProcessId* release_host();
-  inline void set_allocated_host(::bgs::protocol::ProcessId* host);
+  inline const ::bgs::protocol::ProcessId& host() const PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* mutable_host() PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* release_host() PROTOBUF_DEPRECATED;
+  inline void set_allocated_host(::bgs::protocol::ProcessId* host) PROTOBUF_DEPRECATED;
 
   // optional string session_id = 3;
   inline bool has_session_id() const;
@@ -935,14 +754,14 @@ class TC_PROTO_API GameAccountOfflineNotification : public ::google::protobuf::M
   inline ::bgs::protocol::EntityId* release_game_account_id();
   inline void set_allocated_game_account_id(::bgs::protocol::EntityId* game_account_id);
 
-  // optional .bgs.protocol.ProcessId host = 2;
-  inline bool has_host() const;
-  inline void clear_host();
+  // optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
+  inline bool has_host() const PROTOBUF_DEPRECATED;
+  inline void clear_host() PROTOBUF_DEPRECATED;
   static const int kHostFieldNumber = 2;
-  inline const ::bgs::protocol::ProcessId& host() const;
-  inline ::bgs::protocol::ProcessId* mutable_host();
-  inline ::bgs::protocol::ProcessId* release_host();
-  inline void set_allocated_host(::bgs::protocol::ProcessId* host);
+  inline const ::bgs::protocol::ProcessId& host() const PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* mutable_host() PROTOBUF_DEPRECATED;
+  inline ::bgs::protocol::ProcessId* release_host() PROTOBUF_DEPRECATED;
+  inline void set_allocated_host(::bgs::protocol::ProcessId* host) PROTOBUF_DEPRECATED;
 
   // optional string session_id = 3;
   inline bool has_session_id() const;
@@ -981,168 +800,6 @@ class TC_PROTO_API GameAccountOfflineNotification : public ::google::protobuf::M
 };
 // -------------------------------------------------------------------
 
-class TC_PROTO_API GetAchievementsFileRequest : public ::google::protobuf::Message {
- public:
-  GetAchievementsFileRequest();
-  virtual ~GetAchievementsFileRequest();
-
-  GetAchievementsFileRequest(const GetAchievementsFileRequest& from);
-
-  inline GetAchievementsFileRequest& operator=(const GetAchievementsFileRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const GetAchievementsFileRequest& default_instance();
-
-  void Swap(GetAchievementsFileRequest* other);
-
-  // implements Message ----------------------------------------------
-
-  GetAchievementsFileRequest* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const GetAchievementsFileRequest& from);
-  void MergeFrom(const GetAchievementsFileRequest& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional .bgs.protocol.ProcessId host = 1;
-  inline bool has_host() const;
-  inline void clear_host();
-  static const int kHostFieldNumber = 1;
-  inline const ::bgs::protocol::ProcessId& host() const;
-  inline ::bgs::protocol::ProcessId* mutable_host();
-  inline ::bgs::protocol::ProcessId* release_host();
-  inline void set_allocated_host(::bgs::protocol::ProcessId* host);
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest)
- private:
-  inline void set_has_host();
-  inline void clear_has_host();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::bgs::protocol::ProcessId* host_;
-  friend void TC_PROTO_API protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_AssignDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto();
-
-  void InitAsDefaultInstance();
-  static GetAchievementsFileRequest* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class TC_PROTO_API GetAchievementsFileResponse : public ::google::protobuf::Message {
- public:
-  GetAchievementsFileResponse();
-  virtual ~GetAchievementsFileResponse();
-
-  GetAchievementsFileResponse(const GetAchievementsFileResponse& from);
-
-  inline GetAchievementsFileResponse& operator=(const GetAchievementsFileResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const GetAchievementsFileResponse& default_instance();
-
-  void Swap(GetAchievementsFileResponse* other);
-
-  // implements Message ----------------------------------------------
-
-  GetAchievementsFileResponse* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const GetAchievementsFileResponse& from);
-  void MergeFrom(const GetAchievementsFileResponse& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional .bgs.protocol.ContentHandle content_handle = 1;
-  inline bool has_content_handle() const;
-  inline void clear_content_handle();
-  static const int kContentHandleFieldNumber = 1;
-  inline const ::bgs::protocol::ContentHandle& content_handle() const;
-  inline ::bgs::protocol::ContentHandle* mutable_content_handle();
-  inline ::bgs::protocol::ContentHandle* release_content_handle();
-  inline void set_allocated_content_handle(::bgs::protocol::ContentHandle* content_handle);
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse)
- private:
-  inline void set_has_content_handle();
-  inline void clear_has_content_handle();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::bgs::protocol::ContentHandle* content_handle_;
-  friend void TC_PROTO_API protobuf_AddDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_AssignDesc_game_5futilities_5fservice_2eproto();
-  friend void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto();
-
-  void InitAsDefaultInstance();
-  static GetAchievementsFileResponse* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class TC_PROTO_API GetAllValuesForAttributeRequest : public ::google::protobuf::Message {
  public:
   GetAllValuesForAttributeRequest();
@@ -1591,11 +1248,9 @@ class TC_PROTO_API GameUtilitiesService : public ServiceBase
   // client methods --------------------------------------------------
   void ProcessClientRequest(::bgs::protocol::game_utilities::v1::ClientRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ClientResponse const*)> responseCallback, bool client = false, bool server = false);
   void PresenceChannelCreated(::bgs::protocol::game_utilities::v1::PresenceChannelCreatedRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback, bool client = false, bool server = false);
-  void GetPlayerVariables(::bgs::protocol::game_utilities::v1::GetPlayerVariablesRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse const*)> responseCallback, bool client = false, bool server = false);
   void ProcessServerRequest(::bgs::protocol::game_utilities::v1::ServerRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ServerResponse const*)> responseCallback, bool client = false, bool server = false);
   void OnGameAccountOnline(::bgs::protocol::game_utilities::v1::GameAccountOnlineNotification const* request, bool client = false, bool server = false);
   void OnGameAccountOffline(::bgs::protocol::game_utilities::v1::GameAccountOfflineNotification const* request, bool client = false, bool server = false);
-  void GetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse const*)> responseCallback, bool client = false, bool server = false);
   void GetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse const*)> responseCallback, bool client = false, bool server = false);
   void RegisterUtilities(::bgs::protocol::game_utilities::v1::RegisterUtilitiesRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse const*)> responseCallback, bool client = false, bool server = false);
   void UnregisterUtilities(::bgs::protocol::game_utilities::v1::UnregisterUtilitiesRequest const* request, bool client = false, bool server = false);
@@ -1606,11 +1261,9 @@ class TC_PROTO_API GameUtilitiesService : public ServiceBase
   // server methods --------------------------------------------------
   virtual uint32 HandleProcessClientRequest(::bgs::protocol::game_utilities::v1::ClientRequest const* request, ::bgs::protocol::game_utilities::v1::ClientResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandlePresenceChannelCreated(::bgs::protocol::game_utilities::v1::PresenceChannelCreatedRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
-  virtual uint32 HandleGetPlayerVariables(::bgs::protocol::game_utilities::v1::GetPlayerVariablesRequest const* request, ::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleProcessServerRequest(::bgs::protocol::game_utilities::v1::ServerRequest const* request, ::bgs::protocol::game_utilities::v1::ServerResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleOnGameAccountOnline(::bgs::protocol::game_utilities::v1::GameAccountOnlineNotification const* request);
   virtual uint32 HandleOnGameAccountOffline(::bgs::protocol::game_utilities::v1::GameAccountOfflineNotification const* request);
-  virtual uint32 HandleGetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, ::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleGetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, ::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleRegisterUtilities(::bgs::protocol::game_utilities::v1::RegisterUtilitiesRequest const* request, ::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleUnregisterUtilities(::bgs::protocol::game_utilities::v1::UnregisterUtilitiesRequest const* request);
@@ -1658,7 +1311,7 @@ ClientRequest::mutable_attribute() {
   return &attribute_;
 }
 
-// optional .bgs.protocol.ProcessId host = 2;
+// optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
 inline bool ClientRequest::has_host() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -1938,7 +1591,7 @@ inline void ServerRequest::set_program(::google::protobuf::uint32 value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.game_utilities.v1.ServerRequest.program)
 }
 
-// optional .bgs.protocol.ProcessId host = 3;
+// optional .bgs.protocol.ProcessId host = 3 [deprecated = true];
 inline bool ServerRequest::has_host() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -2140,7 +1793,7 @@ inline void PresenceChannelCreatedRequest::set_allocated_account_id(::bgs::proto
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.game_utilities.v1.PresenceChannelCreatedRequest.account_id)
 }
 
-// optional .bgs.protocol.ProcessId host = 5;
+// optional .bgs.protocol.ProcessId host = 5 [deprecated = true];
 inline bool PresenceChannelCreatedRequest::has_host() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -2183,115 +1836,6 @@ inline void PresenceChannelCreatedRequest::set_allocated_host(::bgs::protocol::P
 
 // -------------------------------------------------------------------
 
-// GetPlayerVariablesRequest
-
-// repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-inline int GetPlayerVariablesRequest::player_variables_size() const {
-  return player_variables_.size();
-}
-inline void GetPlayerVariablesRequest::clear_player_variables() {
-  player_variables_.Clear();
-}
-inline const ::bgs::protocol::game_utilities::v1::PlayerVariables& GetPlayerVariablesRequest::player_variables(int index) const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.player_variables)
-  return player_variables_.Get(index);
-}
-inline ::bgs::protocol::game_utilities::v1::PlayerVariables* GetPlayerVariablesRequest::mutable_player_variables(int index) {
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.player_variables)
-  return player_variables_.Mutable(index);
-}
-inline ::bgs::protocol::game_utilities::v1::PlayerVariables* GetPlayerVariablesRequest::add_player_variables() {
-  // @@protoc_insertion_point(field_add:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.player_variables)
-  return player_variables_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >&
-GetPlayerVariablesRequest::player_variables() const {
-  // @@protoc_insertion_point(field_list:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.player_variables)
-  return player_variables_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >*
-GetPlayerVariablesRequest::mutable_player_variables() {
-  // @@protoc_insertion_point(field_mutable_list:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.player_variables)
-  return &player_variables_;
-}
-
-// optional .bgs.protocol.ProcessId host = 2;
-inline bool GetPlayerVariablesRequest::has_host() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void GetPlayerVariablesRequest::set_has_host() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void GetPlayerVariablesRequest::clear_has_host() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void GetPlayerVariablesRequest::clear_host() {
-  if (host_ != NULL) host_->::bgs::protocol::ProcessId::Clear();
-  clear_has_host();
-}
-inline const ::bgs::protocol::ProcessId& GetPlayerVariablesRequest::host() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.host)
-  return host_ != NULL ? *host_ : *default_instance_->host_;
-}
-inline ::bgs::protocol::ProcessId* GetPlayerVariablesRequest::mutable_host() {
-  set_has_host();
-  if (host_ == NULL) host_ = new ::bgs::protocol::ProcessId;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.host)
-  return host_;
-}
-inline ::bgs::protocol::ProcessId* GetPlayerVariablesRequest::release_host() {
-  clear_has_host();
-  ::bgs::protocol::ProcessId* temp = host_;
-  host_ = NULL;
-  return temp;
-}
-inline void GetPlayerVariablesRequest::set_allocated_host(::bgs::protocol::ProcessId* host) {
-  delete host_;
-  host_ = host;
-  if (host) {
-    set_has_host();
-  } else {
-    clear_has_host();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest.host)
-}
-
-// -------------------------------------------------------------------
-
-// GetPlayerVariablesResponse
-
-// repeated .bgs.protocol.game_utilities.v1.PlayerVariables player_variables = 1;
-inline int GetPlayerVariablesResponse::player_variables_size() const {
-  return player_variables_.size();
-}
-inline void GetPlayerVariablesResponse::clear_player_variables() {
-  player_variables_.Clear();
-}
-inline const ::bgs::protocol::game_utilities::v1::PlayerVariables& GetPlayerVariablesResponse::player_variables(int index) const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse.player_variables)
-  return player_variables_.Get(index);
-}
-inline ::bgs::protocol::game_utilities::v1::PlayerVariables* GetPlayerVariablesResponse::mutable_player_variables(int index) {
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse.player_variables)
-  return player_variables_.Mutable(index);
-}
-inline ::bgs::protocol::game_utilities::v1::PlayerVariables* GetPlayerVariablesResponse::add_player_variables() {
-  // @@protoc_insertion_point(field_add:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse.player_variables)
-  return player_variables_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >&
-GetPlayerVariablesResponse::player_variables() const {
-  // @@protoc_insertion_point(field_list:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse.player_variables)
-  return player_variables_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::game_utilities::v1::PlayerVariables >*
-GetPlayerVariablesResponse::mutable_player_variables() {
-  // @@protoc_insertion_point(field_mutable_list:bgs.protocol.game_utilities.v1.GetPlayerVariablesResponse.player_variables)
-  return &player_variables_;
-}
-
-// -------------------------------------------------------------------
-
 // GameAccountOnlineNotification
 
 // required .bgs.protocol.EntityId game_account_id = 1;
@@ -2335,7 +1879,7 @@ inline void GameAccountOnlineNotification::set_allocated_game_account_id(::bgs::
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.game_utilities.v1.GameAccountOnlineNotification.game_account_id)
 }
 
-// optional .bgs.protocol.ProcessId host = 2;
+// optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
 inline bool GameAccountOnlineNotification::has_host() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -2497,7 +2041,7 @@ inline void GameAccountOfflineNotification::set_allocated_game_account_id(::bgs:
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.game_utilities.v1.GameAccountOfflineNotification.game_account_id)
 }
 
-// optional .bgs.protocol.ProcessId host = 2;
+// optional .bgs.protocol.ProcessId host = 2 [deprecated = true];
 inline bool GameAccountOfflineNotification::has_host() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -2616,96 +2160,6 @@ inline void GameAccountOfflineNotification::set_allocated_session_id(::std::stri
 
 // -------------------------------------------------------------------
 
-// GetAchievementsFileRequest
-
-// optional .bgs.protocol.ProcessId host = 1;
-inline bool GetAchievementsFileRequest::has_host() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void GetAchievementsFileRequest::set_has_host() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void GetAchievementsFileRequest::clear_has_host() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void GetAchievementsFileRequest::clear_host() {
-  if (host_ != NULL) host_->::bgs::protocol::ProcessId::Clear();
-  clear_has_host();
-}
-inline const ::bgs::protocol::ProcessId& GetAchievementsFileRequest::host() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest.host)
-  return host_ != NULL ? *host_ : *default_instance_->host_;
-}
-inline ::bgs::protocol::ProcessId* GetAchievementsFileRequest::mutable_host() {
-  set_has_host();
-  if (host_ == NULL) host_ = new ::bgs::protocol::ProcessId;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest.host)
-  return host_;
-}
-inline ::bgs::protocol::ProcessId* GetAchievementsFileRequest::release_host() {
-  clear_has_host();
-  ::bgs::protocol::ProcessId* temp = host_;
-  host_ = NULL;
-  return temp;
-}
-inline void GetAchievementsFileRequest::set_allocated_host(::bgs::protocol::ProcessId* host) {
-  delete host_;
-  host_ = host;
-  if (host) {
-    set_has_host();
-  } else {
-    clear_has_host();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.game_utilities.v1.GetAchievementsFileRequest.host)
-}
-
-// -------------------------------------------------------------------
-
-// GetAchievementsFileResponse
-
-// optional .bgs.protocol.ContentHandle content_handle = 1;
-inline bool GetAchievementsFileResponse::has_content_handle() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void GetAchievementsFileResponse::set_has_content_handle() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void GetAchievementsFileResponse::clear_has_content_handle() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void GetAchievementsFileResponse::clear_content_handle() {
-  if (content_handle_ != NULL) content_handle_->::bgs::protocol::ContentHandle::Clear();
-  clear_has_content_handle();
-}
-inline const ::bgs::protocol::ContentHandle& GetAchievementsFileResponse::content_handle() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse.content_handle)
-  return content_handle_ != NULL ? *content_handle_ : *default_instance_->content_handle_;
-}
-inline ::bgs::protocol::ContentHandle* GetAchievementsFileResponse::mutable_content_handle() {
-  set_has_content_handle();
-  if (content_handle_ == NULL) content_handle_ = new ::bgs::protocol::ContentHandle;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse.content_handle)
-  return content_handle_;
-}
-inline ::bgs::protocol::ContentHandle* GetAchievementsFileResponse::release_content_handle() {
-  clear_has_content_handle();
-  ::bgs::protocol::ContentHandle* temp = content_handle_;
-  content_handle_ = NULL;
-  return temp;
-}
-inline void GetAchievementsFileResponse::set_allocated_content_handle(::bgs::protocol::ContentHandle* content_handle) {
-  delete content_handle_;
-  content_handle_ = content_handle;
-  if (content_handle) {
-    set_has_content_handle();
-  } else {
-    clear_has_content_handle();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.game_utilities.v1.GetAchievementsFileResponse.content_handle)
-}
-
-// -------------------------------------------------------------------
-
 // GetAllValuesForAttributeRequest
 
 // optional string attribute_key = 1;
diff --git a/src/server/proto/Client/game_utilities_types.pb.cc b/src/server/proto/Client/game_utilities_types.pb.cc
index c2b2b40df72..a31b38ca235 100644
--- a/src/server/proto/Client/game_utilities_types.pb.cc
+++ b/src/server/proto/Client/game_utilities_types.pb.cc
@@ -109,16 +109,18 @@ void protobuf_AddDesc_game_5futilities_5ftypes_2eproto() {
 
   ::bgs::protocol::protobuf_AddDesc_attribute_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_entity_5ftypes_2eproto();
+  ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\032game_utilities_types.proto\022\036bgs.protoc"
     "ol.game_utilities.v1\032\025attribute_types.pr"
-    "oto\032\022entity_types.proto\"w\n\017PlayerVariabl"
-    "es\022(\n\010identity\030\001 \002(\0132\026.bgs.protocol.Iden"
-    "tity\022\016\n\006rating\030\002 \001(\001\022*\n\tattribute\030\003 \003(\0132"
-    "\027.bgs.protocol.Attribute\"@\n\nClientInfo\022\026"
-    "\n\016client_address\030\001 \001(\t\022\032\n\022privileged_net"
-    "work\030\002 \001(\010B<\n\037bnet.protocol.game_utiliti"
-    "es.v1B\027GameUtilitiesTypesProtoH\001", 352);
+    "oto\032\022entity_types.proto\032\017rpc_types.proto"
+    "\"w\n\017PlayerVariables\022(\n\010identity\030\001 \002(\0132\026."
+    "bgs.protocol.Identity\022\016\n\006rating\030\002 \001(\001\022*\n"
+    "\tattribute\030\003 \003(\0132\027.bgs.protocol.Attribut"
+    "e\"@\n\nClientInfo\022\026\n\016client_address\030\001 \001(\t\022"
+    "\032\n\022privileged_network\030\002 \001(\010B<\n\037bnet.prot"
+    "ocol.game_utilities.v1B\027GameUtilitiesTyp"
+    "esProtoH\001", 369);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "game_utilities_types.proto", &protobuf_RegisterTypes);
   PlayerVariables::default_instance_ = new PlayerVariables();
diff --git a/src/server/proto/Client/game_utilities_types.pb.h b/src/server/proto/Client/game_utilities_types.pb.h
index a161738c26a..83716b85862 100644
--- a/src/server/proto/Client/game_utilities_types.pb.h
+++ b/src/server/proto/Client/game_utilities_types.pb.h
@@ -26,6 +26,7 @@
 #include <google/protobuf/unknown_field_set.h>
 #include "attribute_types.pb.h"
 #include "entity_types.pb.h"
+#include "rpc_types.pb.h"
 #include "Define.h" // for TC_PROTO_API
 // @@protoc_insertion_point(includes)
 
diff --git a/src/server/proto/Client/global_extensions/field_options.pb.cc b/src/server/proto/Client/global_extensions/field_options.pb.cc
index 824af2d340a..0cb68fedb91 100644
--- a/src/server/proto/Client/global_extensions/field_options.pb.cc
+++ b/src/server/proto/Client/global_extensions/field_options.pb.cc
@@ -37,6 +37,7 @@ struct FieldRestrictionOneofInstance {
   const ::bgs::protocol::RepeatedFieldRestriction* repeated_;
   const ::bgs::protocol::MessageFieldRestriction* message_;
   const ::bgs::protocol::EntityIdRestriction* entity_id_;
+  const ::bgs::protocol::StringFieldRestriction* bytes_;
 }* FieldRestriction_default_oneof_instance_ = NULL;
 const ::google::protobuf::Descriptor* RepeatedFieldRestriction_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
@@ -47,6 +48,7 @@ struct RepeatedFieldRestrictionOneofInstance {
   const ::bgs::protocol::FloatFieldRestriction* float__;
   const ::bgs::protocol::StringFieldRestriction* string_;
   const ::bgs::protocol::EntityIdRestriction* entity_id_;
+  const ::bgs::protocol::StringFieldRestriction* bytes_;
 }* RepeatedFieldRestriction_default_oneof_instance_ = NULL;
 const ::google::protobuf::Descriptor* SignedFieldRestriction_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
@@ -79,10 +81,12 @@ void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto() {
       "global_extensions/field_options.proto");
   GOOGLE_CHECK(file != NULL);
   BGSFieldOptions_descriptor_ = file->message_type(0);
-  static const int BGSFieldOptions_offsets_[3] = {
+  static const int BGSFieldOptions_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, log_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, shard_key_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, fanout_key_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, client_instance_key_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, realized_enum_),
   };
   BGSFieldOptions_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -96,7 +100,7 @@ void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(BGSFieldOptions));
   FieldRestriction_descriptor_ = file->message_type(1);
-  static const int FieldRestriction_offsets_[8] = {
+  static const int FieldRestriction_offsets_[9] = {
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(FieldRestriction_default_oneof_instance_, signed__),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(FieldRestriction_default_oneof_instance_, unsigned__),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(FieldRestriction_default_oneof_instance_, float__),
@@ -104,6 +108,7 @@ void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto() {
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(FieldRestriction_default_oneof_instance_, repeated_),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(FieldRestriction_default_oneof_instance_, message_),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(FieldRestriction_default_oneof_instance_, entity_id_),
+    PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(FieldRestriction_default_oneof_instance_, bytes_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldRestriction, type_),
   };
   FieldRestriction_reflection_ =
@@ -120,7 +125,7 @@ void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FieldRestriction));
   RepeatedFieldRestriction_descriptor_ = file->message_type(2);
-  static const int RepeatedFieldRestriction_offsets_[8] = {
+  static const int RepeatedFieldRestriction_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RepeatedFieldRestriction, size_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RepeatedFieldRestriction, unique_),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(RepeatedFieldRestriction_default_oneof_instance_, signed__),
@@ -128,6 +133,7 @@ void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto() {
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(RepeatedFieldRestriction_default_oneof_instance_, float__),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(RepeatedFieldRestriction_default_oneof_instance_, string_),
     PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(RepeatedFieldRestriction_default_oneof_instance_, entity_id_),
+    PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET(RepeatedFieldRestriction_default_oneof_instance_, bytes_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RepeatedFieldRestriction, type_),
   };
   RepeatedFieldRestriction_reflection_ =
@@ -308,51 +314,55 @@ void protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n%global_extensions/field_options.proto\022"
     "\014bgs.protocol\032 google/protobuf/descripto"
-    "r.proto\032\035global_extensions/range.proto\"^"
-    "\n\017BGSFieldOptions\022$\n\003log\030\001 \001(\0162\027.bgs.pro"
-    "tocol.LogOption\022\021\n\tshard_key\030\002 \001(\010\022\022\n\nfa"
-    "nout_key\030\003 \001(\010\"\252\003\n\020FieldRestriction\0226\n\006s"
-    "igned\030\001 \001(\0132$.bgs.protocol.SignedFieldRe"
-    "strictionH\000\022:\n\010unsigned\030\002 \001(\0132&.bgs.prot"
-    "ocol.UnsignedFieldRestrictionH\000\0224\n\005float"
-    "\030\003 \001(\0132#.bgs.protocol.FloatFieldRestrict"
-    "ionH\000\0226\n\006string\030\004 \001(\0132$.bgs.protocol.Str"
-    "ingFieldRestrictionH\000\022:\n\010repeated\030\005 \001(\0132"
-    "&.bgs.protocol.RepeatedFieldRestrictionH"
-    "\000\0228\n\007message\030\006 \001(\0132%.bgs.protocol.Messag"
-    "eFieldRestrictionH\000\0226\n\tentity_id\030\007 \001(\0132!"
-    ".bgs.protocol.EntityIdRestrictionH\000B\006\n\004t"
-    "ype\"\372\002\n\030RepeatedFieldRestriction\022,\n\004size"
-    "\030\001 \001(\0132\036.bgs.protocol.UnsignedIntRange\022\016"
-    "\n\006unique\030\002 \001(\010\0226\n\006signed\030\003 \001(\0132$.bgs.pro"
-    "tocol.SignedFieldRestrictionH\000\022:\n\010unsign"
-    "ed\030\004 \001(\0132&.bgs.protocol.UnsignedFieldRes"
-    "trictionH\000\0224\n\005float\030\005 \001(\0132#.bgs.protocol"
-    ".FloatFieldRestrictionH\000\0226\n\006string\030\006 \001(\013"
-    "2$.bgs.protocol.StringFieldRestrictionH\000"
-    "\0226\n\tentity_id\030\007 \001(\0132!.bgs.protocol.Entit"
-    "yIdRestrictionH\000B\006\n\004type\"W\n\026SignedFieldR"
-    "estriction\022,\n\006limits\030\001 \001(\0132\034.bgs.protoco"
-    "l.SignedIntRange\022\017\n\007exclude\030\002 \003(\022\"[\n\030Uns"
-    "ignedFieldRestriction\022.\n\006limits\030\001 \001(\0132\036."
-    "bgs.protocol.UnsignedIntRange\022\017\n\007exclude"
-    "\030\002 \003(\004\"R\n\025FloatFieldRestriction\022(\n\006limit"
-    "s\030\001 \001(\0132\030.bgs.protocol.FloatRange\022\017\n\007exc"
-    "lude\030\002 \003(\002\"W\n\026StringFieldRestriction\022,\n\004"
-    "size\030\001 \001(\0132\036.bgs.protocol.UnsignedIntRan"
-    "ge\022\017\n\007exclude\030\002 \003(\t\"\302\001\n\023EntityIdRestrict"
-    "ion\022\016\n\006needed\030\001 \001(\010\0224\n\004kind\030\002 \001(\0162&.bgs."
-    "protocol.EntityIdRestriction.Kind\"e\n\004Kin"
-    "d\022\007\n\003ANY\020\000\022\013\n\007ACCOUNT\020\001\022\020\n\014GAME_ACCOUNT\020"
-    "\002\022\033\n\027ACCOUNT_OR_GAME_ACCOUNT\020\003\022\013\n\007SERVIC"
-    "E\020\004\022\013\n\007CHANNEL\020\005\")\n\027MessageFieldRestrict"
-    "ion\022\016\n\006needed\030\001 \001(\010* \n\tLogOption\022\n\n\006HIDD"
-    "EN\020\001\022\007\n\003HEX\020\002:U\n\rfield_options\022\035.google."
-    "protobuf.FieldOptions\030\220\277\005 \001(\0132\035.bgs.prot"
-    "ocol.BGSFieldOptions:N\n\005valid\022\035.google.p"
-    "rotobuf.FieldOptions\030\221\277\005 \001(\0132\036.bgs.proto"
-    "col.FieldRestrictionB$\n\rbnet.protocolB\021F"
-    "ieldOptionsProtoH\001", 1858);
+    "r.proto\032\035global_extensions/range.proto\"\222"
+    "\001\n\017BGSFieldOptions\022$\n\003log\030\001 \001(\0162\027.bgs.pr"
+    "otocol.LogOption\022\021\n\tshard_key\030\002 \001(\010\022\022\n\nf"
+    "anout_key\030\003 \001(\010\022\033\n\023client_instance_key\030\004"
+    " \001(\010\022\025\n\rrealized_enum\030\005 \001(\t\"\341\003\n\020FieldRes"
+    "triction\0226\n\006signed\030\001 \001(\0132$.bgs.protocol."
+    "SignedFieldRestrictionH\000\022:\n\010unsigned\030\002 \001"
+    "(\0132&.bgs.protocol.UnsignedFieldRestricti"
+    "onH\000\0224\n\005float\030\003 \001(\0132#.bgs.protocol.Float"
+    "FieldRestrictionH\000\0226\n\006string\030\004 \001(\0132$.bgs"
+    ".protocol.StringFieldRestrictionH\000\022:\n\010re"
+    "peated\030\005 \001(\0132&.bgs.protocol.RepeatedFiel"
+    "dRestrictionH\000\0228\n\007message\030\006 \001(\0132%.bgs.pr"
+    "otocol.MessageFieldRestrictionH\000\0226\n\tenti"
+    "ty_id\030\007 \001(\0132!.bgs.protocol.EntityIdRestr"
+    "ictionH\000\0225\n\005bytes\030\010 \001(\0132$.bgs.protocol.S"
+    "tringFieldRestrictionH\000B\006\n\004type\"\261\003\n\030Repe"
+    "atedFieldRestriction\022,\n\004size\030\001 \001(\0132\036.bgs"
+    ".protocol.UnsignedIntRange\022\016\n\006unique\030\002 \001"
+    "(\010\0226\n\006signed\030\003 \001(\0132$.bgs.protocol.Signed"
+    "FieldRestrictionH\000\022:\n\010unsigned\030\004 \001(\0132&.b"
+    "gs.protocol.UnsignedFieldRestrictionH\000\0224"
+    "\n\005float\030\005 \001(\0132#.bgs.protocol.FloatFieldR"
+    "estrictionH\000\0226\n\006string\030\006 \001(\0132$.bgs.proto"
+    "col.StringFieldRestrictionH\000\0226\n\tentity_i"
+    "d\030\007 \001(\0132!.bgs.protocol.EntityIdRestricti"
+    "onH\000\0225\n\005bytes\030\010 \001(\0132$.bgs.protocol.Strin"
+    "gFieldRestrictionH\000B\006\n\004type\"W\n\026SignedFie"
+    "ldRestriction\022,\n\006limits\030\001 \001(\0132\034.bgs.prot"
+    "ocol.SignedIntRange\022\017\n\007exclude\030\002 \003(\022\"[\n\030"
+    "UnsignedFieldRestriction\022.\n\006limits\030\001 \001(\013"
+    "2\036.bgs.protocol.UnsignedIntRange\022\017\n\007excl"
+    "ude\030\002 \003(\004\"R\n\025FloatFieldRestriction\022(\n\006li"
+    "mits\030\001 \001(\0132\030.bgs.protocol.FloatRange\022\017\n\007"
+    "exclude\030\002 \003(\002\"W\n\026StringFieldRestriction\022"
+    ",\n\004size\030\001 \001(\0132\036.bgs.protocol.UnsignedInt"
+    "Range\022\017\n\007exclude\030\002 \003(\t\"\302\001\n\023EntityIdRestr"
+    "iction\022\016\n\006needed\030\001 \001(\010\0224\n\004kind\030\002 \001(\0162&.b"
+    "gs.protocol.EntityIdRestriction.Kind\"e\n\004"
+    "Kind\022\007\n\003ANY\020\000\022\013\n\007ACCOUNT\020\001\022\020\n\014GAME_ACCOU"
+    "NT\020\002\022\033\n\027ACCOUNT_OR_GAME_ACCOUNT\020\003\022\013\n\007SER"
+    "VICE\020\004\022\013\n\007CHANNEL\020\005\")\n\027MessageFieldRestr"
+    "iction\022\016\n\006needed\030\001 \001(\010* \n\tLogOption\022\n\n\006H"
+    "IDDEN\020\001\022\007\n\003HEX\020\002:U\n\rfield_options\022\035.goog"
+    "le.protobuf.FieldOptions\030\220\277\005 \001(\0132\035.bgs.p"
+    "rotocol.BGSFieldOptions:N\n\005valid\022\035.googl"
+    "e.protobuf.FieldOptions\030\221\277\005 \001(\0132\036.bgs.pr"
+    "otocol.FieldRestrictionB$\n\rbnet.protocol"
+    "B\021FieldOptionsProtoH\001", 2021);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "global_extensions/field_options.proto", &protobuf_RegisterTypes);
   BGSFieldOptions::default_instance_ = new BGSFieldOptions();
@@ -413,6 +423,8 @@ bool LogOption_IsValid(int value) {
 const int BGSFieldOptions::kLogFieldNumber;
 const int BGSFieldOptions::kShardKeyFieldNumber;
 const int BGSFieldOptions::kFanoutKeyFieldNumber;
+const int BGSFieldOptions::kClientInstanceKeyFieldNumber;
+const int BGSFieldOptions::kRealizedEnumFieldNumber;
 #endif  // !_MSC_VER
 
 BGSFieldOptions::BGSFieldOptions()
@@ -432,10 +444,13 @@ BGSFieldOptions::BGSFieldOptions(const BGSFieldOptions& from)
 }
 
 void BGSFieldOptions::SharedCtor() {
+  ::google::protobuf::internal::GetEmptyString();
   _cached_size_ = 0;
   log_ = 1;
   shard_key_ = false;
   fanout_key_ = false;
+  client_instance_key_ = false;
+  realized_enum_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -445,6 +460,9 @@ BGSFieldOptions::~BGSFieldOptions() {
 }
 
 void BGSFieldOptions::SharedDtor() {
+  if (realized_enum_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete realized_enum_;
+  }
   if (this != default_instance_) {
   }
 }
@@ -481,9 +499,14 @@ void BGSFieldOptions::Clear() {
     ::memset(&first, 0, n);                                \
   } while (0)
 
-  if (_has_bits_[0 / 32] & 7) {
-    ZR_(shard_key_, fanout_key_);
+  if (_has_bits_[0 / 32] & 31) {
+    ZR_(shard_key_, client_instance_key_);
     log_ = 1;
+    if (has_realized_enum()) {
+      if (realized_enum_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        realized_enum_->clear();
+      }
+    }
   }
 
 #undef OFFSET_OF_FIELD_
@@ -548,6 +571,38 @@ bool BGSFieldOptions::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(32)) goto parse_client_instance_key;
+        break;
+      }
+
+      // optional bool client_instance_key = 4;
+      case 4: {
+        if (tag == 32) {
+         parse_client_instance_key:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &client_instance_key_)));
+          set_has_client_instance_key();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(42)) goto parse_realized_enum;
+        break;
+      }
+
+      // optional string realized_enum = 5;
+      case 5: {
+        if (tag == 42) {
+         parse_realized_enum:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_realized_enum()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->realized_enum().data(), this->realized_enum().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "realized_enum");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -593,6 +648,21 @@ void BGSFieldOptions::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->fanout_key(), output);
   }
 
+  // optional bool client_instance_key = 4;
+  if (has_client_instance_key()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->client_instance_key(), output);
+  }
+
+  // optional string realized_enum = 5;
+  if (has_realized_enum()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->realized_enum().data(), this->realized_enum().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "realized_enum");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      5, this->realized_enum(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -619,6 +689,22 @@ void BGSFieldOptions::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->fanout_key(), target);
   }
 
+  // optional bool client_instance_key = 4;
+  if (has_client_instance_key()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->client_instance_key(), target);
+  }
+
+  // optional string realized_enum = 5;
+  if (has_realized_enum()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->realized_enum().data(), this->realized_enum().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "realized_enum");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        5, this->realized_enum(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -647,6 +733,18 @@ int BGSFieldOptions::ByteSize() const {
       total_size += 1 + 1;
     }
 
+    // optional bool client_instance_key = 4;
+    if (has_client_instance_key()) {
+      total_size += 1 + 1;
+    }
+
+    // optional string realized_enum = 5;
+    if (has_realized_enum()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->realized_enum());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -683,6 +781,12 @@ void BGSFieldOptions::MergeFrom(const BGSFieldOptions& from) {
     if (from.has_fanout_key()) {
       set_fanout_key(from.fanout_key());
     }
+    if (from.has_client_instance_key()) {
+      set_client_instance_key(from.client_instance_key());
+    }
+    if (from.has_realized_enum()) {
+      set_realized_enum(from.realized_enum());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -709,6 +813,8 @@ void BGSFieldOptions::Swap(BGSFieldOptions* other) {
     std::swap(log_, other->log_);
     std::swap(shard_key_, other->shard_key_);
     std::swap(fanout_key_, other->fanout_key_);
+    std::swap(client_instance_key_, other->client_instance_key_);
+    std::swap(realized_enum_, other->realized_enum_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -734,6 +840,7 @@ const int FieldRestriction::kStringFieldNumber;
 const int FieldRestriction::kRepeatedFieldNumber;
 const int FieldRestriction::kMessageFieldNumber;
 const int FieldRestriction::kEntityIdFieldNumber;
+const int FieldRestriction::kBytesFieldNumber;
 #endif  // !_MSC_VER
 
 FieldRestriction::FieldRestriction()
@@ -750,6 +857,7 @@ void FieldRestriction::InitAsDefaultInstance() {
   FieldRestriction_default_oneof_instance_->repeated_ = const_cast< ::bgs::protocol::RepeatedFieldRestriction*>(&::bgs::protocol::RepeatedFieldRestriction::default_instance());
   FieldRestriction_default_oneof_instance_->message_ = const_cast< ::bgs::protocol::MessageFieldRestriction*>(&::bgs::protocol::MessageFieldRestriction::default_instance());
   FieldRestriction_default_oneof_instance_->entity_id_ = const_cast< ::bgs::protocol::EntityIdRestriction*>(&::bgs::protocol::EntityIdRestriction::default_instance());
+  FieldRestriction_default_oneof_instance_->bytes_ = const_cast< ::bgs::protocol::StringFieldRestriction*>(&::bgs::protocol::StringFieldRestriction::default_instance());
 }
 
 FieldRestriction::FieldRestriction(const FieldRestriction& from)
@@ -829,6 +937,10 @@ void FieldRestriction::clear_type() {
       delete type_.entity_id_;
       break;
     }
+    case kBytes: {
+      delete type_.bytes_;
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -939,6 +1051,19 @@ bool FieldRestriction::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(66)) goto parse_bytes;
+        break;
+      }
+
+      // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+      case 8: {
+        if (tag == 66) {
+         parse_bytes:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_bytes()));
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -1010,6 +1135,12 @@ void FieldRestriction::SerializeWithCachedSizes(
       7, this->entity_id(), output);
   }
 
+  // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+  if (has_bytes()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->bytes(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -1069,6 +1200,13 @@ void FieldRestriction::SerializeWithCachedSizes(
         7, this->entity_id(), target);
   }
 
+  // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+  if (has_bytes()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->bytes(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -1130,6 +1268,13 @@ int FieldRestriction::ByteSize() const {
           this->entity_id());
       break;
     }
+    // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+    case kBytes: {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->bytes());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -1188,6 +1333,10 @@ void FieldRestriction::MergeFrom(const FieldRestriction& from) {
       mutable_entity_id()->::bgs::protocol::EntityIdRestriction::MergeFrom(from.entity_id());
       break;
     }
+    case kBytes: {
+      mutable_bytes()->::bgs::protocol::StringFieldRestriction::MergeFrom(from.bytes());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -1241,6 +1390,7 @@ const int RepeatedFieldRestriction::kUnsignedFieldNumber;
 const int RepeatedFieldRestriction::kFloatFieldNumber;
 const int RepeatedFieldRestriction::kStringFieldNumber;
 const int RepeatedFieldRestriction::kEntityIdFieldNumber;
+const int RepeatedFieldRestriction::kBytesFieldNumber;
 #endif  // !_MSC_VER
 
 RepeatedFieldRestriction::RepeatedFieldRestriction()
@@ -1256,6 +1406,7 @@ void RepeatedFieldRestriction::InitAsDefaultInstance() {
   RepeatedFieldRestriction_default_oneof_instance_->float__ = const_cast< ::bgs::protocol::FloatFieldRestriction*>(&::bgs::protocol::FloatFieldRestriction::default_instance());
   RepeatedFieldRestriction_default_oneof_instance_->string_ = const_cast< ::bgs::protocol::StringFieldRestriction*>(&::bgs::protocol::StringFieldRestriction::default_instance());
   RepeatedFieldRestriction_default_oneof_instance_->entity_id_ = const_cast< ::bgs::protocol::EntityIdRestriction*>(&::bgs::protocol::EntityIdRestriction::default_instance());
+  RepeatedFieldRestriction_default_oneof_instance_->bytes_ = const_cast< ::bgs::protocol::StringFieldRestriction*>(&::bgs::protocol::StringFieldRestriction::default_instance());
 }
 
 RepeatedFieldRestriction::RepeatedFieldRestriction(const RepeatedFieldRestriction& from)
@@ -1330,6 +1481,10 @@ void RepeatedFieldRestriction::clear_type() {
       delete type_.entity_id_;
       break;
     }
+    case kBytes: {
+      delete type_.bytes_;
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -1448,6 +1603,19 @@ bool RepeatedFieldRestriction::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(66)) goto parse_bytes;
+        break;
+      }
+
+      // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+      case 8: {
+        if (tag == 66) {
+         parse_bytes:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_bytes()));
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -1518,6 +1686,12 @@ void RepeatedFieldRestriction::SerializeWithCachedSizes(
       7, this->entity_id(), output);
   }
 
+  // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+  if (has_bytes()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->bytes(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -1575,6 +1749,13 @@ void RepeatedFieldRestriction::SerializeWithCachedSizes(
         7, this->entity_id(), target);
   }
 
+  // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+  if (has_bytes()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->bytes(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -1636,6 +1817,13 @@ int RepeatedFieldRestriction::ByteSize() const {
           this->entity_id());
       break;
     }
+    // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+    case kBytes: {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->bytes());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
@@ -1686,6 +1874,10 @@ void RepeatedFieldRestriction::MergeFrom(const RepeatedFieldRestriction& from) {
       mutable_entity_id()->::bgs::protocol::EntityIdRestriction::MergeFrom(from.entity_id());
       break;
     }
+    case kBytes: {
+      mutable_bytes()->::bgs::protocol::StringFieldRestriction::MergeFrom(from.bytes());
+      break;
+    }
     case TYPE_NOT_SET: {
       break;
     }
diff --git a/src/server/proto/Client/global_extensions/field_options.pb.h b/src/server/proto/Client/global_extensions/field_options.pb.h
index 6cd4d1de244..bbc89b69694 100644
--- a/src/server/proto/Client/global_extensions/field_options.pb.h
+++ b/src/server/proto/Client/global_extensions/field_options.pb.h
@@ -166,6 +166,25 @@ class TC_PROTO_API BGSFieldOptions : public ::google::protobuf::Message {
   inline bool fanout_key() const;
   inline void set_fanout_key(bool value);
 
+  // optional bool client_instance_key = 4;
+  inline bool has_client_instance_key() const;
+  inline void clear_client_instance_key();
+  static const int kClientInstanceKeyFieldNumber = 4;
+  inline bool client_instance_key() const;
+  inline void set_client_instance_key(bool value);
+
+  // optional string realized_enum = 5;
+  inline bool has_realized_enum() const;
+  inline void clear_realized_enum();
+  static const int kRealizedEnumFieldNumber = 5;
+  inline const ::std::string& realized_enum() const;
+  inline void set_realized_enum(const ::std::string& value);
+  inline void set_realized_enum(const char* value);
+  inline void set_realized_enum(const char* value, size_t size);
+  inline ::std::string* mutable_realized_enum();
+  inline ::std::string* release_realized_enum();
+  inline void set_allocated_realized_enum(::std::string* realized_enum);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.BGSFieldOptions)
  private:
   inline void set_has_log();
@@ -174,6 +193,10 @@ class TC_PROTO_API BGSFieldOptions : public ::google::protobuf::Message {
   inline void clear_has_shard_key();
   inline void set_has_fanout_key();
   inline void clear_has_fanout_key();
+  inline void set_has_client_instance_key();
+  inline void clear_has_client_instance_key();
+  inline void set_has_realized_enum();
+  inline void clear_has_realized_enum();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -182,6 +205,8 @@ class TC_PROTO_API BGSFieldOptions : public ::google::protobuf::Message {
   int log_;
   bool shard_key_;
   bool fanout_key_;
+  bool client_instance_key_;
+  ::std::string* realized_enum_;
   friend void TC_PROTO_API protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto();
   friend void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto();
   friend void protobuf_ShutdownFile_global_5fextensions_2ffield_5foptions_2eproto();
@@ -222,6 +247,7 @@ class TC_PROTO_API FieldRestriction : public ::google::protobuf::Message {
     kRepeated = 5,
     kMessage = 6,
     kEntityId = 7,
+    kBytes = 8,
     TYPE_NOT_SET = 0,
   };
 
@@ -318,6 +344,15 @@ class TC_PROTO_API FieldRestriction : public ::google::protobuf::Message {
   inline ::bgs::protocol::EntityIdRestriction* release_entity_id();
   inline void set_allocated_entity_id(::bgs::protocol::EntityIdRestriction* entity_id);
 
+  // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+  inline bool has_bytes() const;
+  inline void clear_bytes();
+  static const int kBytesFieldNumber = 8;
+  inline const ::bgs::protocol::StringFieldRestriction& bytes() const;
+  inline ::bgs::protocol::StringFieldRestriction* mutable_bytes();
+  inline ::bgs::protocol::StringFieldRestriction* release_bytes();
+  inline void set_allocated_bytes(::bgs::protocol::StringFieldRestriction* bytes);
+
   inline TypeCase type_case() const;
   // @@protoc_insertion_point(class_scope:bgs.protocol.FieldRestriction)
  private:
@@ -328,6 +363,7 @@ class TC_PROTO_API FieldRestriction : public ::google::protobuf::Message {
   inline void set_has_repeated();
   inline void set_has_message();
   inline void set_has_entity_id();
+  inline void set_has_bytes();
 
   inline bool has_type();
   void clear_type();
@@ -345,6 +381,7 @@ class TC_PROTO_API FieldRestriction : public ::google::protobuf::Message {
     ::bgs::protocol::RepeatedFieldRestriction* repeated_;
     ::bgs::protocol::MessageFieldRestriction* message_;
     ::bgs::protocol::EntityIdRestriction* entity_id_;
+    ::bgs::protocol::StringFieldRestriction* bytes_;
   } type_;
   ::google::protobuf::uint32 _oneof_case_[1];
 
@@ -386,6 +423,7 @@ class TC_PROTO_API RepeatedFieldRestriction : public ::google::protobuf::Message
     kFloat = 5,
     kString = 6,
     kEntityId = 7,
+    kBytes = 8,
     TYPE_NOT_SET = 0,
   };
 
@@ -480,6 +518,15 @@ class TC_PROTO_API RepeatedFieldRestriction : public ::google::protobuf::Message
   inline ::bgs::protocol::EntityIdRestriction* release_entity_id();
   inline void set_allocated_entity_id(::bgs::protocol::EntityIdRestriction* entity_id);
 
+  // optional .bgs.protocol.StringFieldRestriction bytes = 8;
+  inline bool has_bytes() const;
+  inline void clear_bytes();
+  static const int kBytesFieldNumber = 8;
+  inline const ::bgs::protocol::StringFieldRestriction& bytes() const;
+  inline ::bgs::protocol::StringFieldRestriction* mutable_bytes();
+  inline ::bgs::protocol::StringFieldRestriction* release_bytes();
+  inline void set_allocated_bytes(::bgs::protocol::StringFieldRestriction* bytes);
+
   inline TypeCase type_case() const;
   // @@protoc_insertion_point(class_scope:bgs.protocol.RepeatedFieldRestriction)
  private:
@@ -492,6 +539,7 @@ class TC_PROTO_API RepeatedFieldRestriction : public ::google::protobuf::Message
   inline void set_has_float_();
   inline void set_has_string();
   inline void set_has_entity_id();
+  inline void set_has_bytes();
 
   inline bool has_type();
   void clear_type();
@@ -509,6 +557,7 @@ class TC_PROTO_API RepeatedFieldRestriction : public ::google::protobuf::Message
     ::bgs::protocol::FloatFieldRestriction* float__;
     ::bgs::protocol::StringFieldRestriction* string_;
     ::bgs::protocol::EntityIdRestriction* entity_id_;
+    ::bgs::protocol::StringFieldRestriction* bytes_;
   } type_;
   ::google::protobuf::uint32 _oneof_case_[1];
 
@@ -1186,6 +1235,106 @@ inline void BGSFieldOptions::set_fanout_key(bool value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.BGSFieldOptions.fanout_key)
 }
 
+// optional bool client_instance_key = 4;
+inline bool BGSFieldOptions::has_client_instance_key() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void BGSFieldOptions::set_has_client_instance_key() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void BGSFieldOptions::clear_has_client_instance_key() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void BGSFieldOptions::clear_client_instance_key() {
+  client_instance_key_ = false;
+  clear_has_client_instance_key();
+}
+inline bool BGSFieldOptions::client_instance_key() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSFieldOptions.client_instance_key)
+  return client_instance_key_;
+}
+inline void BGSFieldOptions::set_client_instance_key(bool value) {
+  set_has_client_instance_key();
+  client_instance_key_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSFieldOptions.client_instance_key)
+}
+
+// optional string realized_enum = 5;
+inline bool BGSFieldOptions::has_realized_enum() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void BGSFieldOptions::set_has_realized_enum() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void BGSFieldOptions::clear_has_realized_enum() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void BGSFieldOptions::clear_realized_enum() {
+  if (realized_enum_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    realized_enum_->clear();
+  }
+  clear_has_realized_enum();
+}
+inline const ::std::string& BGSFieldOptions::realized_enum() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSFieldOptions.realized_enum)
+  return *realized_enum_;
+}
+inline void BGSFieldOptions::set_realized_enum(const ::std::string& value) {
+  set_has_realized_enum();
+  if (realized_enum_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    realized_enum_ = new ::std::string;
+  }
+  realized_enum_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSFieldOptions.realized_enum)
+}
+inline void BGSFieldOptions::set_realized_enum(const char* value) {
+  set_has_realized_enum();
+  if (realized_enum_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    realized_enum_ = new ::std::string;
+  }
+  realized_enum_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.BGSFieldOptions.realized_enum)
+}
+inline void BGSFieldOptions::set_realized_enum(const char* value, size_t size) {
+  set_has_realized_enum();
+  if (realized_enum_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    realized_enum_ = new ::std::string;
+  }
+  realized_enum_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.BGSFieldOptions.realized_enum)
+}
+inline ::std::string* BGSFieldOptions::mutable_realized_enum() {
+  set_has_realized_enum();
+  if (realized_enum_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    realized_enum_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.BGSFieldOptions.realized_enum)
+  return realized_enum_;
+}
+inline ::std::string* BGSFieldOptions::release_realized_enum() {
+  clear_has_realized_enum();
+  if (realized_enum_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = realized_enum_;
+    realized_enum_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void BGSFieldOptions::set_allocated_realized_enum(::std::string* realized_enum) {
+  if (realized_enum_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete realized_enum_;
+  }
+  if (realized_enum) {
+    set_has_realized_enum();
+    realized_enum_ = realized_enum;
+  } else {
+    clear_has_realized_enum();
+    realized_enum_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.BGSFieldOptions.realized_enum)
+}
+
 // -------------------------------------------------------------------
 
 // FieldRestriction
@@ -1491,6 +1640,49 @@ inline void FieldRestriction::set_allocated_entity_id(::bgs::protocol::EntityIdR
   }
 }
 
+// optional .bgs.protocol.StringFieldRestriction bytes = 8;
+inline bool FieldRestriction::has_bytes() const {
+  return type_case() == kBytes;
+}
+inline void FieldRestriction::set_has_bytes() {
+  _oneof_case_[0] = kBytes;
+}
+inline void FieldRestriction::clear_bytes() {
+  if (has_bytes()) {
+    delete type_.bytes_;
+    clear_has_type();
+  }
+}
+inline const ::bgs::protocol::StringFieldRestriction& FieldRestriction::bytes() const {
+  return has_bytes() ? *type_.bytes_
+                      : ::bgs::protocol::StringFieldRestriction::default_instance();
+}
+inline ::bgs::protocol::StringFieldRestriction* FieldRestriction::mutable_bytes() {
+  if (!has_bytes()) {
+    clear_type();
+    set_has_bytes();
+    type_.bytes_ = new ::bgs::protocol::StringFieldRestriction;
+  }
+  return type_.bytes_;
+}
+inline ::bgs::protocol::StringFieldRestriction* FieldRestriction::release_bytes() {
+  if (has_bytes()) {
+    clear_has_type();
+    ::bgs::protocol::StringFieldRestriction* temp = type_.bytes_;
+    type_.bytes_ = NULL;
+    return temp;
+  } else {
+    return NULL;
+  }
+}
+inline void FieldRestriction::set_allocated_bytes(::bgs::protocol::StringFieldRestriction* bytes) {
+  clear_type();
+  if (bytes) {
+    set_has_bytes();
+    type_.bytes_ = bytes;
+  }
+}
+
 inline bool FieldRestriction::has_type() {
   return type_case() != TYPE_NOT_SET;
 }
@@ -1784,6 +1976,49 @@ inline void RepeatedFieldRestriction::set_allocated_entity_id(::bgs::protocol::E
   }
 }
 
+// optional .bgs.protocol.StringFieldRestriction bytes = 8;
+inline bool RepeatedFieldRestriction::has_bytes() const {
+  return type_case() == kBytes;
+}
+inline void RepeatedFieldRestriction::set_has_bytes() {
+  _oneof_case_[0] = kBytes;
+}
+inline void RepeatedFieldRestriction::clear_bytes() {
+  if (has_bytes()) {
+    delete type_.bytes_;
+    clear_has_type();
+  }
+}
+inline const ::bgs::protocol::StringFieldRestriction& RepeatedFieldRestriction::bytes() const {
+  return has_bytes() ? *type_.bytes_
+                      : ::bgs::protocol::StringFieldRestriction::default_instance();
+}
+inline ::bgs::protocol::StringFieldRestriction* RepeatedFieldRestriction::mutable_bytes() {
+  if (!has_bytes()) {
+    clear_type();
+    set_has_bytes();
+    type_.bytes_ = new ::bgs::protocol::StringFieldRestriction;
+  }
+  return type_.bytes_;
+}
+inline ::bgs::protocol::StringFieldRestriction* RepeatedFieldRestriction::release_bytes() {
+  if (has_bytes()) {
+    clear_has_type();
+    ::bgs::protocol::StringFieldRestriction* temp = type_.bytes_;
+    type_.bytes_ = NULL;
+    return temp;
+  } else {
+    return NULL;
+  }
+}
+inline void RepeatedFieldRestriction::set_allocated_bytes(::bgs::protocol::StringFieldRestriction* bytes) {
+  clear_type();
+  if (bytes) {
+    set_has_bytes();
+    type_.bytes_ = bytes;
+  }
+}
+
 inline bool RepeatedFieldRestriction::has_type() {
   return type_case() != TYPE_NOT_SET;
 }
diff --git a/src/server/proto/Client/global_extensions/message_options.pb.cc b/src/server/proto/Client/global_extensions/message_options.pb.cc
index 90fe1686430..814967073f9 100644
--- a/src/server/proto/Client/global_extensions/message_options.pb.cc
+++ b/src/server/proto/Client/global_extensions/message_options.pb.cc
@@ -37,10 +37,9 @@ void protobuf_AssignDesc_global_5fextensions_2fmessage_5foptions_2eproto() {
       "global_extensions/message_options.proto");
   GOOGLE_CHECK(file != NULL);
   BGSMessageOptions_descriptor_ = file->message_type(0);
-  static const int BGSMessageOptions_offsets_[3] = {
+  static const int BGSMessageOptions_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMessageOptions, custom_select_shard_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMessageOptions, custom_validator_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMessageOptions, client_id_fanout_),
   };
   BGSMessageOptions_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -86,13 +85,12 @@ void protobuf_AddDesc_global_5fextensions_2fmessage_5foptions_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\'global_extensions/message_options.prot"
     "o\022\014bgs.protocol\032 google/protobuf/descrip"
-    "tor.proto\"d\n\021BGSMessageOptions\022\033\n\023custom"
+    "tor.proto\"J\n\021BGSMessageOptions\022\033\n\023custom"
     "_select_shard\030\001 \001(\010\022\030\n\020custom_validator\030"
-    "\002 \001(\010\022\030\n\020client_id_fanout\030\003 \001(\010:[\n\017messa"
-    "ge_options\022\037.google.protobuf.MessageOpti"
-    "ons\030\220\277\005 \001(\0132\037.bgs.protocol.BGSMessageOpt"
-    "ionsB&\n\rbnet.protocolB\023MessageOptionsPro"
-    "toH\001", 324);
+    "\002 \001(\010:[\n\017message_options\022\037.google.protob"
+    "uf.MessageOptions\030\220\277\005 \001(\0132\037.bgs.protocol"
+    ".BGSMessageOptionsB&\n\rbnet.protocolB\023Mes"
+    "sageOptionsProtoH\001", 298);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "global_extensions/message_options.proto", &protobuf_RegisterTypes);
   BGSMessageOptions::default_instance_ = new BGSMessageOptions();
@@ -116,7 +114,6 @@ struct StaticDescriptorInitializer_global_5fextensions_2fmessage_5foptions_2epro
 #ifndef _MSC_VER
 const int BGSMessageOptions::kCustomSelectShardFieldNumber;
 const int BGSMessageOptions::kCustomValidatorFieldNumber;
-const int BGSMessageOptions::kClientIdFanoutFieldNumber;
 #endif  // !_MSC_VER
 
 BGSMessageOptions::BGSMessageOptions()
@@ -139,7 +136,6 @@ void BGSMessageOptions::SharedCtor() {
   _cached_size_ = 0;
   custom_select_shard_ = false;
   custom_validator_ = false;
-  client_id_fanout_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -185,7 +181,7 @@ void BGSMessageOptions::Clear() {
     ::memset(&first, 0, n);                                \
   } while (0)
 
-  ZR_(custom_select_shard_, client_id_fanout_);
+  ZR_(custom_select_shard_, custom_validator_);
 
 #undef OFFSET_OF_FIELD_
 #undef ZR_
@@ -229,21 +225,6 @@ bool BGSMessageOptions::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(24)) goto parse_client_id_fanout;
-        break;
-      }
-
-      // optional bool client_id_fanout = 3;
-      case 3: {
-        if (tag == 24) {
-         parse_client_id_fanout:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &client_id_fanout_)));
-          set_has_client_id_fanout();
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -283,11 +264,6 @@ void BGSMessageOptions::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->custom_validator(), output);
   }
 
-  // optional bool client_id_fanout = 3;
-  if (has_client_id_fanout()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->client_id_fanout(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -308,11 +284,6 @@ void BGSMessageOptions::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->custom_validator(), target);
   }
 
-  // optional bool client_id_fanout = 3;
-  if (has_client_id_fanout()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->client_id_fanout(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -335,11 +306,6 @@ int BGSMessageOptions::ByteSize() const {
       total_size += 1 + 1;
     }
 
-    // optional bool client_id_fanout = 3;
-    if (has_client_id_fanout()) {
-      total_size += 1 + 1;
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -373,9 +339,6 @@ void BGSMessageOptions::MergeFrom(const BGSMessageOptions& from) {
     if (from.has_custom_validator()) {
       set_custom_validator(from.custom_validator());
     }
-    if (from.has_client_id_fanout()) {
-      set_client_id_fanout(from.client_id_fanout());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -401,7 +364,6 @@ void BGSMessageOptions::Swap(BGSMessageOptions* other) {
   if (other != this) {
     std::swap(custom_select_shard_, other->custom_select_shard_);
     std::swap(custom_validator_, other->custom_validator_);
-    std::swap(client_id_fanout_, other->client_id_fanout_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/global_extensions/message_options.pb.h b/src/server/proto/Client/global_extensions/message_options.pb.h
index 1ca0cdbbe01..b9a80743723 100644
--- a/src/server/proto/Client/global_extensions/message_options.pb.h
+++ b/src/server/proto/Client/global_extensions/message_options.pb.h
@@ -107,21 +107,12 @@ class TC_PROTO_API BGSMessageOptions : public ::google::protobuf::Message {
   inline bool custom_validator() const;
   inline void set_custom_validator(bool value);
 
-  // optional bool client_id_fanout = 3;
-  inline bool has_client_id_fanout() const;
-  inline void clear_client_id_fanout();
-  static const int kClientIdFanoutFieldNumber = 3;
-  inline bool client_id_fanout() const;
-  inline void set_client_id_fanout(bool value);
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.BGSMessageOptions)
  private:
   inline void set_has_custom_select_shard();
   inline void clear_has_custom_select_shard();
   inline void set_has_custom_validator();
   inline void clear_has_custom_validator();
-  inline void set_has_client_id_fanout();
-  inline void clear_has_client_id_fanout();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -129,7 +120,6 @@ class TC_PROTO_API BGSMessageOptions : public ::google::protobuf::Message {
   mutable int _cached_size_;
   bool custom_select_shard_;
   bool custom_validator_;
-  bool client_id_fanout_;
   friend void TC_PROTO_API protobuf_AddDesc_global_5fextensions_2fmessage_5foptions_2eproto();
   friend void protobuf_AssignDesc_global_5fextensions_2fmessage_5foptions_2eproto();
   friend void protobuf_ShutdownFile_global_5fextensions_2fmessage_5foptions_2eproto();
@@ -199,30 +189,6 @@ inline void BGSMessageOptions::set_custom_validator(bool value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.BGSMessageOptions.custom_validator)
 }
 
-// optional bool client_id_fanout = 3;
-inline bool BGSMessageOptions::has_client_id_fanout() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void BGSMessageOptions::set_has_client_id_fanout() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void BGSMessageOptions::clear_has_client_id_fanout() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void BGSMessageOptions::clear_client_id_fanout() {
-  client_id_fanout_ = false;
-  clear_has_client_id_fanout();
-}
-inline bool BGSMessageOptions::client_id_fanout() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.BGSMessageOptions.client_id_fanout)
-  return client_id_fanout_;
-}
-inline void BGSMessageOptions::set_client_id_fanout(bool value) {
-  set_has_client_id_fanout();
-  client_id_fanout_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.BGSMessageOptions.client_id_fanout)
-}
-
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/src/server/proto/Client/global_extensions/method_options.pb.cc b/src/server/proto/Client/global_extensions/method_options.pb.cc
index 836aaa5e575..60199325b87 100644
--- a/src/server/proto/Client/global_extensions/method_options.pb.cc
+++ b/src/server/proto/Client/global_extensions/method_options.pb.cc
@@ -37,8 +37,14 @@ void protobuf_AssignDesc_global_5fextensions_2fmethod_5foptions_2eproto() {
       "global_extensions/method_options.proto");
   GOOGLE_CHECK(file != NULL);
   BGSMethodOptions_descriptor_ = file->message_type(0);
-  static const int BGSMethodOptions_offsets_[1] = {
+  static const int BGSMethodOptions_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMethodOptions, id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMethodOptions, client_identity_routing_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMethodOptions, enable_fanout_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMethodOptions, legacy_fanout_replacement_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMethodOptions, forward_key_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMethodOptions, idempotent_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMethodOptions, handle_destination_unreachable_),
   };
   BGSMethodOptions_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -81,14 +87,21 @@ void protobuf_AddDesc_global_5fextensions_2fmethod_5foptions_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
+  ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2frouting_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n&global_extensions/method_options.proto"
     "\022\014bgs.protocol\032 google/protobuf/descript"
-    "or.proto\"\036\n\020BGSMethodOptions\022\n\n\002id\030\001 \001(\r"
-    ":X\n\016method_options\022\036.google.protobuf.Met"
-    "hodOptions\030\220\277\005 \001(\0132\036.bgs.protocol.BGSMet"
-    "hodOptionsB%\n\rbnet.protocolB\022MethodOptio"
-    "nsProtoH\001", 249);
+    "or.proto\032\037global_extensions/routing.prot"
+    "o\"\363\001\n\020BGSMethodOptions\022\n\n\002id\030\001 \001(\r\022H\n\027cl"
+    "ient_identity_routing\030\002 \001(\0162\'.bgs.protoc"
+    "ol.ClientIdentityRoutingType\022\025\n\renable_f"
+    "anout\030\003 \001(\010\022!\n\031legacy_fanout_replacement"
+    "\030\004 \001(\t\022\023\n\013forward_key\030\005 \001(\t\022\022\n\nidempoten"
+    "t\030\006 \001(\010\022&\n\036handle_destination_unreachabl"
+    "e\030\007 \001(\010:X\n\016method_options\022\036.google.proto"
+    "buf.MethodOptions\030\220\277\005 \001(\0132\036.bgs.protocol"
+    ".BGSMethodOptionsB%\n\rbnet.protocolB\022Meth"
+    "odOptionsProtoH\001", 496);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "global_extensions/method_options.proto", &protobuf_RegisterTypes);
   BGSMethodOptions::default_instance_ = new BGSMethodOptions();
@@ -111,6 +124,12 @@ struct StaticDescriptorInitializer_global_5fextensions_2fmethod_5foptions_2eprot
 
 #ifndef _MSC_VER
 const int BGSMethodOptions::kIdFieldNumber;
+const int BGSMethodOptions::kClientIdentityRoutingFieldNumber;
+const int BGSMethodOptions::kEnableFanoutFieldNumber;
+const int BGSMethodOptions::kLegacyFanoutReplacementFieldNumber;
+const int BGSMethodOptions::kForwardKeyFieldNumber;
+const int BGSMethodOptions::kIdempotentFieldNumber;
+const int BGSMethodOptions::kHandleDestinationUnreachableFieldNumber;
 #endif  // !_MSC_VER
 
 BGSMethodOptions::BGSMethodOptions()
@@ -130,8 +149,15 @@ BGSMethodOptions::BGSMethodOptions(const BGSMethodOptions& from)
 }
 
 void BGSMethodOptions::SharedCtor() {
+  ::google::protobuf::internal::GetEmptyString();
   _cached_size_ = 0;
   id_ = 0u;
+  client_identity_routing_ = 0;
+  enable_fanout_ = false;
+  legacy_fanout_replacement_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  forward_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  idempotent_ = false;
+  handle_destination_unreachable_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -141,6 +167,12 @@ BGSMethodOptions::~BGSMethodOptions() {
 }
 
 void BGSMethodOptions::SharedDtor() {
+  if (legacy_fanout_replacement_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete legacy_fanout_replacement_;
+  }
+  if (forward_key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete forward_key_;
+  }
   if (this != default_instance_) {
   }
 }
@@ -167,7 +199,34 @@ BGSMethodOptions* BGSMethodOptions::New() const {
 }
 
 void BGSMethodOptions::Clear() {
-  id_ = 0u;
+#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
+  &reinterpret_cast<BGSMethodOptions*>(16)->f) - \
+   reinterpret_cast<char*>(16))
+
+#define ZR_(first, last) do {                              \
+    size_t f = OFFSET_OF_FIELD_(first);                    \
+    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
+    ::memset(&first, 0, n);                                \
+  } while (0)
+
+  if (_has_bits_[0 / 32] & 127) {
+    ZR_(id_, client_identity_routing_);
+    ZR_(enable_fanout_, handle_destination_unreachable_);
+    if (has_legacy_fanout_replacement()) {
+      if (legacy_fanout_replacement_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        legacy_fanout_replacement_->clear();
+      }
+    }
+    if (has_forward_key()) {
+      if (forward_key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        forward_key_->clear();
+      }
+    }
+  }
+
+#undef OFFSET_OF_FIELD_
+#undef ZR_
+
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
@@ -192,6 +251,105 @@ bool BGSMethodOptions::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(16)) goto parse_client_identity_routing;
+        break;
+      }
+
+      // optional .bgs.protocol.ClientIdentityRoutingType client_identity_routing = 2;
+      case 2: {
+        if (tag == 16) {
+         parse_client_identity_routing:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::bgs::protocol::ClientIdentityRoutingType_IsValid(value)) {
+            set_client_identity_routing(static_cast< ::bgs::protocol::ClientIdentityRoutingType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(24)) goto parse_enable_fanout;
+        break;
+      }
+
+      // optional bool enable_fanout = 3;
+      case 3: {
+        if (tag == 24) {
+         parse_enable_fanout:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &enable_fanout_)));
+          set_has_enable_fanout();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(34)) goto parse_legacy_fanout_replacement;
+        break;
+      }
+
+      // optional string legacy_fanout_replacement = 4;
+      case 4: {
+        if (tag == 34) {
+         parse_legacy_fanout_replacement:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_legacy_fanout_replacement()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->legacy_fanout_replacement().data(), this->legacy_fanout_replacement().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "legacy_fanout_replacement");
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(42)) goto parse_forward_key;
+        break;
+      }
+
+      // optional string forward_key = 5;
+      case 5: {
+        if (tag == 42) {
+         parse_forward_key:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_forward_key()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->forward_key().data(), this->forward_key().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "forward_key");
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(48)) goto parse_idempotent;
+        break;
+      }
+
+      // optional bool idempotent = 6;
+      case 6: {
+        if (tag == 48) {
+         parse_idempotent:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &idempotent_)));
+          set_has_idempotent();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(56)) goto parse_handle_destination_unreachable;
+        break;
+      }
+
+      // optional bool handle_destination_unreachable = 7;
+      case 7: {
+        if (tag == 56) {
+         parse_handle_destination_unreachable:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &handle_destination_unreachable_)));
+          set_has_handle_destination_unreachable();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -226,6 +384,47 @@ void BGSMethodOptions::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->id(), output);
   }
 
+  // optional .bgs.protocol.ClientIdentityRoutingType client_identity_routing = 2;
+  if (has_client_identity_routing()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->client_identity_routing(), output);
+  }
+
+  // optional bool enable_fanout = 3;
+  if (has_enable_fanout()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->enable_fanout(), output);
+  }
+
+  // optional string legacy_fanout_replacement = 4;
+  if (has_legacy_fanout_replacement()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->legacy_fanout_replacement().data(), this->legacy_fanout_replacement().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "legacy_fanout_replacement");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      4, this->legacy_fanout_replacement(), output);
+  }
+
+  // optional string forward_key = 5;
+  if (has_forward_key()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->forward_key().data(), this->forward_key().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "forward_key");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      5, this->forward_key(), output);
+  }
+
+  // optional bool idempotent = 6;
+  if (has_idempotent()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->idempotent(), output);
+  }
+
+  // optional bool handle_destination_unreachable = 7;
+  if (has_handle_destination_unreachable()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->handle_destination_unreachable(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -241,6 +440,49 @@ void BGSMethodOptions::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->id(), target);
   }
 
+  // optional .bgs.protocol.ClientIdentityRoutingType client_identity_routing = 2;
+  if (has_client_identity_routing()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->client_identity_routing(), target);
+  }
+
+  // optional bool enable_fanout = 3;
+  if (has_enable_fanout()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->enable_fanout(), target);
+  }
+
+  // optional string legacy_fanout_replacement = 4;
+  if (has_legacy_fanout_replacement()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->legacy_fanout_replacement().data(), this->legacy_fanout_replacement().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "legacy_fanout_replacement");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->legacy_fanout_replacement(), target);
+  }
+
+  // optional string forward_key = 5;
+  if (has_forward_key()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->forward_key().data(), this->forward_key().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "forward_key");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        5, this->forward_key(), target);
+  }
+
+  // optional bool idempotent = 6;
+  if (has_idempotent()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->idempotent(), target);
+  }
+
+  // optional bool handle_destination_unreachable = 7;
+  if (has_handle_destination_unreachable()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->handle_destination_unreachable(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -260,6 +502,41 @@ int BGSMethodOptions::ByteSize() const {
           this->id());
     }
 
+    // optional .bgs.protocol.ClientIdentityRoutingType client_identity_routing = 2;
+    if (has_client_identity_routing()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->client_identity_routing());
+    }
+
+    // optional bool enable_fanout = 3;
+    if (has_enable_fanout()) {
+      total_size += 1 + 1;
+    }
+
+    // optional string legacy_fanout_replacement = 4;
+    if (has_legacy_fanout_replacement()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->legacy_fanout_replacement());
+    }
+
+    // optional string forward_key = 5;
+    if (has_forward_key()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->forward_key());
+    }
+
+    // optional bool idempotent = 6;
+    if (has_idempotent()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool handle_destination_unreachable = 7;
+    if (has_handle_destination_unreachable()) {
+      total_size += 1 + 1;
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -290,6 +567,24 @@ void BGSMethodOptions::MergeFrom(const BGSMethodOptions& from) {
     if (from.has_id()) {
       set_id(from.id());
     }
+    if (from.has_client_identity_routing()) {
+      set_client_identity_routing(from.client_identity_routing());
+    }
+    if (from.has_enable_fanout()) {
+      set_enable_fanout(from.enable_fanout());
+    }
+    if (from.has_legacy_fanout_replacement()) {
+      set_legacy_fanout_replacement(from.legacy_fanout_replacement());
+    }
+    if (from.has_forward_key()) {
+      set_forward_key(from.forward_key());
+    }
+    if (from.has_idempotent()) {
+      set_idempotent(from.idempotent());
+    }
+    if (from.has_handle_destination_unreachable()) {
+      set_handle_destination_unreachable(from.handle_destination_unreachable());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -314,6 +609,12 @@ bool BGSMethodOptions::IsInitialized() const {
 void BGSMethodOptions::Swap(BGSMethodOptions* other) {
   if (other != this) {
     std::swap(id_, other->id_);
+    std::swap(client_identity_routing_, other->client_identity_routing_);
+    std::swap(enable_fanout_, other->enable_fanout_);
+    std::swap(legacy_fanout_replacement_, other->legacy_fanout_replacement_);
+    std::swap(forward_key_, other->forward_key_);
+    std::swap(idempotent_, other->idempotent_);
+    std::swap(handle_destination_unreachable_, other->handle_destination_unreachable_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/global_extensions/method_options.pb.h b/src/server/proto/Client/global_extensions/method_options.pb.h
index a58273efa96..aa57dc8a573 100644
--- a/src/server/proto/Client/global_extensions/method_options.pb.h
+++ b/src/server/proto/Client/global_extensions/method_options.pb.h
@@ -25,6 +25,7 @@
 #include <google/protobuf/extension_set.h>
 #include <google/protobuf/unknown_field_set.h>
 #include "google/protobuf/descriptor.pb.h"
+#include "global_extensions/routing.pb.h"
 #include "Define.h" // for TC_PROTO_API
 // @@protoc_insertion_point(includes)
 
@@ -100,16 +101,86 @@ class TC_PROTO_API BGSMethodOptions : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 id() const;
   inline void set_id(::google::protobuf::uint32 value);
 
+  // optional .bgs.protocol.ClientIdentityRoutingType client_identity_routing = 2;
+  inline bool has_client_identity_routing() const;
+  inline void clear_client_identity_routing();
+  static const int kClientIdentityRoutingFieldNumber = 2;
+  inline ::bgs::protocol::ClientIdentityRoutingType client_identity_routing() const;
+  inline void set_client_identity_routing(::bgs::protocol::ClientIdentityRoutingType value);
+
+  // optional bool enable_fanout = 3;
+  inline bool has_enable_fanout() const;
+  inline void clear_enable_fanout();
+  static const int kEnableFanoutFieldNumber = 3;
+  inline bool enable_fanout() const;
+  inline void set_enable_fanout(bool value);
+
+  // optional string legacy_fanout_replacement = 4;
+  inline bool has_legacy_fanout_replacement() const;
+  inline void clear_legacy_fanout_replacement();
+  static const int kLegacyFanoutReplacementFieldNumber = 4;
+  inline const ::std::string& legacy_fanout_replacement() const;
+  inline void set_legacy_fanout_replacement(const ::std::string& value);
+  inline void set_legacy_fanout_replacement(const char* value);
+  inline void set_legacy_fanout_replacement(const char* value, size_t size);
+  inline ::std::string* mutable_legacy_fanout_replacement();
+  inline ::std::string* release_legacy_fanout_replacement();
+  inline void set_allocated_legacy_fanout_replacement(::std::string* legacy_fanout_replacement);
+
+  // optional string forward_key = 5;
+  inline bool has_forward_key() const;
+  inline void clear_forward_key();
+  static const int kForwardKeyFieldNumber = 5;
+  inline const ::std::string& forward_key() const;
+  inline void set_forward_key(const ::std::string& value);
+  inline void set_forward_key(const char* value);
+  inline void set_forward_key(const char* value, size_t size);
+  inline ::std::string* mutable_forward_key();
+  inline ::std::string* release_forward_key();
+  inline void set_allocated_forward_key(::std::string* forward_key);
+
+  // optional bool idempotent = 6;
+  inline bool has_idempotent() const;
+  inline void clear_idempotent();
+  static const int kIdempotentFieldNumber = 6;
+  inline bool idempotent() const;
+  inline void set_idempotent(bool value);
+
+  // optional bool handle_destination_unreachable = 7;
+  inline bool has_handle_destination_unreachable() const;
+  inline void clear_handle_destination_unreachable();
+  static const int kHandleDestinationUnreachableFieldNumber = 7;
+  inline bool handle_destination_unreachable() const;
+  inline void set_handle_destination_unreachable(bool value);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.BGSMethodOptions)
  private:
   inline void set_has_id();
   inline void clear_has_id();
+  inline void set_has_client_identity_routing();
+  inline void clear_has_client_identity_routing();
+  inline void set_has_enable_fanout();
+  inline void clear_has_enable_fanout();
+  inline void set_has_legacy_fanout_replacement();
+  inline void clear_has_legacy_fanout_replacement();
+  inline void set_has_forward_key();
+  inline void clear_has_forward_key();
+  inline void set_has_idempotent();
+  inline void clear_has_idempotent();
+  inline void set_has_handle_destination_unreachable();
+  inline void clear_has_handle_destination_unreachable();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::google::protobuf::uint32 _has_bits_[1];
   mutable int _cached_size_;
   ::google::protobuf::uint32 id_;
+  int client_identity_routing_;
+  ::std::string* legacy_fanout_replacement_;
+  ::std::string* forward_key_;
+  bool enable_fanout_;
+  bool idempotent_;
+  bool handle_destination_unreachable_;
   friend void TC_PROTO_API protobuf_AddDesc_global_5fextensions_2fmethod_5foptions_2eproto();
   friend void protobuf_AssignDesc_global_5fextensions_2fmethod_5foptions_2eproto();
   friend void protobuf_ShutdownFile_global_5fextensions_2fmethod_5foptions_2eproto();
@@ -155,6 +226,255 @@ inline void BGSMethodOptions::set_id(::google::protobuf::uint32 value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.BGSMethodOptions.id)
 }
 
+// optional .bgs.protocol.ClientIdentityRoutingType client_identity_routing = 2;
+inline bool BGSMethodOptions::has_client_identity_routing() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void BGSMethodOptions::set_has_client_identity_routing() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void BGSMethodOptions::clear_has_client_identity_routing() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void BGSMethodOptions::clear_client_identity_routing() {
+  client_identity_routing_ = 0;
+  clear_has_client_identity_routing();
+}
+inline ::bgs::protocol::ClientIdentityRoutingType BGSMethodOptions::client_identity_routing() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSMethodOptions.client_identity_routing)
+  return static_cast< ::bgs::protocol::ClientIdentityRoutingType >(client_identity_routing_);
+}
+inline void BGSMethodOptions::set_client_identity_routing(::bgs::protocol::ClientIdentityRoutingType value) {
+  assert(::bgs::protocol::ClientIdentityRoutingType_IsValid(value));
+  set_has_client_identity_routing();
+  client_identity_routing_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSMethodOptions.client_identity_routing)
+}
+
+// optional bool enable_fanout = 3;
+inline bool BGSMethodOptions::has_enable_fanout() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void BGSMethodOptions::set_has_enable_fanout() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void BGSMethodOptions::clear_has_enable_fanout() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void BGSMethodOptions::clear_enable_fanout() {
+  enable_fanout_ = false;
+  clear_has_enable_fanout();
+}
+inline bool BGSMethodOptions::enable_fanout() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSMethodOptions.enable_fanout)
+  return enable_fanout_;
+}
+inline void BGSMethodOptions::set_enable_fanout(bool value) {
+  set_has_enable_fanout();
+  enable_fanout_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSMethodOptions.enable_fanout)
+}
+
+// optional string legacy_fanout_replacement = 4;
+inline bool BGSMethodOptions::has_legacy_fanout_replacement() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void BGSMethodOptions::set_has_legacy_fanout_replacement() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void BGSMethodOptions::clear_has_legacy_fanout_replacement() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void BGSMethodOptions::clear_legacy_fanout_replacement() {
+  if (legacy_fanout_replacement_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    legacy_fanout_replacement_->clear();
+  }
+  clear_has_legacy_fanout_replacement();
+}
+inline const ::std::string& BGSMethodOptions::legacy_fanout_replacement() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSMethodOptions.legacy_fanout_replacement)
+  return *legacy_fanout_replacement_;
+}
+inline void BGSMethodOptions::set_legacy_fanout_replacement(const ::std::string& value) {
+  set_has_legacy_fanout_replacement();
+  if (legacy_fanout_replacement_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    legacy_fanout_replacement_ = new ::std::string;
+  }
+  legacy_fanout_replacement_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSMethodOptions.legacy_fanout_replacement)
+}
+inline void BGSMethodOptions::set_legacy_fanout_replacement(const char* value) {
+  set_has_legacy_fanout_replacement();
+  if (legacy_fanout_replacement_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    legacy_fanout_replacement_ = new ::std::string;
+  }
+  legacy_fanout_replacement_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.BGSMethodOptions.legacy_fanout_replacement)
+}
+inline void BGSMethodOptions::set_legacy_fanout_replacement(const char* value, size_t size) {
+  set_has_legacy_fanout_replacement();
+  if (legacy_fanout_replacement_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    legacy_fanout_replacement_ = new ::std::string;
+  }
+  legacy_fanout_replacement_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.BGSMethodOptions.legacy_fanout_replacement)
+}
+inline ::std::string* BGSMethodOptions::mutable_legacy_fanout_replacement() {
+  set_has_legacy_fanout_replacement();
+  if (legacy_fanout_replacement_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    legacy_fanout_replacement_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.BGSMethodOptions.legacy_fanout_replacement)
+  return legacy_fanout_replacement_;
+}
+inline ::std::string* BGSMethodOptions::release_legacy_fanout_replacement() {
+  clear_has_legacy_fanout_replacement();
+  if (legacy_fanout_replacement_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = legacy_fanout_replacement_;
+    legacy_fanout_replacement_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void BGSMethodOptions::set_allocated_legacy_fanout_replacement(::std::string* legacy_fanout_replacement) {
+  if (legacy_fanout_replacement_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete legacy_fanout_replacement_;
+  }
+  if (legacy_fanout_replacement) {
+    set_has_legacy_fanout_replacement();
+    legacy_fanout_replacement_ = legacy_fanout_replacement;
+  } else {
+    clear_has_legacy_fanout_replacement();
+    legacy_fanout_replacement_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.BGSMethodOptions.legacy_fanout_replacement)
+}
+
+// optional string forward_key = 5;
+inline bool BGSMethodOptions::has_forward_key() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void BGSMethodOptions::set_has_forward_key() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void BGSMethodOptions::clear_has_forward_key() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void BGSMethodOptions::clear_forward_key() {
+  if (forward_key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    forward_key_->clear();
+  }
+  clear_has_forward_key();
+}
+inline const ::std::string& BGSMethodOptions::forward_key() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSMethodOptions.forward_key)
+  return *forward_key_;
+}
+inline void BGSMethodOptions::set_forward_key(const ::std::string& value) {
+  set_has_forward_key();
+  if (forward_key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    forward_key_ = new ::std::string;
+  }
+  forward_key_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSMethodOptions.forward_key)
+}
+inline void BGSMethodOptions::set_forward_key(const char* value) {
+  set_has_forward_key();
+  if (forward_key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    forward_key_ = new ::std::string;
+  }
+  forward_key_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.BGSMethodOptions.forward_key)
+}
+inline void BGSMethodOptions::set_forward_key(const char* value, size_t size) {
+  set_has_forward_key();
+  if (forward_key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    forward_key_ = new ::std::string;
+  }
+  forward_key_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.BGSMethodOptions.forward_key)
+}
+inline ::std::string* BGSMethodOptions::mutable_forward_key() {
+  set_has_forward_key();
+  if (forward_key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    forward_key_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.BGSMethodOptions.forward_key)
+  return forward_key_;
+}
+inline ::std::string* BGSMethodOptions::release_forward_key() {
+  clear_has_forward_key();
+  if (forward_key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = forward_key_;
+    forward_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void BGSMethodOptions::set_allocated_forward_key(::std::string* forward_key) {
+  if (forward_key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete forward_key_;
+  }
+  if (forward_key) {
+    set_has_forward_key();
+    forward_key_ = forward_key;
+  } else {
+    clear_has_forward_key();
+    forward_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.BGSMethodOptions.forward_key)
+}
+
+// optional bool idempotent = 6;
+inline bool BGSMethodOptions::has_idempotent() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void BGSMethodOptions::set_has_idempotent() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void BGSMethodOptions::clear_has_idempotent() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void BGSMethodOptions::clear_idempotent() {
+  idempotent_ = false;
+  clear_has_idempotent();
+}
+inline bool BGSMethodOptions::idempotent() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSMethodOptions.idempotent)
+  return idempotent_;
+}
+inline void BGSMethodOptions::set_idempotent(bool value) {
+  set_has_idempotent();
+  idempotent_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSMethodOptions.idempotent)
+}
+
+// optional bool handle_destination_unreachable = 7;
+inline bool BGSMethodOptions::has_handle_destination_unreachable() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void BGSMethodOptions::set_has_handle_destination_unreachable() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void BGSMethodOptions::clear_has_handle_destination_unreachable() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void BGSMethodOptions::clear_handle_destination_unreachable() {
+  handle_destination_unreachable_ = false;
+  clear_has_handle_destination_unreachable();
+}
+inline bool BGSMethodOptions::handle_destination_unreachable() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSMethodOptions.handle_destination_unreachable)
+  return handle_destination_unreachable_;
+}
+inline void BGSMethodOptions::set_handle_destination_unreachable(bool value) {
+  set_has_handle_destination_unreachable();
+  handle_destination_unreachable_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSMethodOptions.handle_destination_unreachable)
+}
+
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/src/server/proto/Client/global_extensions/routing.pb.cc b/src/server/proto/Client/global_extensions/routing.pb.cc
new file mode 100644
index 00000000000..e1f19b13cbb
--- /dev/null
+++ b/src/server/proto/Client/global_extensions/routing.pb.cc
@@ -0,0 +1,104 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: global_extensions/routing.proto
+
+#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
+#include "global_extensions/routing.pb.h"
+
+#include <algorithm>
+#include <utility>
+
+#include <google/protobuf/stubs/common.h>
+#include <google/protobuf/stubs/once.h>
+#include <google/protobuf/io/coded_stream.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>
+#include "Log.h"
+// @@protoc_insertion_point(includes)
+
+namespace bgs {
+namespace protocol {
+
+namespace {
+
+const ::google::protobuf::EnumDescriptor* ClientIdentityRoutingType_descriptor_ = NULL;
+
+}  // namespace
+
+
+void protobuf_AssignDesc_global_5fextensions_2frouting_2eproto() {
+  protobuf_AddDesc_global_5fextensions_2frouting_2eproto();
+  const ::google::protobuf::FileDescriptor* file =
+    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
+      "global_extensions/routing.proto");
+  GOOGLE_CHECK(file != NULL);
+  ClientIdentityRoutingType_descriptor_ = file->enum_type(0);
+}
+
+namespace {
+
+GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
+inline void protobuf_AssignDescriptorsOnce() {
+  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
+                 &protobuf_AssignDesc_global_5fextensions_2frouting_2eproto);
+}
+
+void protobuf_RegisterTypes(const ::std::string&) {
+  protobuf_AssignDescriptorsOnce();
+}
+
+}  // namespace
+
+void protobuf_ShutdownFile_global_5fextensions_2frouting_2eproto() {
+}
+
+void protobuf_AddDesc_global_5fextensions_2frouting_2eproto() {
+  static bool already_here = false;
+  if (already_here) return;
+  already_here = true;
+  GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
+    "\n\037global_extensions/routing.proto\022\014bgs.p"
+    "rotocol*\304\001\n\031ClientIdentityRoutingType\022$\n"
+    " CLIENT_IDENTITY_ROUTING_DISABLED\020\000\022.\n*C"
+    "LIENT_IDENTITY_ROUTING_BATTLE_NET_ACCOUN"
+    "T\020\001\022(\n$CLIENT_IDENTITY_ROUTING_GAME_ACCO"
+    "UNT\020\002\022\'\n#CLIENT_IDENTITY_ROUTING_INSTANC"
+    "E_ID\020\003B\002H\001", 250);
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
+    "global_extensions/routing.proto", &protobuf_RegisterTypes);
+  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_global_5fextensions_2frouting_2eproto);
+}
+
+// Force AddDescriptors() to be called at static initialization time.
+struct StaticDescriptorInitializer_global_5fextensions_2frouting_2eproto {
+  StaticDescriptorInitializer_global_5fextensions_2frouting_2eproto() {
+    protobuf_AddDesc_global_5fextensions_2frouting_2eproto();
+  }
+} static_descriptor_initializer_global_5fextensions_2frouting_2eproto_;
+const ::google::protobuf::EnumDescriptor* ClientIdentityRoutingType_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ClientIdentityRoutingType_descriptor_;
+}
+bool ClientIdentityRoutingType_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+      return true;
+    default:
+      return false;
+  }
+}
+
+
+// @@protoc_insertion_point(namespace_scope)
+
+}  // namespace protocol
+}  // namespace bgs
+
+// @@protoc_insertion_point(global_scope)
diff --git a/src/server/proto/Client/global_extensions/routing.pb.h b/src/server/proto/Client/global_extensions/routing.pb.h
new file mode 100644
index 00000000000..f40abed3b46
--- /dev/null
+++ b/src/server/proto/Client/global_extensions/routing.pb.h
@@ -0,0 +1,92 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: global_extensions/routing.proto
+
+#ifndef PROTOBUF_global_5fextensions_2frouting_2eproto__INCLUDED
+#define PROTOBUF_global_5fextensions_2frouting_2eproto__INCLUDED
+
+#include <string>
+
+#include <google/protobuf/stubs/common.h>
+
+#if GOOGLE_PROTOBUF_VERSION < 2006000
+#error This file was generated by a newer version of protoc which is
+#error incompatible with your Protocol Buffer headers.  Please update
+#error your headers.
+#endif
+#if 2006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#error This file was generated by an older version of protoc which is
+#error incompatible with your Protocol Buffer headers.  Please
+#error regenerate this file with a newer version of protoc.
+#endif
+
+#include <google/protobuf/generated_message_util.h>
+#include <google/protobuf/repeated_field.h>
+#include <google/protobuf/extension_set.h>
+#include <google/protobuf/generated_enum_reflection.h>
+#include "Define.h" // for TC_PROTO_API
+// @@protoc_insertion_point(includes)
+
+namespace bgs {
+namespace protocol {
+
+// Internal implementation detail -- do not call these.
+void TC_PROTO_API protobuf_AddDesc_global_5fextensions_2frouting_2eproto();
+void protobuf_AssignDesc_global_5fextensions_2frouting_2eproto();
+void protobuf_ShutdownFile_global_5fextensions_2frouting_2eproto();
+
+
+enum ClientIdentityRoutingType {
+  CLIENT_IDENTITY_ROUTING_DISABLED = 0,
+  CLIENT_IDENTITY_ROUTING_BATTLE_NET_ACCOUNT = 1,
+  CLIENT_IDENTITY_ROUTING_GAME_ACCOUNT = 2,
+  CLIENT_IDENTITY_ROUTING_INSTANCE_ID = 3
+};
+TC_PROTO_API bool ClientIdentityRoutingType_IsValid(int value);
+const ClientIdentityRoutingType ClientIdentityRoutingType_MIN = CLIENT_IDENTITY_ROUTING_DISABLED;
+const ClientIdentityRoutingType ClientIdentityRoutingType_MAX = CLIENT_IDENTITY_ROUTING_INSTANCE_ID;
+const int ClientIdentityRoutingType_ARRAYSIZE = ClientIdentityRoutingType_MAX + 1;
+
+TC_PROTO_API const ::google::protobuf::EnumDescriptor* ClientIdentityRoutingType_descriptor();
+inline const ::std::string& ClientIdentityRoutingType_Name(ClientIdentityRoutingType value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    ClientIdentityRoutingType_descriptor(), value);
+}
+inline bool ClientIdentityRoutingType_Parse(
+    const ::std::string& name, ClientIdentityRoutingType* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<ClientIdentityRoutingType>(
+    ClientIdentityRoutingType_descriptor(), name, value);
+}
+// ===================================================================
+
+
+// ===================================================================
+
+
+// ===================================================================
+
+
+// ===================================================================
+
+
+// @@protoc_insertion_point(namespace_scope)
+
+}  // namespace protocol
+}  // namespace bgs
+
+#ifndef SWIG
+namespace google {
+namespace protobuf {
+
+template <> struct is_proto_enum< ::bgs::protocol::ClientIdentityRoutingType> : ::google::protobuf::internal::true_type {};
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::bgs::protocol::ClientIdentityRoutingType>() {
+  return ::bgs::protocol::ClientIdentityRoutingType_descriptor();
+}
+
+}  // namespace google
+}  // namespace protobuf
+#endif  // SWIG
+
+// @@protoc_insertion_point(global_scope)
+
+#endif  // PROTOBUF_global_5fextensions_2frouting_2eproto__INCLUDED
diff --git a/src/server/proto/Client/global_extensions/service_options.pb.cc b/src/server/proto/Client/global_extensions/service_options.pb.cc
index ca0ca257e21..077fd20fc25 100644
--- a/src/server/proto/Client/global_extensions/service_options.pb.cc
+++ b/src/server/proto/Client/global_extensions/service_options.pb.cc
@@ -26,6 +26,7 @@ namespace {
 const ::google::protobuf::Descriptor* BGSServiceOptions_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   BGSServiceOptions_reflection_ = NULL;
+const ::google::protobuf::EnumDescriptor* BGSServiceOptions_ServiceType_descriptor_ = NULL;
 const ::google::protobuf::Descriptor* SDKServiceOptions_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   SDKServiceOptions_reflection_ = NULL;
@@ -40,10 +41,13 @@ void protobuf_AssignDesc_global_5fextensions_2fservice_5foptions_2eproto() {
       "global_extensions/service_options.proto");
   GOOGLE_CHECK(file != NULL);
   BGSServiceOptions_descriptor_ = file->message_type(0);
-  static const int BGSServiceOptions_offsets_[3] = {
+  static const int BGSServiceOptions_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSServiceOptions, descriptor_name_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSServiceOptions, version_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSServiceOptions, shard_name_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSServiceOptions, resolve_client_instance_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSServiceOptions, type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSServiceOptions, api_type_),
   };
   BGSServiceOptions_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -56,6 +60,7 @@ void protobuf_AssignDesc_global_5fextensions_2fservice_5foptions_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(BGSServiceOptions));
+  BGSServiceOptions_ServiceType_descriptor_ = BGSServiceOptions_descriptor_->enum_type(0);
   SDKServiceOptions_descriptor_ = file->message_type(1);
   static const int SDKServiceOptions_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SDKServiceOptions, inbound_),
@@ -110,17 +115,22 @@ void protobuf_AddDesc_global_5fextensions_2fservice_5foptions_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\'global_extensions/service_options.prot"
     "o\022\014bgs.protocol\032 google/protobuf/descrip"
-    "tor.proto\"Q\n\021BGSServiceOptions\022\027\n\017descri"
-    "ptor_name\030\001 \001(\t\022\017\n\007version\030\004 \001(\r\022\022\n\nshar"
-    "d_name\030\005 \001(\t\"M\n\021SDKServiceOptions\022\017\n\007inb"
-    "ound\030\001 \001(\010\022\020\n\010outbound\030\002 \001(\010\022\025\n\ruse_clie"
-    "nt_id\030\003 \001(\010:[\n\017service_options\022\037.google."
-    "protobuf.ServiceOptions\030\220\277\005 \001(\0132\037.bgs.pr"
-    "otocol.BGSServiceOptions:_\n\023sdk_service_"
-    "options\022\037.google.protobuf.ServiceOptions"
-    "\030\221\277\005 \001(\0132\037.bgs.protocol.SDKServiceOption"
-    "sB&\n\rbnet.protocolB\023ServiceOptionsProtoH"
-    "\001", 481);
+    "tor.proto\"\236\002\n\021BGSServiceOptions\022\027\n\017descr"
+    "iptor_name\030\001 \001(\t\022\017\n\007version\030\004 \001(\r\022\022\n\nsha"
+    "rd_name\030\005 \001(\t\022\037\n\027resolve_client_instance"
+    "\030\006 \001(\010\0229\n\004type\030\007 \001(\0162+.bgs.protocol.BGSS"
+    "erviceOptions.ServiceType\022\020\n\010api_type\030\010 "
+    "\001(\t\"]\n\013ServiceType\022\024\n\020SERVICE_TYPE_RPC\020\000"
+    "\022\026\n\022SERVICE_TYPE_EVENT\020\001\022 \n\034SERVICE_TYPE"
+    "_EVENT_BROADCAST\020\002\"M\n\021SDKServiceOptions\022"
+    "\017\n\007inbound\030\001 \001(\010\022\020\n\010outbound\030\002 \001(\010\022\025\n\rus"
+    "e_client_id\030\003 \001(\010:[\n\017service_options\022\037.g"
+    "oogle.protobuf.ServiceOptions\030\220\277\005 \001(\0132\037."
+    "bgs.protocol.BGSServiceOptions:_\n\023sdk_se"
+    "rvice_options\022\037.google.protobuf.ServiceO"
+    "ptions\030\221\277\005 \001(\0132\037.bgs.protocol.SDKService"
+    "OptionsB&\n\rbnet.protocolB\023ServiceOptions"
+    "ProtoH\001", 687);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "global_extensions/service_options.proto", &protobuf_RegisterTypes);
   BGSServiceOptions::default_instance_ = new BGSServiceOptions();
@@ -147,10 +157,36 @@ struct StaticDescriptorInitializer_global_5fextensions_2fservice_5foptions_2epro
 
 // ===================================================================
 
+const ::google::protobuf::EnumDescriptor* BGSServiceOptions_ServiceType_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return BGSServiceOptions_ServiceType_descriptor_;
+}
+bool BGSServiceOptions_ServiceType_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+    case 2:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#ifndef _MSC_VER
+const BGSServiceOptions_ServiceType BGSServiceOptions::SERVICE_TYPE_RPC;
+const BGSServiceOptions_ServiceType BGSServiceOptions::SERVICE_TYPE_EVENT;
+const BGSServiceOptions_ServiceType BGSServiceOptions::SERVICE_TYPE_EVENT_BROADCAST;
+const BGSServiceOptions_ServiceType BGSServiceOptions::ServiceType_MIN;
+const BGSServiceOptions_ServiceType BGSServiceOptions::ServiceType_MAX;
+const int BGSServiceOptions::ServiceType_ARRAYSIZE;
+#endif  // _MSC_VER
 #ifndef _MSC_VER
 const int BGSServiceOptions::kDescriptorNameFieldNumber;
 const int BGSServiceOptions::kVersionFieldNumber;
 const int BGSServiceOptions::kShardNameFieldNumber;
+const int BGSServiceOptions::kResolveClientInstanceFieldNumber;
+const int BGSServiceOptions::kTypeFieldNumber;
+const int BGSServiceOptions::kApiTypeFieldNumber;
 #endif  // !_MSC_VER
 
 BGSServiceOptions::BGSServiceOptions()
@@ -175,6 +211,9 @@ void BGSServiceOptions::SharedCtor() {
   descriptor_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   version_ = 0u;
   shard_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  resolve_client_instance_ = false;
+  type_ = 0;
+  api_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -190,6 +229,9 @@ void BGSServiceOptions::SharedDtor() {
   if (shard_name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete shard_name_;
   }
+  if (api_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete api_type_;
+  }
   if (this != default_instance_) {
   }
 }
@@ -216,19 +258,39 @@ BGSServiceOptions* BGSServiceOptions::New() const {
 }
 
 void BGSServiceOptions::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
+  &reinterpret_cast<BGSServiceOptions*>(16)->f) - \
+   reinterpret_cast<char*>(16))
+
+#define ZR_(first, last) do {                              \
+    size_t f = OFFSET_OF_FIELD_(first);                    \
+    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
+    ::memset(&first, 0, n);                                \
+  } while (0)
+
+  if (_has_bits_[0 / 32] & 63) {
+    ZR_(version_, resolve_client_instance_);
     if (has_descriptor_name()) {
       if (descriptor_name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
         descriptor_name_->clear();
       }
     }
-    version_ = 0u;
     if (has_shard_name()) {
       if (shard_name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
         shard_name_->clear();
       }
     }
+    type_ = 0;
+    if (has_api_type()) {
+      if (api_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        api_type_->clear();
+      }
+    }
   }
+
+#undef OFFSET_OF_FIELD_
+#undef ZR_
+
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
@@ -287,6 +349,58 @@ bool BGSServiceOptions::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(48)) goto parse_resolve_client_instance;
+        break;
+      }
+
+      // optional bool resolve_client_instance = 6;
+      case 6: {
+        if (tag == 48) {
+         parse_resolve_client_instance:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &resolve_client_instance_)));
+          set_has_resolve_client_instance();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(56)) goto parse_type;
+        break;
+      }
+
+      // optional .bgs.protocol.BGSServiceOptions.ServiceType type = 7;
+      case 7: {
+        if (tag == 56) {
+         parse_type:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::bgs::protocol::BGSServiceOptions_ServiceType_IsValid(value)) {
+            set_type(static_cast< ::bgs::protocol::BGSServiceOptions_ServiceType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(7, value);
+          }
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(66)) goto parse_api_type;
+        break;
+      }
+
+      // optional string api_type = 8;
+      case 8: {
+        if (tag == 66) {
+         parse_api_type:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_api_type()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->api_type().data(), this->api_type().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "api_type");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -341,6 +455,27 @@ void BGSServiceOptions::SerializeWithCachedSizes(
       5, this->shard_name(), output);
   }
 
+  // optional bool resolve_client_instance = 6;
+  if (has_resolve_client_instance()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->resolve_client_instance(), output);
+  }
+
+  // optional .bgs.protocol.BGSServiceOptions.ServiceType type = 7;
+  if (has_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      7, this->type(), output);
+  }
+
+  // optional string api_type = 8;
+  if (has_api_type()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->api_type().data(), this->api_type().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "api_type");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      8, this->api_type(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -378,6 +513,28 @@ void BGSServiceOptions::SerializeWithCachedSizes(
         5, this->shard_name(), target);
   }
 
+  // optional bool resolve_client_instance = 6;
+  if (has_resolve_client_instance()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->resolve_client_instance(), target);
+  }
+
+  // optional .bgs.protocol.BGSServiceOptions.ServiceType type = 7;
+  if (has_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      7, this->type(), target);
+  }
+
+  // optional string api_type = 8;
+  if (has_api_type()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->api_type().data(), this->api_type().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "api_type");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        8, this->api_type(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -411,6 +568,24 @@ int BGSServiceOptions::ByteSize() const {
           this->shard_name());
     }
 
+    // optional bool resolve_client_instance = 6;
+    if (has_resolve_client_instance()) {
+      total_size += 1 + 1;
+    }
+
+    // optional .bgs.protocol.BGSServiceOptions.ServiceType type = 7;
+    if (has_type()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
+    }
+
+    // optional string api_type = 8;
+    if (has_api_type()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->api_type());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -447,6 +622,15 @@ void BGSServiceOptions::MergeFrom(const BGSServiceOptions& from) {
     if (from.has_shard_name()) {
       set_shard_name(from.shard_name());
     }
+    if (from.has_resolve_client_instance()) {
+      set_resolve_client_instance(from.resolve_client_instance());
+    }
+    if (from.has_type()) {
+      set_type(from.type());
+    }
+    if (from.has_api_type()) {
+      set_api_type(from.api_type());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -473,6 +657,9 @@ void BGSServiceOptions::Swap(BGSServiceOptions* other) {
     std::swap(descriptor_name_, other->descriptor_name_);
     std::swap(version_, other->version_);
     std::swap(shard_name_, other->shard_name_);
+    std::swap(resolve_client_instance_, other->resolve_client_instance_);
+    std::swap(type_, other->type_);
+    std::swap(api_type_, other->api_type_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/global_extensions/service_options.pb.h b/src/server/proto/Client/global_extensions/service_options.pb.h
index 3e664253dc8..6b657b884cc 100644
--- a/src/server/proto/Client/global_extensions/service_options.pb.h
+++ b/src/server/proto/Client/global_extensions/service_options.pb.h
@@ -23,6 +23,7 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/extension_set.h>
+#include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 #include "google/protobuf/descriptor.pb.h"
 #include "Define.h" // for TC_PROTO_API
@@ -39,6 +40,26 @@ void protobuf_ShutdownFile_global_5fextensions_2fservice_5foptions_2eproto();
 class BGSServiceOptions;
 class SDKServiceOptions;
 
+enum BGSServiceOptions_ServiceType {
+  BGSServiceOptions_ServiceType_SERVICE_TYPE_RPC = 0,
+  BGSServiceOptions_ServiceType_SERVICE_TYPE_EVENT = 1,
+  BGSServiceOptions_ServiceType_SERVICE_TYPE_EVENT_BROADCAST = 2
+};
+TC_PROTO_API bool BGSServiceOptions_ServiceType_IsValid(int value);
+const BGSServiceOptions_ServiceType BGSServiceOptions_ServiceType_ServiceType_MIN = BGSServiceOptions_ServiceType_SERVICE_TYPE_RPC;
+const BGSServiceOptions_ServiceType BGSServiceOptions_ServiceType_ServiceType_MAX = BGSServiceOptions_ServiceType_SERVICE_TYPE_EVENT_BROADCAST;
+const int BGSServiceOptions_ServiceType_ServiceType_ARRAYSIZE = BGSServiceOptions_ServiceType_ServiceType_MAX + 1;
+
+TC_PROTO_API const ::google::protobuf::EnumDescriptor* BGSServiceOptions_ServiceType_descriptor();
+inline const ::std::string& BGSServiceOptions_ServiceType_Name(BGSServiceOptions_ServiceType value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    BGSServiceOptions_ServiceType_descriptor(), value);
+}
+inline bool BGSServiceOptions_ServiceType_Parse(
+    const ::std::string& name, BGSServiceOptions_ServiceType* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<BGSServiceOptions_ServiceType>(
+    BGSServiceOptions_ServiceType_descriptor(), name, value);
+}
 // ===================================================================
 
 class TC_PROTO_API BGSServiceOptions : public ::google::protobuf::Message {
@@ -92,6 +113,31 @@ class TC_PROTO_API BGSServiceOptions : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef BGSServiceOptions_ServiceType ServiceType;
+  static const ServiceType SERVICE_TYPE_RPC = BGSServiceOptions_ServiceType_SERVICE_TYPE_RPC;
+  static const ServiceType SERVICE_TYPE_EVENT = BGSServiceOptions_ServiceType_SERVICE_TYPE_EVENT;
+  static const ServiceType SERVICE_TYPE_EVENT_BROADCAST = BGSServiceOptions_ServiceType_SERVICE_TYPE_EVENT_BROADCAST;
+  static inline bool ServiceType_IsValid(int value) {
+    return BGSServiceOptions_ServiceType_IsValid(value);
+  }
+  static const ServiceType ServiceType_MIN =
+    BGSServiceOptions_ServiceType_ServiceType_MIN;
+  static const ServiceType ServiceType_MAX =
+    BGSServiceOptions_ServiceType_ServiceType_MAX;
+  static const int ServiceType_ARRAYSIZE =
+    BGSServiceOptions_ServiceType_ServiceType_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  ServiceType_descriptor() {
+    return BGSServiceOptions_ServiceType_descriptor();
+  }
+  static inline const ::std::string& ServiceType_Name(ServiceType value) {
+    return BGSServiceOptions_ServiceType_Name(value);
+  }
+  static inline bool ServiceType_Parse(const ::std::string& name,
+      ServiceType* value) {
+    return BGSServiceOptions_ServiceType_Parse(name, value);
+  }
+
   // accessors -------------------------------------------------------
 
   // optional string descriptor_name = 1;
@@ -125,6 +171,32 @@ class TC_PROTO_API BGSServiceOptions : public ::google::protobuf::Message {
   inline ::std::string* release_shard_name();
   inline void set_allocated_shard_name(::std::string* shard_name);
 
+  // optional bool resolve_client_instance = 6;
+  inline bool has_resolve_client_instance() const;
+  inline void clear_resolve_client_instance();
+  static const int kResolveClientInstanceFieldNumber = 6;
+  inline bool resolve_client_instance() const;
+  inline void set_resolve_client_instance(bool value);
+
+  // optional .bgs.protocol.BGSServiceOptions.ServiceType type = 7;
+  inline bool has_type() const;
+  inline void clear_type();
+  static const int kTypeFieldNumber = 7;
+  inline ::bgs::protocol::BGSServiceOptions_ServiceType type() const;
+  inline void set_type(::bgs::protocol::BGSServiceOptions_ServiceType value);
+
+  // optional string api_type = 8;
+  inline bool has_api_type() const;
+  inline void clear_api_type();
+  static const int kApiTypeFieldNumber = 8;
+  inline const ::std::string& api_type() const;
+  inline void set_api_type(const ::std::string& value);
+  inline void set_api_type(const char* value);
+  inline void set_api_type(const char* value, size_t size);
+  inline ::std::string* mutable_api_type();
+  inline ::std::string* release_api_type();
+  inline void set_allocated_api_type(::std::string* api_type);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.BGSServiceOptions)
  private:
   inline void set_has_descriptor_name();
@@ -133,6 +205,12 @@ class TC_PROTO_API BGSServiceOptions : public ::google::protobuf::Message {
   inline void clear_has_version();
   inline void set_has_shard_name();
   inline void clear_has_shard_name();
+  inline void set_has_resolve_client_instance();
+  inline void clear_has_resolve_client_instance();
+  inline void set_has_type();
+  inline void clear_has_type();
+  inline void set_has_api_type();
+  inline void clear_has_api_type();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -141,6 +219,9 @@ class TC_PROTO_API BGSServiceOptions : public ::google::protobuf::Message {
   ::std::string* descriptor_name_;
   ::std::string* shard_name_;
   ::google::protobuf::uint32 version_;
+  bool resolve_client_instance_;
+  ::std::string* api_type_;
+  int type_;
   friend void TC_PROTO_API protobuf_AddDesc_global_5fextensions_2fservice_5foptions_2eproto();
   friend void protobuf_AssignDesc_global_5fextensions_2fservice_5foptions_2eproto();
   friend void protobuf_ShutdownFile_global_5fextensions_2fservice_5foptions_2eproto();
@@ -441,6 +522,131 @@ inline void BGSServiceOptions::set_allocated_shard_name(::std::string* shard_nam
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.BGSServiceOptions.shard_name)
 }
 
+// optional bool resolve_client_instance = 6;
+inline bool BGSServiceOptions::has_resolve_client_instance() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void BGSServiceOptions::set_has_resolve_client_instance() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void BGSServiceOptions::clear_has_resolve_client_instance() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void BGSServiceOptions::clear_resolve_client_instance() {
+  resolve_client_instance_ = false;
+  clear_has_resolve_client_instance();
+}
+inline bool BGSServiceOptions::resolve_client_instance() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSServiceOptions.resolve_client_instance)
+  return resolve_client_instance_;
+}
+inline void BGSServiceOptions::set_resolve_client_instance(bool value) {
+  set_has_resolve_client_instance();
+  resolve_client_instance_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSServiceOptions.resolve_client_instance)
+}
+
+// optional .bgs.protocol.BGSServiceOptions.ServiceType type = 7;
+inline bool BGSServiceOptions::has_type() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void BGSServiceOptions::set_has_type() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void BGSServiceOptions::clear_has_type() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void BGSServiceOptions::clear_type() {
+  type_ = 0;
+  clear_has_type();
+}
+inline ::bgs::protocol::BGSServiceOptions_ServiceType BGSServiceOptions::type() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSServiceOptions.type)
+  return static_cast< ::bgs::protocol::BGSServiceOptions_ServiceType >(type_);
+}
+inline void BGSServiceOptions::set_type(::bgs::protocol::BGSServiceOptions_ServiceType value) {
+  assert(::bgs::protocol::BGSServiceOptions_ServiceType_IsValid(value));
+  set_has_type();
+  type_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSServiceOptions.type)
+}
+
+// optional string api_type = 8;
+inline bool BGSServiceOptions::has_api_type() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void BGSServiceOptions::set_has_api_type() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void BGSServiceOptions::clear_has_api_type() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void BGSServiceOptions::clear_api_type() {
+  if (api_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    api_type_->clear();
+  }
+  clear_has_api_type();
+}
+inline const ::std::string& BGSServiceOptions::api_type() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.BGSServiceOptions.api_type)
+  return *api_type_;
+}
+inline void BGSServiceOptions::set_api_type(const ::std::string& value) {
+  set_has_api_type();
+  if (api_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    api_type_ = new ::std::string;
+  }
+  api_type_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.BGSServiceOptions.api_type)
+}
+inline void BGSServiceOptions::set_api_type(const char* value) {
+  set_has_api_type();
+  if (api_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    api_type_ = new ::std::string;
+  }
+  api_type_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.BGSServiceOptions.api_type)
+}
+inline void BGSServiceOptions::set_api_type(const char* value, size_t size) {
+  set_has_api_type();
+  if (api_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    api_type_ = new ::std::string;
+  }
+  api_type_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.BGSServiceOptions.api_type)
+}
+inline ::std::string* BGSServiceOptions::mutable_api_type() {
+  set_has_api_type();
+  if (api_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    api_type_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.BGSServiceOptions.api_type)
+  return api_type_;
+}
+inline ::std::string* BGSServiceOptions::release_api_type() {
+  clear_has_api_type();
+  if (api_type_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = api_type_;
+    api_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void BGSServiceOptions::set_allocated_api_type(::std::string* api_type) {
+  if (api_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete api_type_;
+  }
+  if (api_type) {
+    set_has_api_type();
+    api_type_ = api_type;
+  } else {
+    clear_has_api_type();
+    api_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.BGSServiceOptions.api_type)
+}
+
 // -------------------------------------------------------------------
 
 // SDKServiceOptions
@@ -527,6 +733,11 @@ inline void SDKServiceOptions::set_use_client_id(bool value) {
 namespace google {
 namespace protobuf {
 
+template <> struct is_proto_enum< ::bgs::protocol::BGSServiceOptions_ServiceType> : ::google::protobuf::internal::true_type {};
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::bgs::protocol::BGSServiceOptions_ServiceType>() {
+  return ::bgs::protocol::BGSServiceOptions_ServiceType_descriptor();
+}
 
 }  // namespace google
 }  // namespace protobuf
diff --git a/src/server/proto/Client/notification_types.pb.cc b/src/server/proto/Client/notification_types.pb.cc
index 8ff883d39c9..870f43d332d 100644
--- a/src/server/proto/Client/notification_types.pb.cc
+++ b/src/server/proto/Client/notification_types.pb.cc
@@ -28,6 +28,9 @@ namespace {
 const ::google::protobuf::Descriptor* Target_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   Target_reflection_ = NULL;
+const ::google::protobuf::Descriptor* TargetIdentity_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  TargetIdentity_reflection_ = NULL;
 const ::google::protobuf::Descriptor* Subscription_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   Subscription_reflection_ = NULL;
@@ -60,7 +63,23 @@ void protobuf_AssignDesc_notification_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(Target));
-  Subscription_descriptor_ = file->message_type(1);
+  TargetIdentity_descriptor_ = file->message_type(1);
+  static const int TargetIdentity_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TargetIdentity, account_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TargetIdentity, game_account_),
+  };
+  TargetIdentity_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      TargetIdentity_descriptor_,
+      TargetIdentity::default_instance_,
+      TargetIdentity_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TargetIdentity, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TargetIdentity, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(TargetIdentity));
+  Subscription_descriptor_ = file->message_type(2);
   static const int Subscription_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Subscription, target_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Subscription, subscriber_),
@@ -77,8 +96,8 @@ void protobuf_AssignDesc_notification_5ftypes_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(Subscription));
-  Notification_descriptor_ = file->message_type(2);
-  static const int Notification_offsets_[10] = {
+  Notification_descriptor_ = file->message_type(3);
+  static const int Notification_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, sender_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, target_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, type_),
@@ -87,7 +106,6 @@ void protobuf_AssignDesc_notification_5ftypes_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, target_account_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, sender_battle_tag_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, target_battle_tag_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, peer_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Notification, forwarding_identity_),
   };
   Notification_reflection_ =
@@ -116,6 +134,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     Target_descriptor_, &Target::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    TargetIdentity_descriptor_, &TargetIdentity::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     Subscription_descriptor_, &Subscription::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     Notification_descriptor_, &Notification::default_instance());
@@ -126,6 +146,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void protobuf_ShutdownFile_notification_5ftypes_2eproto() {
   delete Target::default_instance_;
   delete Target_reflection_;
+  delete TargetIdentity::default_instance_;
+  delete TargetIdentity_reflection_;
   delete Subscription::default_instance_;
   delete Subscription_reflection_;
   delete Notification::default_instance_;
@@ -146,29 +168,35 @@ void protobuf_AddDesc_notification_5ftypes_2eproto() {
     "\n\030notification_types.proto\022\034bgs.protocol"
     ".notification.v1\032\023account_types.proto\032\025a"
     "ttribute_types.proto\032\022entity_types.proto"
-    "\032\017rpc_types.proto\"K\n\006Target\0223\n\010identity\030"
-    "\001 \001(\0132!.bgs.protocol.account.v1.Identity"
-    "\022\014\n\004type\030\002 \001(\t\"\235\001\n\014Subscription\0224\n\006targe"
-    "t\030\001 \003(\0132$.bgs.protocol.notification.v1.T"
-    "arget\0225\n\nsubscriber\030\002 \001(\0132!.bgs.protocol"
-    ".account.v1.Identity\022 \n\021delivery_require"
-    "d\030\003 \001(\010:\005false\"\241\003\n\014Notification\022)\n\tsende"
-    "r_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022)\n\tta"
-    "rget_id\030\002 \002(\0132\026.bgs.protocol.EntityId\022\014\n"
-    "\004type\030\003 \002(\t\022*\n\tattribute\030\004 \003(\0132\027.bgs.pro"
-    "tocol.Attribute\0221\n\021sender_account_id\030\005 \001"
-    "(\0132\026.bgs.protocol.EntityId\0221\n\021target_acc"
-    "ount_id\030\006 \001(\0132\026.bgs.protocol.EntityId\022\031\n"
-    "\021sender_battle_tag\030\007 \001(\t\022\031\n\021target_battl"
-    "e_tag\030\010 \001(\t\022%\n\004peer\030\t \001(\0132\027.bgs.protocol"
-    ".ProcessId\022>\n\023forwarding_identity\030\n \001(\0132"
-    "!.bgs.protocol.account.v1.IdentityB\002H\001", 798);
+    "\032\017rpc_types.proto\"^\n\006Target\022>\n\010identity\030"
+    "\001 \001(\0132,.bgs.protocol.notification.v1.Tar"
+    "getIdentity\022\014\n\004type\030\002 \001(\t:\006\202\371+\002\020\001\"\207\001\n\016Ta"
+    "rgetIdentity\0223\n\007account\030\001 \001(\0132\".bgs.prot"
+    "ocol.account.v1.AccountId\022@\n\014game_accoun"
+    "t\030\002 \001(\0132*.bgs.protocol.account.v1.GameAc"
+    "countHandle\"\232\001\n\014Subscription\0224\n\006target\030\001"
+    " \003(\0132$.bgs.protocol.notification.v1.Targ"
+    "et\0225\n\nsubscriber\030\002 \001(\0132!.bgs.protocol.ac"
+    "count.v1.Identity\022\035\n\021delivery_required\030\003"
+    " \001(\010B\002\030\001\"\222\003\n\014Notification\022)\n\tsender_id\030\001"
+    " \001(\0132\026.bgs.protocol.EntityId\022)\n\ttarget_i"
+    "d\030\002 \002(\0132\026.bgs.protocol.EntityId\022\014\n\004type\030"
+    "\003 \002(\t\022*\n\tattribute\030\004 \003(\0132\027.bgs.protocol."
+    "Attribute\0221\n\021sender_account_id\030\005 \001(\0132\026.b"
+    "gs.protocol.EntityId\0221\n\021target_account_i"
+    "d\030\006 \001(\0132\026.bgs.protocol.EntityId\022!\n\021sende"
+    "r_battle_tag\030\007 \001(\tB\006\202\371+\002\010\001\022!\n\021target_bat"
+    "tle_tag\030\010 \001(\tB\006\202\371+\002\010\001\022>\n\023forwarding_iden"
+    "tity\030\n \001(\0132!.bgs.protocol.account.v1.Ide"
+    "ntity:\006\202\371+\002\010\001B\002H\001", 937);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "notification_types.proto", &protobuf_RegisterTypes);
   Target::default_instance_ = new Target();
+  TargetIdentity::default_instance_ = new TargetIdentity();
   Subscription::default_instance_ = new Subscription();
   Notification::default_instance_ = new Notification();
   Target::default_instance_->InitAsDefaultInstance();
+  TargetIdentity::default_instance_->InitAsDefaultInstance();
   Subscription::default_instance_->InitAsDefaultInstance();
   Notification::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_notification_5ftypes_2eproto);
@@ -195,7 +223,7 @@ Target::Target()
 }
 
 void Target::InitAsDefaultInstance() {
-  identity_ = const_cast< ::bgs::protocol::account::v1::Identity*>(&::bgs::protocol::account::v1::Identity::default_instance());
+  identity_ = const_cast< ::bgs::protocol::notification::v1::TargetIdentity*>(&::bgs::protocol::notification::v1::TargetIdentity::default_instance());
 }
 
 Target::Target(const Target& from)
@@ -251,7 +279,7 @@ Target* Target::New() const {
 void Target::Clear() {
   if (_has_bits_[0 / 32] & 3) {
     if (has_identity()) {
-      if (identity_ != NULL) identity_->::bgs::protocol::account::v1::Identity::Clear();
+      if (identity_ != NULL) identity_->::bgs::protocol::notification::v1::TargetIdentity::Clear();
     }
     if (has_type()) {
       if (type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
@@ -273,7 +301,7 @@ bool Target::MergePartialFromCodedStream(
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .bgs.protocol.account.v1.Identity identity = 1;
+      // optional .bgs.protocol.notification.v1.TargetIdentity identity = 1;
       case 1: {
         if (tag == 10) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
@@ -327,7 +355,7 @@ failure:
 void Target::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // @@protoc_insertion_point(serialize_start:bgs.protocol.notification.v1.Target)
-  // optional .bgs.protocol.account.v1.Identity identity = 1;
+  // optional .bgs.protocol.notification.v1.TargetIdentity identity = 1;
   if (has_identity()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->identity(), output);
@@ -353,7 +381,7 @@ void Target::SerializeWithCachedSizes(
 ::google::protobuf::uint8* Target::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.notification.v1.Target)
-  // optional .bgs.protocol.account.v1.Identity identity = 1;
+  // optional .bgs.protocol.notification.v1.TargetIdentity identity = 1;
   if (has_identity()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -383,7 +411,7 @@ int Target::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .bgs.protocol.account.v1.Identity identity = 1;
+    // optional .bgs.protocol.notification.v1.TargetIdentity identity = 1;
     if (has_identity()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -425,7 +453,7 @@ void Target::MergeFrom(const Target& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_identity()) {
-      mutable_identity()->::bgs::protocol::account::v1::Identity::MergeFrom(from.identity());
+      mutable_identity()->::bgs::protocol::notification::v1::TargetIdentity::MergeFrom(from.identity());
     }
     if (from.has_type()) {
       set_type(from.type());
@@ -476,6 +504,285 @@ void Target::Swap(Target* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int TargetIdentity::kAccountFieldNumber;
+const int TargetIdentity::kGameAccountFieldNumber;
+#endif  // !_MSC_VER
+
+TargetIdentity::TargetIdentity()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:bgs.protocol.notification.v1.TargetIdentity)
+}
+
+void TargetIdentity::InitAsDefaultInstance() {
+  account_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance());
+  game_account_ = const_cast< ::bgs::protocol::account::v1::GameAccountHandle*>(&::bgs::protocol::account::v1::GameAccountHandle::default_instance());
+}
+
+TargetIdentity::TargetIdentity(const TargetIdentity& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+  // @@protoc_insertion_point(copy_constructor:bgs.protocol.notification.v1.TargetIdentity)
+}
+
+void TargetIdentity::SharedCtor() {
+  _cached_size_ = 0;
+  account_ = NULL;
+  game_account_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+TargetIdentity::~TargetIdentity() {
+  // @@protoc_insertion_point(destructor:bgs.protocol.notification.v1.TargetIdentity)
+  SharedDtor();
+}
+
+void TargetIdentity::SharedDtor() {
+  if (this != default_instance_) {
+    delete account_;
+    delete game_account_;
+  }
+}
+
+void TargetIdentity::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* TargetIdentity::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TargetIdentity_descriptor_;
+}
+
+const TargetIdentity& TargetIdentity::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_notification_5ftypes_2eproto();
+  return *default_instance_;
+}
+
+TargetIdentity* TargetIdentity::default_instance_ = NULL;
+
+TargetIdentity* TargetIdentity::New() const {
+  return new TargetIdentity;
+}
+
+void TargetIdentity::Clear() {
+  if (_has_bits_[0 / 32] & 3) {
+    if (has_account()) {
+      if (account_ != NULL) account_->::bgs::protocol::account::v1::AccountId::Clear();
+    }
+    if (has_game_account()) {
+      if (game_account_ != NULL) game_account_->::bgs::protocol::account::v1::GameAccountHandle::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool TargetIdentity::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:bgs.protocol.notification.v1.TargetIdentity)
+  for (;;) {
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .bgs.protocol.account.v1.AccountId account = 1;
+      case 1: {
+        if (tag == 10) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_account()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(18)) goto parse_game_account;
+        break;
+      }
+
+      // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2;
+      case 2: {
+        if (tag == 18) {
+         parse_game_account:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_game_account()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectAtEnd()) goto success;
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0 ||
+            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:bgs.protocol.notification.v1.TargetIdentity)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:bgs.protocol.notification.v1.TargetIdentity)
+  return false;
+#undef DO_
+}
+
+void TargetIdentity::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:bgs.protocol.notification.v1.TargetIdentity)
+  // optional .bgs.protocol.account.v1.AccountId account = 1;
+  if (has_account()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->account(), output);
+  }
+
+  // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2;
+  if (has_game_account()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->game_account(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:bgs.protocol.notification.v1.TargetIdentity)
+}
+
+::google::protobuf::uint8* TargetIdentity::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.notification.v1.TargetIdentity)
+  // optional .bgs.protocol.account.v1.AccountId account = 1;
+  if (has_account()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->account(), target);
+  }
+
+  // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2;
+  if (has_game_account()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->game_account(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.notification.v1.TargetIdentity)
+  return target;
+}
+
+int TargetIdentity::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .bgs.protocol.account.v1.AccountId account = 1;
+    if (has_account()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->account());
+    }
+
+    // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2;
+    if (has_game_account()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->game_account());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TargetIdentity::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const TargetIdentity* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TargetIdentity*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void TargetIdentity::MergeFrom(const TargetIdentity& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_account()) {
+      mutable_account()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.account());
+    }
+    if (from.has_game_account()) {
+      mutable_game_account()->::bgs::protocol::account::v1::GameAccountHandle::MergeFrom(from.game_account());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void TargetIdentity::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void TargetIdentity::CopyFrom(const TargetIdentity& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool TargetIdentity::IsInitialized() const {
+
+  if (has_account()) {
+    if (!this->account().IsInitialized()) return false;
+  }
+  if (has_game_account()) {
+    if (!this->game_account().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void TargetIdentity::Swap(TargetIdentity* other) {
+  if (other != this) {
+    std::swap(account_, other->account_);
+    std::swap(game_account_, other->game_account_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata TargetIdentity::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = TargetIdentity_descriptor_;
+  metadata.reflection = TargetIdentity_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int Subscription::kTargetFieldNumber;
 const int Subscription::kSubscriberFieldNumber;
 const int Subscription::kDeliveryRequiredFieldNumber;
@@ -586,7 +893,7 @@ bool Subscription::MergePartialFromCodedStream(
         break;
       }
 
-      // optional bool delivery_required = 3 [default = false];
+      // optional bool delivery_required = 3 [deprecated = true];
       case 3: {
         if (tag == 24) {
          parse_delivery_required:
@@ -638,7 +945,7 @@ void Subscription::SerializeWithCachedSizes(
       2, this->subscriber(), output);
   }
 
-  // optional bool delivery_required = 3 [default = false];
+  // optional bool delivery_required = 3 [deprecated = true];
   if (has_delivery_required()) {
     ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->delivery_required(), output);
   }
@@ -667,7 +974,7 @@ void Subscription::SerializeWithCachedSizes(
         2, this->subscriber(), target);
   }
 
-  // optional bool delivery_required = 3 [default = false];
+  // optional bool delivery_required = 3 [deprecated = true];
   if (has_delivery_required()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->delivery_required(), target);
   }
@@ -691,7 +998,7 @@ int Subscription::ByteSize() const {
           this->subscriber());
     }
 
-    // optional bool delivery_required = 3 [default = false];
+    // optional bool delivery_required = 3 [deprecated = true];
     if (has_delivery_required()) {
       total_size += 1 + 1;
     }
@@ -794,7 +1101,6 @@ const int Notification::kSenderAccountIdFieldNumber;
 const int Notification::kTargetAccountIdFieldNumber;
 const int Notification::kSenderBattleTagFieldNumber;
 const int Notification::kTargetBattleTagFieldNumber;
-const int Notification::kPeerFieldNumber;
 const int Notification::kForwardingIdentityFieldNumber;
 #endif  // !_MSC_VER
 
@@ -809,7 +1115,6 @@ void Notification::InitAsDefaultInstance() {
   target_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
   sender_account_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
   target_account_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-  peer_ = const_cast< ::bgs::protocol::ProcessId*>(&::bgs::protocol::ProcessId::default_instance());
   forwarding_identity_ = const_cast< ::bgs::protocol::account::v1::Identity*>(&::bgs::protocol::account::v1::Identity::default_instance());
 }
 
@@ -830,7 +1135,6 @@ void Notification::SharedCtor() {
   target_account_id_ = NULL;
   sender_battle_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   target_battle_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  peer_ = NULL;
   forwarding_identity_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -855,7 +1159,6 @@ void Notification::SharedDtor() {
     delete target_id_;
     delete sender_account_id_;
     delete target_account_id_;
-    delete peer_;
     delete forwarding_identity_;
   }
 }
@@ -911,13 +1214,8 @@ void Notification::Clear() {
       }
     }
   }
-  if (_has_bits_[8 / 32] & 768) {
-    if (has_peer()) {
-      if (peer_ != NULL) peer_->::bgs::protocol::ProcessId::Clear();
-    }
-    if (has_forwarding_identity()) {
-      if (forwarding_identity_ != NULL) forwarding_identity_->::bgs::protocol::account::v1::Identity::Clear();
-    }
+  if (has_forwarding_identity()) {
+    if (forwarding_identity_ != NULL) forwarding_identity_->::bgs::protocol::account::v1::Identity::Clear();
   }
   attribute_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -1046,19 +1344,6 @@ bool Notification::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(74)) goto parse_peer;
-        break;
-      }
-
-      // optional .bgs.protocol.ProcessId peer = 9;
-      case 9: {
-        if (tag == 74) {
-         parse_peer:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_peer()));
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectTag(82)) goto parse_forwarding_identity;
         break;
       }
@@ -1161,12 +1446,6 @@ void Notification::SerializeWithCachedSizes(
       8, this->target_battle_tag(), output);
   }
 
-  // optional .bgs.protocol.ProcessId peer = 9;
-  if (has_peer()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->peer(), output);
-  }
-
   // optional .bgs.protocol.account.v1.Identity forwarding_identity = 10;
   if (has_forwarding_identity()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
@@ -1251,13 +1530,6 @@ void Notification::SerializeWithCachedSizes(
         8, this->target_battle_tag(), target);
   }
 
-  // optional .bgs.protocol.ProcessId peer = 9;
-  if (has_peer()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        9, this->peer(), target);
-  }
-
   // optional .bgs.protocol.account.v1.Identity forwarding_identity = 10;
   if (has_forwarding_identity()) {
     target = ::google::protobuf::internal::WireFormatLite::
@@ -1328,13 +1600,6 @@ int Notification::ByteSize() const {
 
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // optional .bgs.protocol.ProcessId peer = 9;
-    if (has_peer()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->peer());
-    }
-
     // optional .bgs.protocol.account.v1.Identity forwarding_identity = 10;
     if (has_forwarding_identity()) {
       total_size += 1 +
@@ -1401,9 +1666,6 @@ void Notification::MergeFrom(const Notification& from) {
     }
   }
   if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_peer()) {
-      mutable_peer()->::bgs::protocol::ProcessId::MergeFrom(from.peer());
-    }
     if (from.has_forwarding_identity()) {
       mutable_forwarding_identity()->::bgs::protocol::account::v1::Identity::MergeFrom(from.forwarding_identity());
     }
@@ -1439,9 +1701,6 @@ bool Notification::IsInitialized() const {
   if (has_target_account_id()) {
     if (!this->target_account_id().IsInitialized()) return false;
   }
-  if (has_peer()) {
-    if (!this->peer().IsInitialized()) return false;
-  }
   if (has_forwarding_identity()) {
     if (!this->forwarding_identity().IsInitialized()) return false;
   }
@@ -1458,7 +1717,6 @@ void Notification::Swap(Notification* other) {
     std::swap(target_account_id_, other->target_account_id_);
     std::swap(sender_battle_tag_, other->sender_battle_tag_);
     std::swap(target_battle_tag_, other->target_battle_tag_);
-    std::swap(peer_, other->peer_);
     std::swap(forwarding_identity_, other->forwarding_identity_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
diff --git a/src/server/proto/Client/notification_types.pb.h b/src/server/proto/Client/notification_types.pb.h
index 8bbda74f86f..8c697e3440d 100644
--- a/src/server/proto/Client/notification_types.pb.h
+++ b/src/server/proto/Client/notification_types.pb.h
@@ -42,6 +42,7 @@ void protobuf_AssignDesc_notification_5ftypes_2eproto();
 void protobuf_ShutdownFile_notification_5ftypes_2eproto();
 
 class Target;
+class TargetIdentity;
 class Subscription;
 class Notification;
 
@@ -100,14 +101,14 @@ class TC_PROTO_API Target : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // optional .bgs.protocol.account.v1.Identity identity = 1;
+  // optional .bgs.protocol.notification.v1.TargetIdentity identity = 1;
   inline bool has_identity() const;
   inline void clear_identity();
   static const int kIdentityFieldNumber = 1;
-  inline const ::bgs::protocol::account::v1::Identity& identity() const;
-  inline ::bgs::protocol::account::v1::Identity* mutable_identity();
-  inline ::bgs::protocol::account::v1::Identity* release_identity();
-  inline void set_allocated_identity(::bgs::protocol::account::v1::Identity* identity);
+  inline const ::bgs::protocol::notification::v1::TargetIdentity& identity() const;
+  inline ::bgs::protocol::notification::v1::TargetIdentity* mutable_identity();
+  inline ::bgs::protocol::notification::v1::TargetIdentity* release_identity();
+  inline void set_allocated_identity(::bgs::protocol::notification::v1::TargetIdentity* identity);
 
   // optional string type = 2;
   inline bool has_type() const;
@@ -132,7 +133,7 @@ class TC_PROTO_API Target : public ::google::protobuf::Message {
 
   ::google::protobuf::uint32 _has_bits_[1];
   mutable int _cached_size_;
-  ::bgs::protocol::account::v1::Identity* identity_;
+  ::bgs::protocol::notification::v1::TargetIdentity* identity_;
   ::std::string* type_;
   friend void TC_PROTO_API protobuf_AddDesc_notification_5ftypes_2eproto();
   friend void protobuf_AssignDesc_notification_5ftypes_2eproto();
@@ -143,6 +144,99 @@ class TC_PROTO_API Target : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class TC_PROTO_API TargetIdentity : public ::google::protobuf::Message {
+ public:
+  TargetIdentity();
+  virtual ~TargetIdentity();
+
+  TargetIdentity(const TargetIdentity& from);
+
+  inline TargetIdentity& operator=(const TargetIdentity& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const TargetIdentity& default_instance();
+
+  void Swap(TargetIdentity* other);
+
+  // implements Message ----------------------------------------------
+
+  TargetIdentity* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const TargetIdentity& from);
+  void MergeFrom(const TargetIdentity& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .bgs.protocol.account.v1.AccountId account = 1;
+  inline bool has_account() const;
+  inline void clear_account();
+  static const int kAccountFieldNumber = 1;
+  inline const ::bgs::protocol::account::v1::AccountId& account() const;
+  inline ::bgs::protocol::account::v1::AccountId* mutable_account();
+  inline ::bgs::protocol::account::v1::AccountId* release_account();
+  inline void set_allocated_account(::bgs::protocol::account::v1::AccountId* account);
+
+  // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2;
+  inline bool has_game_account() const;
+  inline void clear_game_account();
+  static const int kGameAccountFieldNumber = 2;
+  inline const ::bgs::protocol::account::v1::GameAccountHandle& game_account() const;
+  inline ::bgs::protocol::account::v1::GameAccountHandle* mutable_game_account();
+  inline ::bgs::protocol::account::v1::GameAccountHandle* release_game_account();
+  inline void set_allocated_game_account(::bgs::protocol::account::v1::GameAccountHandle* game_account);
+
+  // @@protoc_insertion_point(class_scope:bgs.protocol.notification.v1.TargetIdentity)
+ private:
+  inline void set_has_account();
+  inline void clear_has_account();
+  inline void set_has_game_account();
+  inline void clear_has_game_account();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
+  ::bgs::protocol::account::v1::AccountId* account_;
+  ::bgs::protocol::account::v1::GameAccountHandle* game_account_;
+  friend void TC_PROTO_API protobuf_AddDesc_notification_5ftypes_2eproto();
+  friend void protobuf_AssignDesc_notification_5ftypes_2eproto();
+  friend void protobuf_ShutdownFile_notification_5ftypes_2eproto();
+
+  void InitAsDefaultInstance();
+  static TargetIdentity* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class TC_PROTO_API Subscription : public ::google::protobuf::Message {
  public:
   Subscription();
@@ -217,12 +311,12 @@ class TC_PROTO_API Subscription : public ::google::protobuf::Message {
   inline ::bgs::protocol::account::v1::Identity* release_subscriber();
   inline void set_allocated_subscriber(::bgs::protocol::account::v1::Identity* subscriber);
 
-  // optional bool delivery_required = 3 [default = false];
-  inline bool has_delivery_required() const;
-  inline void clear_delivery_required();
+  // optional bool delivery_required = 3 [deprecated = true];
+  inline bool has_delivery_required() const PROTOBUF_DEPRECATED;
+  inline void clear_delivery_required() PROTOBUF_DEPRECATED;
   static const int kDeliveryRequiredFieldNumber = 3;
-  inline bool delivery_required() const;
-  inline void set_delivery_required(bool value);
+  inline bool delivery_required() const PROTOBUF_DEPRECATED;
+  inline void set_delivery_required(bool value) PROTOBUF_DEPRECATED;
 
   // @@protoc_insertion_point(class_scope:bgs.protocol.notification.v1.Subscription)
  private:
@@ -384,15 +478,6 @@ class TC_PROTO_API Notification : public ::google::protobuf::Message {
   inline ::std::string* release_target_battle_tag();
   inline void set_allocated_target_battle_tag(::std::string* target_battle_tag);
 
-  // optional .bgs.protocol.ProcessId peer = 9;
-  inline bool has_peer() const;
-  inline void clear_peer();
-  static const int kPeerFieldNumber = 9;
-  inline const ::bgs::protocol::ProcessId& peer() const;
-  inline ::bgs::protocol::ProcessId* mutable_peer();
-  inline ::bgs::protocol::ProcessId* release_peer();
-  inline void set_allocated_peer(::bgs::protocol::ProcessId* peer);
-
   // optional .bgs.protocol.account.v1.Identity forwarding_identity = 10;
   inline bool has_forwarding_identity() const;
   inline void clear_forwarding_identity();
@@ -418,8 +503,6 @@ class TC_PROTO_API Notification : public ::google::protobuf::Message {
   inline void clear_has_sender_battle_tag();
   inline void set_has_target_battle_tag();
   inline void clear_has_target_battle_tag();
-  inline void set_has_peer();
-  inline void clear_has_peer();
   inline void set_has_forwarding_identity();
   inline void clear_has_forwarding_identity();
 
@@ -435,7 +518,6 @@ class TC_PROTO_API Notification : public ::google::protobuf::Message {
   ::bgs::protocol::EntityId* target_account_id_;
   ::std::string* sender_battle_tag_;
   ::std::string* target_battle_tag_;
-  ::bgs::protocol::ProcessId* peer_;
   ::bgs::protocol::account::v1::Identity* forwarding_identity_;
   friend void TC_PROTO_API protobuf_AddDesc_notification_5ftypes_2eproto();
   friend void protobuf_AssignDesc_notification_5ftypes_2eproto();
@@ -454,7 +536,7 @@ class TC_PROTO_API Notification : public ::google::protobuf::Message {
 
 // Target
 
-// optional .bgs.protocol.account.v1.Identity identity = 1;
+// optional .bgs.protocol.notification.v1.TargetIdentity identity = 1;
 inline bool Target::has_identity() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -465,26 +547,26 @@ inline void Target::clear_has_identity() {
   _has_bits_[0] &= ~0x00000001u;
 }
 inline void Target::clear_identity() {
-  if (identity_ != NULL) identity_->::bgs::protocol::account::v1::Identity::Clear();
+  if (identity_ != NULL) identity_->::bgs::protocol::notification::v1::TargetIdentity::Clear();
   clear_has_identity();
 }
-inline const ::bgs::protocol::account::v1::Identity& Target::identity() const {
+inline const ::bgs::protocol::notification::v1::TargetIdentity& Target::identity() const {
   // @@protoc_insertion_point(field_get:bgs.protocol.notification.v1.Target.identity)
   return identity_ != NULL ? *identity_ : *default_instance_->identity_;
 }
-inline ::bgs::protocol::account::v1::Identity* Target::mutable_identity() {
+inline ::bgs::protocol::notification::v1::TargetIdentity* Target::mutable_identity() {
   set_has_identity();
-  if (identity_ == NULL) identity_ = new ::bgs::protocol::account::v1::Identity;
+  if (identity_ == NULL) identity_ = new ::bgs::protocol::notification::v1::TargetIdentity;
   // @@protoc_insertion_point(field_mutable:bgs.protocol.notification.v1.Target.identity)
   return identity_;
 }
-inline ::bgs::protocol::account::v1::Identity* Target::release_identity() {
+inline ::bgs::protocol::notification::v1::TargetIdentity* Target::release_identity() {
   clear_has_identity();
-  ::bgs::protocol::account::v1::Identity* temp = identity_;
+  ::bgs::protocol::notification::v1::TargetIdentity* temp = identity_;
   identity_ = NULL;
   return temp;
 }
-inline void Target::set_allocated_identity(::bgs::protocol::account::v1::Identity* identity) {
+inline void Target::set_allocated_identity(::bgs::protocol::notification::v1::TargetIdentity* identity) {
   delete identity_;
   identity_ = identity;
   if (identity) {
@@ -573,6 +655,92 @@ inline void Target::set_allocated_type(::std::string* type) {
 
 // -------------------------------------------------------------------
 
+// TargetIdentity
+
+// optional .bgs.protocol.account.v1.AccountId account = 1;
+inline bool TargetIdentity::has_account() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TargetIdentity::set_has_account() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TargetIdentity::clear_has_account() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TargetIdentity::clear_account() {
+  if (account_ != NULL) account_->::bgs::protocol::account::v1::AccountId::Clear();
+  clear_has_account();
+}
+inline const ::bgs::protocol::account::v1::AccountId& TargetIdentity::account() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.notification.v1.TargetIdentity.account)
+  return account_ != NULL ? *account_ : *default_instance_->account_;
+}
+inline ::bgs::protocol::account::v1::AccountId* TargetIdentity::mutable_account() {
+  set_has_account();
+  if (account_ == NULL) account_ = new ::bgs::protocol::account::v1::AccountId;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.notification.v1.TargetIdentity.account)
+  return account_;
+}
+inline ::bgs::protocol::account::v1::AccountId* TargetIdentity::release_account() {
+  clear_has_account();
+  ::bgs::protocol::account::v1::AccountId* temp = account_;
+  account_ = NULL;
+  return temp;
+}
+inline void TargetIdentity::set_allocated_account(::bgs::protocol::account::v1::AccountId* account) {
+  delete account_;
+  account_ = account;
+  if (account) {
+    set_has_account();
+  } else {
+    clear_has_account();
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.notification.v1.TargetIdentity.account)
+}
+
+// optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2;
+inline bool TargetIdentity::has_game_account() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TargetIdentity::set_has_game_account() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TargetIdentity::clear_has_game_account() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TargetIdentity::clear_game_account() {
+  if (game_account_ != NULL) game_account_->::bgs::protocol::account::v1::GameAccountHandle::Clear();
+  clear_has_game_account();
+}
+inline const ::bgs::protocol::account::v1::GameAccountHandle& TargetIdentity::game_account() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.notification.v1.TargetIdentity.game_account)
+  return game_account_ != NULL ? *game_account_ : *default_instance_->game_account_;
+}
+inline ::bgs::protocol::account::v1::GameAccountHandle* TargetIdentity::mutable_game_account() {
+  set_has_game_account();
+  if (game_account_ == NULL) game_account_ = new ::bgs::protocol::account::v1::GameAccountHandle;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.notification.v1.TargetIdentity.game_account)
+  return game_account_;
+}
+inline ::bgs::protocol::account::v1::GameAccountHandle* TargetIdentity::release_game_account() {
+  clear_has_game_account();
+  ::bgs::protocol::account::v1::GameAccountHandle* temp = game_account_;
+  game_account_ = NULL;
+  return temp;
+}
+inline void TargetIdentity::set_allocated_game_account(::bgs::protocol::account::v1::GameAccountHandle* game_account) {
+  delete game_account_;
+  game_account_ = game_account;
+  if (game_account) {
+    set_has_game_account();
+  } else {
+    clear_has_game_account();
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.notification.v1.TargetIdentity.game_account)
+}
+
+// -------------------------------------------------------------------
+
 // Subscription
 
 // repeated .bgs.protocol.notification.v1.Target target = 1;
@@ -646,7 +814,7 @@ inline void Subscription::set_allocated_subscriber(::bgs::protocol::account::v1:
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.notification.v1.Subscription.subscriber)
 }
 
-// optional bool delivery_required = 3 [default = false];
+// optional bool delivery_required = 3 [deprecated = true];
 inline bool Subscription::has_delivery_required() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -1096,56 +1264,15 @@ inline void Notification::set_allocated_target_battle_tag(::std::string* target_
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.notification.v1.Notification.target_battle_tag)
 }
 
-// optional .bgs.protocol.ProcessId peer = 9;
-inline bool Notification::has_peer() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
-}
-inline void Notification::set_has_peer() {
-  _has_bits_[0] |= 0x00000100u;
-}
-inline void Notification::clear_has_peer() {
-  _has_bits_[0] &= ~0x00000100u;
-}
-inline void Notification::clear_peer() {
-  if (peer_ != NULL) peer_->::bgs::protocol::ProcessId::Clear();
-  clear_has_peer();
-}
-inline const ::bgs::protocol::ProcessId& Notification::peer() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.notification.v1.Notification.peer)
-  return peer_ != NULL ? *peer_ : *default_instance_->peer_;
-}
-inline ::bgs::protocol::ProcessId* Notification::mutable_peer() {
-  set_has_peer();
-  if (peer_ == NULL) peer_ = new ::bgs::protocol::ProcessId;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.notification.v1.Notification.peer)
-  return peer_;
-}
-inline ::bgs::protocol::ProcessId* Notification::release_peer() {
-  clear_has_peer();
-  ::bgs::protocol::ProcessId* temp = peer_;
-  peer_ = NULL;
-  return temp;
-}
-inline void Notification::set_allocated_peer(::bgs::protocol::ProcessId* peer) {
-  delete peer_;
-  peer_ = peer;
-  if (peer) {
-    set_has_peer();
-  } else {
-    clear_has_peer();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.notification.v1.Notification.peer)
-}
-
 // optional .bgs.protocol.account.v1.Identity forwarding_identity = 10;
 inline bool Notification::has_forwarding_identity() const {
-  return (_has_bits_[0] & 0x00000200u) != 0;
+  return (_has_bits_[0] & 0x00000100u) != 0;
 }
 inline void Notification::set_has_forwarding_identity() {
-  _has_bits_[0] |= 0x00000200u;
+  _has_bits_[0] |= 0x00000100u;
 }
 inline void Notification::clear_has_forwarding_identity() {
-  _has_bits_[0] &= ~0x00000200u;
+  _has_bits_[0] &= ~0x00000100u;
 }
 inline void Notification::clear_forwarding_identity() {
   if (forwarding_identity_ != NULL) forwarding_identity_->::bgs::protocol::account::v1::Identity::Clear();
diff --git a/src/server/proto/Client/presence_listener.pb.cc b/src/server/proto/Client/presence_listener.pb.cc
index 7b997d52be8..2f35f03afca 100644
--- a/src/server/proto/Client/presence_listener.pb.cc
+++ b/src/server/proto/Client/presence_listener.pb.cc
@@ -123,15 +123,15 @@ void protobuf_AddDesc_presence_5flistener_2eproto() {
     "resenceState\"\215\001\n\030StateChangedNotificatio"
     "n\0229\n\rsubscriber_id\030\001 \001(\0132\".bgs.protocol."
     "account.v1.AccountId\0226\n\005state\030\002 \003(\0132\'.bg"
-    "s.protocol.presence.v1.PresenceState2\226\002\n"
-    "\020PresenceListener\022a\n\013OnSubscribe\022/.bgs.p"
+    "s.protocol.presence.v1.PresenceState2\232\002\n"
+    "\020PresenceListener\022c\n\013OnSubscribe\022/.bgs.p"
     "rotocol.presence.v1.SubscribeNotificatio"
-    "n\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\001\022g\n\016"
-    "OnStateChanged\0222.bgs.protocol.presence.v"
-    "1.StateChangedNotification\032\031.bgs.protoco"
-    "l.NO_RESPONSE\"\006\202\371+\002\010\002\0326\202\371+,\n*bnet.protoc"
-    "ol.presence.v1.PresenceListener\212\371+\002\010\001B\002H"
-    "\001", 681);
+    "n\032\031.bgs.protocol.NO_RESPONSE\"\010\202\371+\004\010\0018\001\022i"
+    "\n\016OnStateChanged\0222.bgs.protocol.presence"
+    ".v1.StateChangedNotification\032\031.bgs.proto"
+    "col.NO_RESPONSE\"\010\202\371+\004\010\0028\001\0326\202\371+,\n*bnet.pr"
+    "otocol.presence.v1.PresenceListener\212\371+\002\010"
+    "\001B\002H\001", 685);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "presence_listener.proto", &protobuf_RegisterTypes);
   SubscribeNotification::default_instance_ = new SubscribeNotification();
diff --git a/src/server/proto/Client/presence_service.pb.cc b/src/server/proto/Client/presence_service.pb.cc
index ba3a9918b15..64339b56b7a 100644
--- a/src/server/proto/Client/presence_service.pb.cc
+++ b/src/server/proto/Client/presence_service.pb.cc
@@ -30,9 +30,6 @@ namespace {
 const ::google::protobuf::Descriptor* SubscribeRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   SubscribeRequest_reflection_ = NULL;
-const ::google::protobuf::Descriptor* SubscribeNotificationRequest_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  SubscribeNotificationRequest_reflection_ = NULL;
 const ::google::protobuf::Descriptor* UnsubscribeRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   UnsubscribeRequest_reflection_ = NULL;
@@ -45,9 +42,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* QueryResponse_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   QueryResponse_reflection_ = NULL;
-const ::google::protobuf::Descriptor* OwnershipRequest_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  OwnershipRequest_reflection_ = NULL;
 const ::google::protobuf::Descriptor* BatchSubscribeRequest_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   BatchSubscribeRequest_reflection_ = NULL;
@@ -90,22 +84,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SubscribeRequest));
-  SubscribeNotificationRequest_descriptor_ = file->message_type(1);
-  static const int SubscribeNotificationRequest_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotificationRequest, entity_id_),
-  };
-  SubscribeNotificationRequest_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      SubscribeNotificationRequest_descriptor_,
-      SubscribeNotificationRequest::default_instance_,
-      SubscribeNotificationRequest_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotificationRequest, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotificationRequest, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(SubscribeNotificationRequest));
-  UnsubscribeRequest_descriptor_ = file->message_type(2);
+  UnsubscribeRequest_descriptor_ = file->message_type(1);
   static const int UnsubscribeRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeRequest, entity_id_),
@@ -122,7 +101,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UnsubscribeRequest));
-  UpdateRequest_descriptor_ = file->message_type(3);
+  UpdateRequest_descriptor_ = file->message_type(2);
   static const int UpdateRequest_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateRequest, entity_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateRequest, field_operation_),
@@ -140,7 +119,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UpdateRequest));
-  QueryRequest_descriptor_ = file->message_type(4);
+  QueryRequest_descriptor_ = file->message_type(3);
   static const int QueryRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryRequest, entity_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryRequest, key_),
@@ -157,7 +136,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryRequest));
-  QueryResponse_descriptor_ = file->message_type(5);
+  QueryResponse_descriptor_ = file->message_type(4);
   static const int QueryResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResponse, field_),
   };
@@ -172,23 +151,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryResponse));
-  OwnershipRequest_descriptor_ = file->message_type(6);
-  static const int OwnershipRequest_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OwnershipRequest, entity_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OwnershipRequest, release_ownership_),
-  };
-  OwnershipRequest_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      OwnershipRequest_descriptor_,
-      OwnershipRequest::default_instance_,
-      OwnershipRequest_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OwnershipRequest, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OwnershipRequest, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(OwnershipRequest));
-  BatchSubscribeRequest_descriptor_ = file->message_type(7);
+  BatchSubscribeRequest_descriptor_ = file->message_type(5);
   static const int BatchSubscribeRequest_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BatchSubscribeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BatchSubscribeRequest, entity_id_),
@@ -207,7 +170,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(BatchSubscribeRequest));
-  SubscribeResult_descriptor_ = file->message_type(8);
+  SubscribeResult_descriptor_ = file->message_type(6);
   static const int SubscribeResult_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeResult, entity_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeResult, result_),
@@ -223,7 +186,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SubscribeResult));
-  BatchSubscribeResponse_descriptor_ = file->message_type(9);
+  BatchSubscribeResponse_descriptor_ = file->message_type(7);
   static const int BatchSubscribeResponse_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BatchSubscribeResponse, subscribe_failed_),
   };
@@ -238,7 +201,7 @@ void protobuf_AssignDesc_presence_5fservice_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(BatchSubscribeResponse));
-  BatchUnsubscribeRequest_descriptor_ = file->message_type(10);
+  BatchUnsubscribeRequest_descriptor_ = file->message_type(8);
   static const int BatchUnsubscribeRequest_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BatchUnsubscribeRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BatchUnsubscribeRequest, entity_id_),
@@ -271,8 +234,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     SubscribeRequest_descriptor_, &SubscribeRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    SubscribeNotificationRequest_descriptor_, &SubscribeNotificationRequest::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     UnsubscribeRequest_descriptor_, &UnsubscribeRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     UpdateRequest_descriptor_, &UpdateRequest::default_instance());
@@ -281,8 +242,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     QueryResponse_descriptor_, &QueryResponse::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    OwnershipRequest_descriptor_, &OwnershipRequest::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     BatchSubscribeRequest_descriptor_, &BatchSubscribeRequest::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     SubscribeResult_descriptor_, &SubscribeResult::default_instance());
@@ -297,8 +256,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void protobuf_ShutdownFile_presence_5fservice_2eproto() {
   delete SubscribeRequest::default_instance_;
   delete SubscribeRequest_reflection_;
-  delete SubscribeNotificationRequest::default_instance_;
-  delete SubscribeNotificationRequest_reflection_;
   delete UnsubscribeRequest::default_instance_;
   delete UnsubscribeRequest_reflection_;
   delete UpdateRequest::default_instance_;
@@ -307,8 +264,6 @@ void protobuf_ShutdownFile_presence_5fservice_2eproto() {
   delete QueryRequest_reflection_;
   delete QueryResponse::default_instance_;
   delete QueryResponse_reflection_;
-  delete OwnershipRequest::default_instance_;
-  delete OwnershipRequest_reflection_;
   delete BatchSubscribeRequest::default_instance_;
   delete BatchSubscribeRequest_reflection_;
   delete SubscribeResult::default_instance_;
@@ -331,86 +286,75 @@ void protobuf_AddDesc_presence_5fservice_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\026presence_service.proto\022\030bgs.protocol.p"
     "resence.v1\032\022entity_types.proto\032\024presence"
-    "_types.proto\032\017rpc_types.proto\"\331\001\n\020Subscr"
-    "ibeRequest\022(\n\010agent_id\030\001 \001(\0132\026.bgs.proto"
-    "col.EntityId\022)\n\tentity_id\030\002 \002(\0132\026.bgs.pr"
-    "otocol.EntityId\022\021\n\tobject_id\030\003 \002(\004\022\035\n\007pr"
-    "ogram\030\004 \003(\007B\014\212\371+\010*\006\n\004\010\001\020d\022>\n\003key\030\006 \003(\0132\""
-    ".bgs.protocol.presence.v1.FieldKeyB\r\212\371+\t"
-    "*\007\n\005\010\001\020\364\003\"I\n\034SubscribeNotificationReques"
-    "t\022)\n\tentity_id\030\001 \002(\0132\026.bgs.protocol.Enti"
-    "tyId\"|\n\022UnsubscribeRequest\022(\n\010agent_id\030\001"
-    " \001(\0132\026.bgs.protocol.EntityId\022)\n\tentity_i"
-    "d\030\002 \002(\0132\026.bgs.protocol.EntityId\022\021\n\tobjec"
-    "t_id\030\003 \001(\004\"\272\001\n\rUpdateRequest\022)\n\tentity_i"
-    "d\030\001 \002(\0132\026.bgs.protocol.EntityId\022A\n\017field"
-    "_operation\030\002 \003(\0132(.bgs.protocol.presence"
-    ".v1.FieldOperation\022\021\n\tno_create\030\003 \001(\010\022(\n"
-    "\010agent_id\030\004 \001(\0132\026.bgs.protocol.EntityId\""
-    "\224\001\n\014QueryRequest\022)\n\tentity_id\030\001 \002(\0132\026.bg"
-    "s.protocol.EntityId\022/\n\003key\030\002 \003(\0132\".bgs.p"
-    "rotocol.presence.v1.FieldKey\022(\n\010agent_id"
-    "\030\003 \001(\0132\026.bgs.protocol.EntityId\"\?\n\rQueryR"
-    "esponse\022.\n\005field\030\002 \003(\0132\037.bgs.protocol.pr"
-    "esence.v1.Field\"X\n\020OwnershipRequest\022)\n\te"
-    "ntity_id\030\001 \002(\0132\026.bgs.protocol.EntityId\022\031"
-    "\n\021release_ownership\030\002 \001(\010\"\355\001\n\025BatchSubsc"
-    "ribeRequest\022(\n\010agent_id\030\001 \001(\0132\026.bgs.prot"
-    "ocol.EntityId\0228\n\tentity_id\030\002 \003(\0132\026.bgs.p"
-    "rotocol.EntityIdB\r\212\371+\t*\007\n\005\010\001\020\372\001\022\035\n\007progr"
-    "am\030\003 \003(\007B\014\212\371+\010*\006\n\004\010\001\020d\022>\n\003key\030\004 \003(\0132\".bg"
-    "s.protocol.presence.v1.FieldKeyB\r\212\371+\t*\007\n"
-    "\005\010\001\020\364\003\022\021\n\tobject_id\030\005 \001(\004\"L\n\017SubscribeRe"
-    "sult\022)\n\tentity_id\030\001 \001(\0132\026.bgs.protocol.E"
-    "ntityId\022\016\n\006result\030\002 \001(\r\"]\n\026BatchSubscrib"
-    "eResponse\022C\n\020subscribe_failed\030\001 \003(\0132).bg"
-    "s.protocol.presence.v1.SubscribeResult\"\220"
-    "\001\n\027BatchUnsubscribeRequest\022(\n\010agent_id\030\001"
-    " \001(\0132\026.bgs.protocol.EntityId\0228\n\tentity_i"
-    "d\030\002 \003(\0132\026.bgs.protocol.EntityIdB\r\212\371+\t*\007\n"
-    "\005\010\001\020\372\001\022\021\n\tobject_id\030\003 \001(\0042\334\006\n\017PresenceSe"
-    "rvice\022U\n\tSubscribe\022*.bgs.protocol.presen"
-    "ce.v1.SubscribeRequest\032\024.bgs.protocol.No"
-    "Data\"\006\202\371+\002\010\001\022Y\n\013Unsubscribe\022,.bgs.protoc"
-    "ol.presence.v1.UnsubscribeRequest\032\024.bgs."
-    "protocol.NoData\"\006\202\371+\002\010\002\022O\n\006Update\022\'.bgs."
-    "protocol.presence.v1.UpdateRequest\032\024.bgs"
-    ".protocol.NoData\"\006\202\371+\002\010\003\022`\n\005Query\022&.bgs."
-    "protocol.presence.v1.QueryRequest\032\'.bgs."
-    "protocol.presence.v1.QueryResponse\"\006\202\371+\002"
-    "\010\004\022U\n\tOwnership\022*.bgs.protocol.presence."
-    "v1.OwnershipRequest\032\024.bgs.protocol.NoDat"
-    "a\"\006\202\371+\002\010\005\022m\n\025SubscribeNotification\0226.bgs"
-    ".protocol.presence.v1.SubscribeNotificat"
-    "ionRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\007"
-    "\022{\n\016BatchSubscribe\022/.bgs.protocol.presen"
-    "ce.v1.BatchSubscribeRequest\0320.bgs.protoc"
-    "ol.presence.v1.BatchSubscribeResponse\"\006\202"
-    "\371+\002\010\010\022c\n\020BatchUnsubscribe\0221.bgs.protocol"
-    ".presence.v1.BatchUnsubscribeRequest\032\024.b"
-    "gs.protocol.NoData\"\006\202\371+\002\010\t\032<\202\371+2\n&bnet.p"
-    "rotocol.presence.PresenceService*\010presen"
-    "ce\212\371+\002\020\001B\005H\001\200\001\000", 2455);
+    "_types.proto\032\017rpc_types.proto\"\341\001\n\020Subscr"
+    "ibeRequest\0220\n\010agent_id\030\001 \001(\0132\026.bgs.proto"
+    "col.EntityIdB\006\202\371+\002 \001\022)\n\tentity_id\030\002 \002(\0132"
+    "\026.bgs.protocol.EntityId\022\021\n\tobject_id\030\003 \002"
+    "(\004\022\035\n\007program\030\004 \003(\007B\014\212\371+\010*\006\n\004\010\000\020d\022>\n\003key"
+    "\030\006 \003(\0132\".bgs.protocol.presence.v1.FieldK"
+    "eyB\r\212\371+\t*\007\n\005\010\000\020\364\003\"\204\001\n\022UnsubscribeRequest"
+    "\0220\n\010agent_id\030\001 \001(\0132\026.bgs.protocol.Entity"
+    "IdB\006\202\371+\002 \001\022)\n\tentity_id\030\002 \002(\0132\026.bgs.prot"
+    "ocol.EntityId\022\021\n\tobject_id\030\003 \001(\004\"\302\001\n\rUpd"
+    "ateRequest\022)\n\tentity_id\030\001 \002(\0132\026.bgs.prot"
+    "ocol.EntityId\022A\n\017field_operation\030\002 \003(\0132("
+    ".bgs.protocol.presence.v1.FieldOperation"
+    "\022\021\n\tno_create\030\003 \001(\010\0220\n\010agent_id\030\004 \001(\0132\026."
+    "bgs.protocol.EntityIdB\006\202\371+\002 \001\"\252\001\n\014QueryR"
+    "equest\022)\n\tentity_id\030\001 \002(\0132\026.bgs.protocol"
+    ".EntityId\022=\n\003key\030\002 \003(\0132\".bgs.protocol.pr"
+    "esence.v1.FieldKeyB\014\212\371+\010*\006\n\004\010\000\020d\0220\n\010agen"
+    "t_id\030\003 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371+\002"
+    " \001\"\?\n\rQueryResponse\022.\n\005field\030\002 \003(\0132\037.bgs"
+    ".protocol.presence.v1.Field\"\365\001\n\025BatchSub"
+    "scribeRequest\0220\n\010agent_id\030\001 \001(\0132\026.bgs.pr"
+    "otocol.EntityIdB\006\202\371+\002 \001\0228\n\tentity_id\030\002 \003"
+    "(\0132\026.bgs.protocol.EntityIdB\r\212\371+\t*\007\n\005\010\001\020\372"
+    "\001\022\035\n\007program\030\003 \003(\007B\014\212\371+\010*\006\n\004\010\000\020d\022>\n\003key\030"
+    "\004 \003(\0132\".bgs.protocol.presence.v1.FieldKe"
+    "yB\r\212\371+\t*\007\n\005\010\000\020\364\003\022\021\n\tobject_id\030\005 \001(\004\"L\n\017S"
+    "ubscribeResult\022)\n\tentity_id\030\001 \001(\0132\026.bgs."
+    "protocol.EntityId\022\016\n\006result\030\002 \001(\r\"]\n\026Bat"
+    "chSubscribeResponse\022C\n\020subscribe_failed\030"
+    "\001 \003(\0132).bgs.protocol.presence.v1.Subscri"
+    "beResult\"\230\001\n\027BatchUnsubscribeRequest\0220\n\010"
+    "agent_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\006"
+    "\202\371+\002 \001\0228\n\tentity_id\030\002 \003(\0132\026.bgs.protocol"
+    ".EntityIdB\r\212\371+\t*\007\n\005\010\001\020\372\001\022\021\n\tobject_id\030\003 "
+    "\001(\0042\257\005\n\017PresenceService\022W\n\tSubscribe\022*.b"
+    "gs.protocol.presence.v1.SubscribeRequest"
+    "\032\024.bgs.protocol.NoData\"\010\202\371+\004\010\001\020\003\022[\n\013Unsu"
+    "bscribe\022,.bgs.protocol.presence.v1.Unsub"
+    "scribeRequest\032\024.bgs.protocol.NoData\"\010\202\371+"
+    "\004\010\002\020\003\022Q\n\006Update\022\'.bgs.protocol.presence."
+    "v1.UpdateRequest\032\024.bgs.protocol.NoData\"\010"
+    "\202\371+\004\010\003\020\003\022b\n\005Query\022&.bgs.protocol.presenc"
+    "e.v1.QueryRequest\032\'.bgs.protocol.presenc"
+    "e.v1.QueryResponse\"\010\202\371+\004\010\004\020\003\022}\n\016BatchSub"
+    "scribe\022/.bgs.protocol.presence.v1.BatchS"
+    "ubscribeRequest\0320.bgs.protocol.presence."
+    "v1.BatchSubscribeResponse\"\010\202\371+\004\010\010\020\003\022e\n\020B"
+    "atchUnsubscribe\0221.bgs.protocol.presence."
+    "v1.BatchUnsubscribeRequest\032\024.bgs.protoco"
+    "l.NoData\"\010\202\371+\004\010\t\020\003\032I\202\371+\?\n&bnet.protocol."
+    "presence.PresenceService*\023presence_aggre"
+    "gator0\001\212\371+\002\020\001B\005H\001\200\001\000", 2180);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "presence_service.proto", &protobuf_RegisterTypes);
   SubscribeRequest::default_instance_ = new SubscribeRequest();
-  SubscribeNotificationRequest::default_instance_ = new SubscribeNotificationRequest();
   UnsubscribeRequest::default_instance_ = new UnsubscribeRequest();
   UpdateRequest::default_instance_ = new UpdateRequest();
   QueryRequest::default_instance_ = new QueryRequest();
   QueryResponse::default_instance_ = new QueryResponse();
-  OwnershipRequest::default_instance_ = new OwnershipRequest();
   BatchSubscribeRequest::default_instance_ = new BatchSubscribeRequest();
   SubscribeResult::default_instance_ = new SubscribeResult();
   BatchSubscribeResponse::default_instance_ = new BatchSubscribeResponse();
   BatchUnsubscribeRequest::default_instance_ = new BatchUnsubscribeRequest();
   SubscribeRequest::default_instance_->InitAsDefaultInstance();
-  SubscribeNotificationRequest::default_instance_->InitAsDefaultInstance();
   UnsubscribeRequest::default_instance_->InitAsDefaultInstance();
   UpdateRequest::default_instance_->InitAsDefaultInstance();
   QueryRequest::default_instance_->InitAsDefaultInstance();
   QueryResponse::default_instance_->InitAsDefaultInstance();
-  OwnershipRequest::default_instance_->InitAsDefaultInstance();
   BatchSubscribeRequest::default_instance_->InitAsDefaultInstance();
   SubscribeResult::default_instance_->InitAsDefaultInstance();
   BatchSubscribeResponse::default_instance_->InitAsDefaultInstance();
@@ -829,237 +773,6 @@ void SubscribeRequest::Swap(SubscribeRequest* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int SubscribeNotificationRequest::kEntityIdFieldNumber;
-#endif  // !_MSC_VER
-
-SubscribeNotificationRequest::SubscribeNotificationRequest()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-}
-
-void SubscribeNotificationRequest::InitAsDefaultInstance() {
-  entity_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-}
-
-SubscribeNotificationRequest::SubscribeNotificationRequest(const SubscribeNotificationRequest& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-}
-
-void SubscribeNotificationRequest::SharedCtor() {
-  _cached_size_ = 0;
-  entity_id_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-SubscribeNotificationRequest::~SubscribeNotificationRequest() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-  SharedDtor();
-}
-
-void SubscribeNotificationRequest::SharedDtor() {
-  if (this != default_instance_) {
-    delete entity_id_;
-  }
-}
-
-void SubscribeNotificationRequest::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* SubscribeNotificationRequest::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return SubscribeNotificationRequest_descriptor_;
-}
-
-const SubscribeNotificationRequest& SubscribeNotificationRequest::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_presence_5fservice_2eproto();
-  return *default_instance_;
-}
-
-SubscribeNotificationRequest* SubscribeNotificationRequest::default_instance_ = NULL;
-
-SubscribeNotificationRequest* SubscribeNotificationRequest::New() const {
-  return new SubscribeNotificationRequest;
-}
-
-void SubscribeNotificationRequest::Clear() {
-  if (has_entity_id()) {
-    if (entity_id_ != NULL) entity_id_->::bgs::protocol::EntityId::Clear();
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool SubscribeNotificationRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .bgs.protocol.EntityId entity_id = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_entity_id()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-  return false;
-#undef DO_
-}
-
-void SubscribeNotificationRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-  // required .bgs.protocol.EntityId entity_id = 1;
-  if (has_entity_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->entity_id(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-}
-
-::google::protobuf::uint8* SubscribeNotificationRequest::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-  // required .bgs.protocol.EntityId entity_id = 1;
-  if (has_entity_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->entity_id(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.presence.v1.SubscribeNotificationRequest)
-  return target;
-}
-
-int SubscribeNotificationRequest::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .bgs.protocol.EntityId entity_id = 1;
-    if (has_entity_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->entity_id());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void SubscribeNotificationRequest::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const SubscribeNotificationRequest* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const SubscribeNotificationRequest*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void SubscribeNotificationRequest::MergeFrom(const SubscribeNotificationRequest& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_entity_id()) {
-      mutable_entity_id()->::bgs::protocol::EntityId::MergeFrom(from.entity_id());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void SubscribeNotificationRequest::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void SubscribeNotificationRequest::CopyFrom(const SubscribeNotificationRequest& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool SubscribeNotificationRequest::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-
-  if (has_entity_id()) {
-    if (!this->entity_id().IsInitialized()) return false;
-  }
-  return true;
-}
-
-void SubscribeNotificationRequest::Swap(SubscribeNotificationRequest* other) {
-  if (other != this) {
-    std::swap(entity_id_, other->entity_id_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata SubscribeNotificationRequest::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = SubscribeNotificationRequest_descriptor_;
-  metadata.reflection = SubscribeNotificationRequest_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
 const int UnsubscribeRequest::kAgentIdFieldNumber;
 const int UnsubscribeRequest::kEntityIdFieldNumber;
 const int UnsubscribeRequest::kObjectIdFieldNumber;
@@ -2276,276 +1989,6 @@ void QueryResponse::Swap(QueryResponse* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int OwnershipRequest::kEntityIdFieldNumber;
-const int OwnershipRequest::kReleaseOwnershipFieldNumber;
-#endif  // !_MSC_VER
-
-OwnershipRequest::OwnershipRequest()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:bgs.protocol.presence.v1.OwnershipRequest)
-}
-
-void OwnershipRequest::InitAsDefaultInstance() {
-  entity_id_ = const_cast< ::bgs::protocol::EntityId*>(&::bgs::protocol::EntityId::default_instance());
-}
-
-OwnershipRequest::OwnershipRequest(const OwnershipRequest& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-  // @@protoc_insertion_point(copy_constructor:bgs.protocol.presence.v1.OwnershipRequest)
-}
-
-void OwnershipRequest::SharedCtor() {
-  _cached_size_ = 0;
-  entity_id_ = NULL;
-  release_ownership_ = false;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-OwnershipRequest::~OwnershipRequest() {
-  // @@protoc_insertion_point(destructor:bgs.protocol.presence.v1.OwnershipRequest)
-  SharedDtor();
-}
-
-void OwnershipRequest::SharedDtor() {
-  if (this != default_instance_) {
-    delete entity_id_;
-  }
-}
-
-void OwnershipRequest::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* OwnershipRequest::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return OwnershipRequest_descriptor_;
-}
-
-const OwnershipRequest& OwnershipRequest::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_presence_5fservice_2eproto();
-  return *default_instance_;
-}
-
-OwnershipRequest* OwnershipRequest::default_instance_ = NULL;
-
-OwnershipRequest* OwnershipRequest::New() const {
-  return new OwnershipRequest;
-}
-
-void OwnershipRequest::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
-    if (has_entity_id()) {
-      if (entity_id_ != NULL) entity_id_->::bgs::protocol::EntityId::Clear();
-    }
-    release_ownership_ = false;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool OwnershipRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.presence.v1.OwnershipRequest)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .bgs.protocol.EntityId entity_id = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_entity_id()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(16)) goto parse_release_ownership;
-        break;
-      }
-
-      // optional bool release_ownership = 2;
-      case 2: {
-        if (tag == 16) {
-         parse_release_ownership:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &release_ownership_)));
-          set_has_release_ownership();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.presence.v1.OwnershipRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.presence.v1.OwnershipRequest)
-  return false;
-#undef DO_
-}
-
-void OwnershipRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.presence.v1.OwnershipRequest)
-  // required .bgs.protocol.EntityId entity_id = 1;
-  if (has_entity_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->entity_id(), output);
-  }
-
-  // optional bool release_ownership = 2;
-  if (has_release_ownership()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->release_ownership(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.presence.v1.OwnershipRequest)
-}
-
-::google::protobuf::uint8* OwnershipRequest::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.presence.v1.OwnershipRequest)
-  // required .bgs.protocol.EntityId entity_id = 1;
-  if (has_entity_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->entity_id(), target);
-  }
-
-  // optional bool release_ownership = 2;
-  if (has_release_ownership()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->release_ownership(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.presence.v1.OwnershipRequest)
-  return target;
-}
-
-int OwnershipRequest::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .bgs.protocol.EntityId entity_id = 1;
-    if (has_entity_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->entity_id());
-    }
-
-    // optional bool release_ownership = 2;
-    if (has_release_ownership()) {
-      total_size += 1 + 1;
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void OwnershipRequest::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const OwnershipRequest* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const OwnershipRequest*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void OwnershipRequest::MergeFrom(const OwnershipRequest& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_entity_id()) {
-      mutable_entity_id()->::bgs::protocol::EntityId::MergeFrom(from.entity_id());
-    }
-    if (from.has_release_ownership()) {
-      set_release_ownership(from.release_ownership());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void OwnershipRequest::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void OwnershipRequest::CopyFrom(const OwnershipRequest& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool OwnershipRequest::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-
-  if (has_entity_id()) {
-    if (!this->entity_id().IsInitialized()) return false;
-  }
-  return true;
-}
-
-void OwnershipRequest::Swap(OwnershipRequest* other) {
-  if (other != this) {
-    std::swap(entity_id_, other->entity_id_);
-    std::swap(release_ownership_, other->release_ownership_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata OwnershipRequest::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = OwnershipRequest_descriptor_;
-  metadata.reflection = OwnershipRequest_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
 const int BatchSubscribeRequest::kAgentIdFieldNumber;
 const int BatchSubscribeRequest::kEntityIdFieldNumber;
 const int BatchSubscribeRequest::kProgramFieldNumber;
@@ -3857,58 +3300,6 @@ void PresenceService::CallServerMethod(uint32 token, uint32 methodId, MessageBuf
         continuation(this, status, &response);
       break;
     }
-    case 5: {
-      ::bgs::protocol::presence::v1::OwnershipRequest request;
-      if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
-        TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for PresenceService.Ownership server method call.", GetCallerInfo().c_str());
-        SendResponse(service_hash_, methodId, token, ERROR_RPC_MALFORMED_REQUEST);
-        return;
-      }
-      TC_LOG_DEBUG("service.protobuf", "%s Client called server method PresenceService.Ownership(bgs.protocol.presence.v1.OwnershipRequest{ %s }).",
-        GetCallerInfo().c_str(), request.ShortDebugString().c_str());
-      std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token, methodId](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response)
-      {
-        ASSERT(response->GetDescriptor() == ::bgs::protocol::NoData::descriptor());
-        PresenceService* self = static_cast<PresenceService*>(service);
-        TC_LOG_DEBUG("service.protobuf", "%s Client called server method PresenceService.Ownership() returned bgs.protocol.NoData{ %s } status %u.",
-          self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status);
-        if (!status)
-          self->SendResponse(self->service_hash_, methodId, token, response);
-        else
-          self->SendResponse(self->service_hash_, methodId, token, status);
-      };
-      ::bgs::protocol::NoData response;
-      uint32 status = HandleOwnership(&request, &response, continuation);
-      if (continuation)
-        continuation(this, status, &response);
-      break;
-    }
-    case 7: {
-      ::bgs::protocol::presence::v1::SubscribeNotificationRequest request;
-      if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
-        TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for PresenceService.SubscribeNotification server method call.", GetCallerInfo().c_str());
-        SendResponse(service_hash_, methodId, token, ERROR_RPC_MALFORMED_REQUEST);
-        return;
-      }
-      TC_LOG_DEBUG("service.protobuf", "%s Client called server method PresenceService.SubscribeNotification(bgs.protocol.presence.v1.SubscribeNotificationRequest{ %s }).",
-        GetCallerInfo().c_str(), request.ShortDebugString().c_str());
-      std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token, methodId](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response)
-      {
-        ASSERT(response->GetDescriptor() == ::bgs::protocol::NoData::descriptor());
-        PresenceService* self = static_cast<PresenceService*>(service);
-        TC_LOG_DEBUG("service.protobuf", "%s Client called server method PresenceService.SubscribeNotification() returned bgs.protocol.NoData{ %s } status %u.",
-          self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status);
-        if (!status)
-          self->SendResponse(self->service_hash_, methodId, token, response);
-        else
-          self->SendResponse(self->service_hash_, methodId, token, status);
-      };
-      ::bgs::protocol::NoData response;
-      uint32 status = HandleSubscribeNotification(&request, &response, continuation);
-      if (continuation)
-        continuation(this, status, &response);
-      break;
-    }
     case 8: {
       ::bgs::protocol::presence::v1::BatchSubscribeRequest request;
       if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
@@ -3992,18 +3383,6 @@ uint32 PresenceService::HandleQuery(::bgs::protocol::presence::v1::QueryRequest
   return ERROR_RPC_NOT_IMPLEMENTED;
 }
 
-uint32 PresenceService::HandleOwnership(::bgs::protocol::presence::v1::OwnershipRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
-  TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method PresenceService.Ownership({ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
-  return ERROR_RPC_NOT_IMPLEMENTED;
-}
-
-uint32 PresenceService::HandleSubscribeNotification(::bgs::protocol::presence::v1::SubscribeNotificationRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
-  TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method PresenceService.SubscribeNotification({ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
-  return ERROR_RPC_NOT_IMPLEMENTED;
-}
-
 uint32 PresenceService::HandleBatchSubscribe(::bgs::protocol::presence::v1::BatchSubscribeRequest const* request, ::bgs::protocol::presence::v1::BatchSubscribeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
   TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method PresenceService.BatchSubscribe({ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
diff --git a/src/server/proto/Client/presence_service.pb.h b/src/server/proto/Client/presence_service.pb.h
index 303e9aeed7c..c3315c0b02e 100644
--- a/src/server/proto/Client/presence_service.pb.h
+++ b/src/server/proto/Client/presence_service.pb.h
@@ -44,12 +44,10 @@ void protobuf_AssignDesc_presence_5fservice_2eproto();
 void protobuf_ShutdownFile_presence_5fservice_2eproto();
 
 class SubscribeRequest;
-class SubscribeNotificationRequest;
 class UnsubscribeRequest;
 class UpdateRequest;
 class QueryRequest;
 class QueryResponse;
-class OwnershipRequest;
 class BatchSubscribeRequest;
 class SubscribeResult;
 class BatchSubscribeResponse;
@@ -186,87 +184,6 @@ class TC_PROTO_API SubscribeRequest : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class TC_PROTO_API SubscribeNotificationRequest : public ::google::protobuf::Message {
- public:
-  SubscribeNotificationRequest();
-  virtual ~SubscribeNotificationRequest();
-
-  SubscribeNotificationRequest(const SubscribeNotificationRequest& from);
-
-  inline SubscribeNotificationRequest& operator=(const SubscribeNotificationRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const SubscribeNotificationRequest& default_instance();
-
-  void Swap(SubscribeNotificationRequest* other);
-
-  // implements Message ----------------------------------------------
-
-  SubscribeNotificationRequest* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const SubscribeNotificationRequest& from);
-  void MergeFrom(const SubscribeNotificationRequest& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // required .bgs.protocol.EntityId entity_id = 1;
-  inline bool has_entity_id() const;
-  inline void clear_entity_id();
-  static const int kEntityIdFieldNumber = 1;
-  inline const ::bgs::protocol::EntityId& entity_id() const;
-  inline ::bgs::protocol::EntityId* mutable_entity_id();
-  inline ::bgs::protocol::EntityId* release_entity_id();
-  inline void set_allocated_entity_id(::bgs::protocol::EntityId* entity_id);
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.presence.v1.SubscribeNotificationRequest)
- private:
-  inline void set_has_entity_id();
-  inline void clear_has_entity_id();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::bgs::protocol::EntityId* entity_id_;
-  friend void TC_PROTO_API protobuf_AddDesc_presence_5fservice_2eproto();
-  friend void protobuf_AssignDesc_presence_5fservice_2eproto();
-  friend void protobuf_ShutdownFile_presence_5fservice_2eproto();
-
-  void InitAsDefaultInstance();
-  static SubscribeNotificationRequest* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class TC_PROTO_API UnsubscribeRequest : public ::google::protobuf::Message {
  public:
   UnsubscribeRequest();
@@ -674,97 +591,6 @@ class TC_PROTO_API QueryResponse : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class TC_PROTO_API OwnershipRequest : public ::google::protobuf::Message {
- public:
-  OwnershipRequest();
-  virtual ~OwnershipRequest();
-
-  OwnershipRequest(const OwnershipRequest& from);
-
-  inline OwnershipRequest& operator=(const OwnershipRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const OwnershipRequest& default_instance();
-
-  void Swap(OwnershipRequest* other);
-
-  // implements Message ----------------------------------------------
-
-  OwnershipRequest* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const OwnershipRequest& from);
-  void MergeFrom(const OwnershipRequest& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // required .bgs.protocol.EntityId entity_id = 1;
-  inline bool has_entity_id() const;
-  inline void clear_entity_id();
-  static const int kEntityIdFieldNumber = 1;
-  inline const ::bgs::protocol::EntityId& entity_id() const;
-  inline ::bgs::protocol::EntityId* mutable_entity_id();
-  inline ::bgs::protocol::EntityId* release_entity_id();
-  inline void set_allocated_entity_id(::bgs::protocol::EntityId* entity_id);
-
-  // optional bool release_ownership = 2;
-  inline bool has_release_ownership() const;
-  inline void clear_release_ownership();
-  static const int kReleaseOwnershipFieldNumber = 2;
-  inline bool release_ownership() const;
-  inline void set_release_ownership(bool value);
-
-  // @@protoc_insertion_point(class_scope:bgs.protocol.presence.v1.OwnershipRequest)
- private:
-  inline void set_has_entity_id();
-  inline void clear_has_entity_id();
-  inline void set_has_release_ownership();
-  inline void clear_has_release_ownership();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::uint32 _has_bits_[1];
-  mutable int _cached_size_;
-  ::bgs::protocol::EntityId* entity_id_;
-  bool release_ownership_;
-  friend void TC_PROTO_API protobuf_AddDesc_presence_5fservice_2eproto();
-  friend void protobuf_AssignDesc_presence_5fservice_2eproto();
-  friend void protobuf_ShutdownFile_presence_5fservice_2eproto();
-
-  void InitAsDefaultInstance();
-  static OwnershipRequest* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class TC_PROTO_API BatchSubscribeRequest : public ::google::protobuf::Message {
  public:
   BatchSubscribeRequest();
@@ -1192,8 +1018,6 @@ class TC_PROTO_API PresenceService : public ServiceBase
   virtual uint32 HandleUnsubscribe(::bgs::protocol::presence::v1::UnsubscribeRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleUpdate(::bgs::protocol::presence::v1::UpdateRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleQuery(::bgs::protocol::presence::v1::QueryRequest const* request, ::bgs::protocol::presence::v1::QueryResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
-  virtual uint32 HandleOwnership(::bgs::protocol::presence::v1::OwnershipRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
-  virtual uint32 HandleSubscribeNotification(::bgs::protocol::presence::v1::SubscribeNotificationRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleBatchSubscribe(::bgs::protocol::presence::v1::BatchSubscribeRequest const* request, ::bgs::protocol::presence::v1::BatchSubscribeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
   virtual uint32 HandleBatchUnsubscribe(::bgs::protocol::presence::v1::BatchUnsubscribeRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
 
@@ -1378,51 +1202,6 @@ SubscribeRequest::mutable_key() {
 
 // -------------------------------------------------------------------
 
-// SubscribeNotificationRequest
-
-// required .bgs.protocol.EntityId entity_id = 1;
-inline bool SubscribeNotificationRequest::has_entity_id() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void SubscribeNotificationRequest::set_has_entity_id() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void SubscribeNotificationRequest::clear_has_entity_id() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void SubscribeNotificationRequest::clear_entity_id() {
-  if (entity_id_ != NULL) entity_id_->::bgs::protocol::EntityId::Clear();
-  clear_has_entity_id();
-}
-inline const ::bgs::protocol::EntityId& SubscribeNotificationRequest::entity_id() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.presence.v1.SubscribeNotificationRequest.entity_id)
-  return entity_id_ != NULL ? *entity_id_ : *default_instance_->entity_id_;
-}
-inline ::bgs::protocol::EntityId* SubscribeNotificationRequest::mutable_entity_id() {
-  set_has_entity_id();
-  if (entity_id_ == NULL) entity_id_ = new ::bgs::protocol::EntityId;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.presence.v1.SubscribeNotificationRequest.entity_id)
-  return entity_id_;
-}
-inline ::bgs::protocol::EntityId* SubscribeNotificationRequest::release_entity_id() {
-  clear_has_entity_id();
-  ::bgs::protocol::EntityId* temp = entity_id_;
-  entity_id_ = NULL;
-  return temp;
-}
-inline void SubscribeNotificationRequest::set_allocated_entity_id(::bgs::protocol::EntityId* entity_id) {
-  delete entity_id_;
-  entity_id_ = entity_id;
-  if (entity_id) {
-    set_has_entity_id();
-  } else {
-    clear_has_entity_id();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.presence.v1.SubscribeNotificationRequest.entity_id)
-}
-
-// -------------------------------------------------------------------
-
 // UnsubscribeRequest
 
 // optional .bgs.protocol.EntityId agent_id = 1;
@@ -1823,75 +1602,6 @@ QueryResponse::mutable_field() {
 
 // -------------------------------------------------------------------
 
-// OwnershipRequest
-
-// required .bgs.protocol.EntityId entity_id = 1;
-inline bool OwnershipRequest::has_entity_id() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void OwnershipRequest::set_has_entity_id() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void OwnershipRequest::clear_has_entity_id() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void OwnershipRequest::clear_entity_id() {
-  if (entity_id_ != NULL) entity_id_->::bgs::protocol::EntityId::Clear();
-  clear_has_entity_id();
-}
-inline const ::bgs::protocol::EntityId& OwnershipRequest::entity_id() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.presence.v1.OwnershipRequest.entity_id)
-  return entity_id_ != NULL ? *entity_id_ : *default_instance_->entity_id_;
-}
-inline ::bgs::protocol::EntityId* OwnershipRequest::mutable_entity_id() {
-  set_has_entity_id();
-  if (entity_id_ == NULL) entity_id_ = new ::bgs::protocol::EntityId;
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.presence.v1.OwnershipRequest.entity_id)
-  return entity_id_;
-}
-inline ::bgs::protocol::EntityId* OwnershipRequest::release_entity_id() {
-  clear_has_entity_id();
-  ::bgs::protocol::EntityId* temp = entity_id_;
-  entity_id_ = NULL;
-  return temp;
-}
-inline void OwnershipRequest::set_allocated_entity_id(::bgs::protocol::EntityId* entity_id) {
-  delete entity_id_;
-  entity_id_ = entity_id;
-  if (entity_id) {
-    set_has_entity_id();
-  } else {
-    clear_has_entity_id();
-  }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.presence.v1.OwnershipRequest.entity_id)
-}
-
-// optional bool release_ownership = 2;
-inline bool OwnershipRequest::has_release_ownership() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void OwnershipRequest::set_has_release_ownership() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void OwnershipRequest::clear_has_release_ownership() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void OwnershipRequest::clear_release_ownership() {
-  release_ownership_ = false;
-  clear_has_release_ownership();
-}
-inline bool OwnershipRequest::release_ownership() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.presence.v1.OwnershipRequest.release_ownership)
-  return release_ownership_;
-}
-inline void OwnershipRequest::set_release_ownership(bool value) {
-  set_has_release_ownership();
-  release_ownership_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.presence.v1.OwnershipRequest.release_ownership)
-}
-
-// -------------------------------------------------------------------
-
 // BatchSubscribeRequest
 
 // optional .bgs.protocol.EntityId agent_id = 1;
diff --git a/src/server/proto/Client/presence_types.pb.cc b/src/server/proto/Client/presence_types.pb.cc
index 216928ea145..504a9eaa118 100644
--- a/src/server/proto/Client/presence_types.pb.cc
+++ b/src/server/proto/Client/presence_types.pb.cc
@@ -213,25 +213,25 @@ void protobuf_AddDesc_presence_5ftypes_2eproto() {
     "types.proto\032\023channel_types.proto\"W\n\033Rich"
     "PresenceLocalizationKey\022\017\n\007program\030\001 \002(\007"
     "\022\016\n\006stream\030\002 \002(\007\022\027\n\017localization_id\030\003 \002("
-    "\r\"O\n\010FieldKey\022\017\n\007program\030\001 \002(\r\022\r\n\005group\030"
-    "\002 \002(\r\022\r\n\005field\030\003 \002(\r\022\024\n\tunique_id\030\004 \001(\004:"
-    "\0010\"^\n\005Field\022/\n\003key\030\001 \002(\0132\".bgs.protocol."
-    "presence.v1.FieldKey\022$\n\005value\030\002 \002(\0132\025.bg"
-    "s.protocol.Variant\"\265\001\n\016FieldOperation\022.\n"
-    "\005field\030\001 \002(\0132\037.bgs.protocol.presence.v1."
-    "Field\022N\n\toperation\030\002 \001(\01626.bgs.protocol."
-    "presence.v1.FieldOperation.OperationType"
-    ":\003SET\"#\n\rOperationType\022\007\n\003SET\020\000\022\t\n\005CLEAR"
-    "\020\001\"}\n\rPresenceState\022)\n\tentity_id\030\001 \001(\0132\026"
-    ".bgs.protocol.EntityId\022A\n\017field_operatio"
-    "n\030\002 \003(\0132(.bgs.protocol.presence.v1.Field"
-    "Operation\"\365\001\n\014ChannelState\022)\n\tentity_id\030"
-    "\001 \001(\0132\026.bgs.protocol.EntityId\022A\n\017field_o"
-    "peration\030\002 \003(\0132(.bgs.protocol.presence.v"
-    "1.FieldOperation\022\026\n\007healing\030\003 \001(\010:\005false"
-    "2_\n\010presence\022%.bgs.protocol.channel.v1.C"
-    "hannelState\030e \001(\0132&.bgs.protocol.presenc"
-    "e.v1.ChannelStateB\002H\001", 941);
+    "\r\"L\n\010FieldKey\022\017\n\007program\030\001 \002(\r\022\r\n\005group\030"
+    "\002 \002(\r\022\r\n\005field\030\003 \002(\r\022\021\n\tunique_id\030\004 \001(\004\""
+    "^\n\005Field\022/\n\003key\030\001 \002(\0132\".bgs.protocol.pre"
+    "sence.v1.FieldKey\022$\n\005value\030\002 \002(\0132\025.bgs.p"
+    "rotocol.Variant\"\265\001\n\016FieldOperation\022.\n\005fi"
+    "eld\030\001 \002(\0132\037.bgs.protocol.presence.v1.Fie"
+    "ld\022N\n\toperation\030\002 \001(\01626.bgs.protocol.pre"
+    "sence.v1.FieldOperation.OperationType:\003S"
+    "ET\"#\n\rOperationType\022\007\n\003SET\020\000\022\t\n\005CLEAR\020\001\""
+    "}\n\rPresenceState\022)\n\tentity_id\030\001 \001(\0132\026.bg"
+    "s.protocol.EntityId\022A\n\017field_operation\030\002"
+    " \003(\0132(.bgs.protocol.presence.v1.FieldOpe"
+    "ration\"\356\001\n\014ChannelState\022)\n\tentity_id\030\001 \001"
+    "(\0132\026.bgs.protocol.EntityId\022A\n\017field_oper"
+    "ation\030\002 \003(\0132(.bgs.protocol.presence.v1.F"
+    "ieldOperation\022\017\n\007healing\030\003 \001(\0102_\n\010presen"
+    "ce\022%.bgs.protocol.channel.v1.ChannelStat"
+    "e\030e \001(\0132&.bgs.protocol.presence.v1.Chann"
+    "elStateB\002H\001", 931);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "presence_types.proto", &protobuf_RegisterTypes);
   RichPresenceLocalizationKey::default_instance_ = new RichPresenceLocalizationKey();
@@ -708,7 +708,7 @@ bool FieldKey::MergePartialFromCodedStream(
         break;
       }
 
-      // optional uint64 unique_id = 4 [default = 0];
+      // optional uint64 unique_id = 4;
       case 4: {
         if (tag == 32) {
          parse_unique_id:
@@ -763,7 +763,7 @@ void FieldKey::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->field(), output);
   }
 
-  // optional uint64 unique_id = 4 [default = 0];
+  // optional uint64 unique_id = 4;
   if (has_unique_id()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->unique_id(), output);
   }
@@ -793,7 +793,7 @@ void FieldKey::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->field(), target);
   }
 
-  // optional uint64 unique_id = 4 [default = 0];
+  // optional uint64 unique_id = 4;
   if (has_unique_id()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->unique_id(), target);
   }
@@ -831,7 +831,7 @@ int FieldKey::ByteSize() const {
           this->field());
     }
 
-    // optional uint64 unique_id = 4 [default = 0];
+    // optional uint64 unique_id = 4;
     if (has_unique_id()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt64Size(
@@ -1887,7 +1887,7 @@ bool ChannelState::MergePartialFromCodedStream(
         break;
       }
 
-      // optional bool healing = 3 [default = false];
+      // optional bool healing = 3;
       case 3: {
         if (tag == 24) {
          parse_healing:
@@ -1939,7 +1939,7 @@ void ChannelState::SerializeWithCachedSizes(
       2, this->field_operation(i), output);
   }
 
-  // optional bool healing = 3 [default = false];
+  // optional bool healing = 3;
   if (has_healing()) {
     ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->healing(), output);
   }
@@ -1968,7 +1968,7 @@ void ChannelState::SerializeWithCachedSizes(
         2, this->field_operation(i), target);
   }
 
-  // optional bool healing = 3 [default = false];
+  // optional bool healing = 3;
   if (has_healing()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->healing(), target);
   }
@@ -1992,7 +1992,7 @@ int ChannelState::ByteSize() const {
           this->entity_id());
     }
 
-    // optional bool healing = 3 [default = false];
+    // optional bool healing = 3;
     if (has_healing()) {
       total_size += 1 + 1;
     }
diff --git a/src/server/proto/Client/presence_types.pb.h b/src/server/proto/Client/presence_types.pb.h
index d7c8457bea9..eb9a1c26a54 100644
--- a/src/server/proto/Client/presence_types.pb.h
+++ b/src/server/proto/Client/presence_types.pb.h
@@ -242,7 +242,7 @@ class TC_PROTO_API FieldKey : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 field() const;
   inline void set_field(::google::protobuf::uint32 value);
 
-  // optional uint64 unique_id = 4 [default = 0];
+  // optional uint64 unique_id = 4;
   inline bool has_unique_id() const;
   inline void clear_unique_id();
   static const int kUniqueIdFieldNumber = 4;
@@ -653,7 +653,7 @@ class TC_PROTO_API ChannelState : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::presence::v1::FieldOperation >*
       mutable_field_operation();
 
-  // optional bool healing = 3 [default = false];
+  // optional bool healing = 3;
   inline bool has_healing() const;
   inline void clear_healing();
   static const int kHealingFieldNumber = 3;
@@ -843,7 +843,7 @@ inline void FieldKey::set_field(::google::protobuf::uint32 value) {
   // @@protoc_insertion_point(field_set:bgs.protocol.presence.v1.FieldKey.field)
 }
 
-// optional uint64 unique_id = 4 [default = 0];
+// optional uint64 unique_id = 4;
 inline bool FieldKey::has_unique_id() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -1173,7 +1173,7 @@ ChannelState::mutable_field_operation() {
   return &field_operation_;
 }
 
-// optional bool healing = 3 [default = false];
+// optional bool healing = 3;
 inline bool ChannelState::has_healing() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
diff --git a/src/server/proto/Client/report_service.pb.cc b/src/server/proto/Client/report_service.pb.cc
index 1994a12e860..8610224fe52 100644
--- a/src/server/proto/Client/report_service.pb.cc
+++ b/src/server/proto/Client/report_service.pb.cc
@@ -45,9 +45,8 @@ void protobuf_AssignDesc_report_5fservice_2eproto() {
       "report_service.proto");
   GOOGLE_CHECK(file != NULL);
   SendReportRequest_descriptor_ = file->message_type(0);
-  static const int SendReportRequest_offsets_[2] = {
+  static const int SendReportRequest_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SendReportRequest, report_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SendReportRequest, program_),
   };
   SendReportRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -61,10 +60,9 @@ void protobuf_AssignDesc_report_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SendReportRequest));
   SubmitReportRequest_descriptor_ = file->message_type(1);
-  static const int SubmitReportRequest_offsets_[3] = {
+  static const int SubmitReportRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubmitReportRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubmitReportRequest, report_type_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubmitReportRequest, program_),
   };
   SubmitReportRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -117,20 +115,19 @@ void protobuf_AddDesc_report_5fservice_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\024report_service.proto\022\026bgs.protocol.rep"
     "ort.v1\032\023account_types.proto\032\022report_type"
-    "s.proto\032\017rpc_types.proto\"\\\n\021SendReportRe"
+    "s.proto\032\017rpc_types.proto\"C\n\021SendReportRe"
     "quest\022.\n\006report\030\001 \002(\0132\036.bgs.protocol.rep"
-    "ort.v1.Report\022\017\n\007program\030\002 \001(\r:\006\202\371+\002\020\001\"\245"
-    "\001\n\023SubmitReportRequest\022<\n\010agent_id\030\001 \001(\013"
-    "2*.bgs.protocol.account.v1.GameAccountHa"
-    "ndle\0227\n\013report_type\030\002 \001(\0132\".bgs.protocol"
-    ".report.v1.ReportType\022\017\n\007program\030\003 \001(\r:\006"
-    "\202\371+\002\020\0012\371\001\n\rReportService\022U\n\nSendReport\022)"
-    ".bgs.protocol.report.v1.SendReportReques"
-    "t\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\001\022Y\n\014Submi"
-    "tReport\022+.bgs.protocol.report.v1.SubmitR"
-    "eportRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002"
-    "\010\002\0326\202\371+,\n\"bnet.protocol.report.ReportSer"
-    "vice*\006report\212\371+\002\020\001B\005H\001\200\001\000", 625);
+    "ort.v1.Report\"\214\001\n\023SubmitReportRequest\022<\n"
+    "\010agent_id\030\001 \001(\0132*.bgs.protocol.account.v"
+    "1.GameAccountHandle\0227\n\013report_type\030\002 \001(\013"
+    "2\".bgs.protocol.report.v1.ReportType2\371\001\n"
+    "\rReportService\022U\n\nSendReport\022).bgs.proto"
+    "col.report.v1.SendReportRequest\032\024.bgs.pr"
+    "otocol.NoData\"\006\202\371+\002\010\001\022Y\n\014SubmitReport\022+."
+    "bgs.protocol.report.v1.SubmitReportReque"
+    "st\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\002\0326\202\371+,\n\""
+    "bnet.protocol.report.ReportService*\006repo"
+    "rt\212\371+\002\020\001B\005H\001\200\001\000", 575);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "report_service.proto", &protobuf_RegisterTypes);
   SendReportRequest::default_instance_ = new SendReportRequest();
@@ -151,7 +148,6 @@ struct StaticDescriptorInitializer_report_5fservice_2eproto {
 
 #ifndef _MSC_VER
 const int SendReportRequest::kReportFieldNumber;
-const int SendReportRequest::kProgramFieldNumber;
 #endif  // !_MSC_VER
 
 SendReportRequest::SendReportRequest()
@@ -174,7 +170,6 @@ SendReportRequest::SendReportRequest(const SendReportRequest& from)
 void SendReportRequest::SharedCtor() {
   _cached_size_ = 0;
   report_ = NULL;
-  program_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -211,11 +206,8 @@ SendReportRequest* SendReportRequest::New() const {
 }
 
 void SendReportRequest::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
-    if (has_report()) {
-      if (report_ != NULL) report_->::bgs::protocol::report::v1::Report::Clear();
-    }
-    program_ = 0u;
+  if (has_report()) {
+    if (report_ != NULL) report_->::bgs::protocol::report::v1::Report::Clear();
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -239,21 +231,6 @@ bool SendReportRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(16)) goto parse_program;
-        break;
-      }
-
-      // optional uint32 program = 2;
-      case 2: {
-        if (tag == 16) {
-         parse_program:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &program_)));
-          set_has_program();
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -289,11 +266,6 @@ void SendReportRequest::SerializeWithCachedSizes(
       1, this->report(), output);
   }
 
-  // optional uint32 program = 2;
-  if (has_program()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->program(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -311,11 +283,6 @@ void SendReportRequest::SerializeWithCachedSizes(
         1, this->report(), target);
   }
 
-  // optional uint32 program = 2;
-  if (has_program()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->program(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -335,13 +302,6 @@ int SendReportRequest::ByteSize() const {
           this->report());
     }
 
-    // optional uint32 program = 2;
-    if (has_program()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->program());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -372,9 +332,6 @@ void SendReportRequest::MergeFrom(const SendReportRequest& from) {
     if (from.has_report()) {
       mutable_report()->::bgs::protocol::report::v1::Report::MergeFrom(from.report());
     }
-    if (from.has_program()) {
-      set_program(from.program());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -403,7 +360,6 @@ bool SendReportRequest::IsInitialized() const {
 void SendReportRequest::Swap(SendReportRequest* other) {
   if (other != this) {
     std::swap(report_, other->report_);
-    std::swap(program_, other->program_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -424,7 +380,6 @@ void SendReportRequest::Swap(SendReportRequest* other) {
 #ifndef _MSC_VER
 const int SubmitReportRequest::kAgentIdFieldNumber;
 const int SubmitReportRequest::kReportTypeFieldNumber;
-const int SubmitReportRequest::kProgramFieldNumber;
 #endif  // !_MSC_VER
 
 SubmitReportRequest::SubmitReportRequest()
@@ -449,7 +404,6 @@ void SubmitReportRequest::SharedCtor() {
   _cached_size_ = 0;
   agent_id_ = NULL;
   report_type_ = NULL;
-  program_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -487,14 +441,13 @@ SubmitReportRequest* SubmitReportRequest::New() const {
 }
 
 void SubmitReportRequest::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::GameAccountHandle::Clear();
     }
     if (has_report_type()) {
       if (report_type_ != NULL) report_type_->::bgs::protocol::report::v1::ReportType::Clear();
     }
-    program_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -531,21 +484,6 @@ bool SubmitReportRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(24)) goto parse_program;
-        break;
-      }
-
-      // optional uint32 program = 3;
-      case 3: {
-        if (tag == 24) {
-         parse_program:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &program_)));
-          set_has_program();
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -587,11 +525,6 @@ void SubmitReportRequest::SerializeWithCachedSizes(
       2, this->report_type(), output);
   }
 
-  // optional uint32 program = 3;
-  if (has_program()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->program(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -616,11 +549,6 @@ void SubmitReportRequest::SerializeWithCachedSizes(
         2, this->report_type(), target);
   }
 
-  // optional uint32 program = 3;
-  if (has_program()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->program(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -647,13 +575,6 @@ int SubmitReportRequest::ByteSize() const {
           this->report_type());
     }
 
-    // optional uint32 program = 3;
-    if (has_program()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->program());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -687,9 +608,6 @@ void SubmitReportRequest::MergeFrom(const SubmitReportRequest& from) {
     if (from.has_report_type()) {
       mutable_report_type()->::bgs::protocol::report::v1::ReportType::MergeFrom(from.report_type());
     }
-    if (from.has_program()) {
-      set_program(from.program());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -721,7 +639,6 @@ void SubmitReportRequest::Swap(SubmitReportRequest* other) {
   if (other != this) {
     std::swap(agent_id_, other->agent_id_);
     std::swap(report_type_, other->report_type_);
-    std::swap(program_, other->program_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/report_service.pb.h b/src/server/proto/Client/report_service.pb.h
index 9ce1e002f0a..76270287a75 100644
--- a/src/server/proto/Client/report_service.pb.h
+++ b/src/server/proto/Client/report_service.pb.h
@@ -110,26 +110,16 @@ class TC_PROTO_API SendReportRequest : public ::google::protobuf::Message {
   inline ::bgs::protocol::report::v1::Report* release_report();
   inline void set_allocated_report(::bgs::protocol::report::v1::Report* report);
 
-  // optional uint32 program = 2;
-  inline bool has_program() const;
-  inline void clear_program();
-  static const int kProgramFieldNumber = 2;
-  inline ::google::protobuf::uint32 program() const;
-  inline void set_program(::google::protobuf::uint32 value);
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.report.v1.SendReportRequest)
  private:
   inline void set_has_report();
   inline void clear_has_report();
-  inline void set_has_program();
-  inline void clear_has_program();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::google::protobuf::uint32 _has_bits_[1];
   mutable int _cached_size_;
   ::bgs::protocol::report::v1::Report* report_;
-  ::google::protobuf::uint32 program_;
   friend void TC_PROTO_API protobuf_AddDesc_report_5fservice_2eproto();
   friend void protobuf_AssignDesc_report_5fservice_2eproto();
   friend void protobuf_ShutdownFile_report_5fservice_2eproto();
@@ -210,21 +200,12 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   inline ::bgs::protocol::report::v1::ReportType* release_report_type();
   inline void set_allocated_report_type(::bgs::protocol::report::v1::ReportType* report_type);
 
-  // optional uint32 program = 3;
-  inline bool has_program() const;
-  inline void clear_program();
-  static const int kProgramFieldNumber = 3;
-  inline ::google::protobuf::uint32 program() const;
-  inline void set_program(::google::protobuf::uint32 value);
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.report.v1.SubmitReportRequest)
  private:
   inline void set_has_agent_id();
   inline void clear_has_agent_id();
   inline void set_has_report_type();
   inline void clear_has_report_type();
-  inline void set_has_program();
-  inline void clear_has_program();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -232,7 +213,6 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::bgs::protocol::account::v1::GameAccountHandle* agent_id_;
   ::bgs::protocol::report::v1::ReportType* report_type_;
-  ::google::protobuf::uint32 program_;
   friend void TC_PROTO_API protobuf_AddDesc_report_5fservice_2eproto();
   friend void protobuf_AssignDesc_report_5fservice_2eproto();
   friend void protobuf_ShutdownFile_report_5fservice_2eproto();
@@ -315,30 +295,6 @@ inline void SendReportRequest::set_allocated_report(::bgs::protocol::report::v1:
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.report.v1.SendReportRequest.report)
 }
 
-// optional uint32 program = 2;
-inline bool SendReportRequest::has_program() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void SendReportRequest::set_has_program() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void SendReportRequest::clear_has_program() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void SendReportRequest::clear_program() {
-  program_ = 0u;
-  clear_has_program();
-}
-inline ::google::protobuf::uint32 SendReportRequest::program() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.report.v1.SendReportRequest.program)
-  return program_;
-}
-inline void SendReportRequest::set_program(::google::protobuf::uint32 value) {
-  set_has_program();
-  program_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.report.v1.SendReportRequest.program)
-}
-
 // -------------------------------------------------------------------
 
 // SubmitReportRequest
@@ -425,30 +381,6 @@ inline void SubmitReportRequest::set_allocated_report_type(::bgs::protocol::repo
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.report.v1.SubmitReportRequest.report_type)
 }
 
-// optional uint32 program = 3;
-inline bool SubmitReportRequest::has_program() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void SubmitReportRequest::set_has_program() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void SubmitReportRequest::clear_has_program() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void SubmitReportRequest::clear_program() {
-  program_ = 0u;
-  clear_has_program();
-}
-inline ::google::protobuf::uint32 SubmitReportRequest::program() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.report.v1.SubmitReportRequest.program)
-  return program_;
-}
-inline void SubmitReportRequest::set_program(::google::protobuf::uint32 value) {
-  set_has_program();
-  program_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.report.v1.SubmitReportRequest.program)
-}
-
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/src/server/proto/Client/report_types.pb.cc b/src/server/proto/Client/report_types.pb.cc
index b20a101b7b7..d32aca02b17 100644
--- a/src/server/proto/Client/report_types.pb.cc
+++ b/src/server/proto/Client/report_types.pb.cc
@@ -325,20 +325,20 @@ void protobuf_AddDesc_report_5ftypes_2eproto() {
     ".account.v1.GameAccountHandle\022\014\n\004text\030\002 "
     "\001(\t\"`\n\024RealLifeThreatReport\022:\n\006target\030\001 "
     "\001(\0132*.bgs.protocol.account.v1.GameAccoun"
-    "tHandle\022\014\n\004text\030\002 \001(\t\"n\n\034InappropriateBa"
+    "tHandle\022\014\n\004text\030\002 \001(\t\"v\n\034InappropriateBa"
     "ttleTagReport\022:\n\006target\030\001 \001(\0132*.bgs.prot"
-    "ocol.account.v1.GameAccountHandle\022\022\n\nbat"
-    "tle_tag\030\002 \001(\t\"K\n\rHackingReport\022:\n\006target"
-    "\030\001 \001(\0132*.bgs.protocol.account.v1.GameAcc"
-    "ountHandle\"K\n\rBottingReport\022:\n\006target\030\001 "
-    "\001(\0132*.bgs.protocol.account.v1.GameAccoun"
-    "tHandle\"\345\001\n\006Report\022\023\n\013report_type\030\001 \002(\t\022"
-    "*\n\tattribute\030\002 \003(\0132\027.bgs.protocol.Attrib"
-    "ute\022\025\n\nreport_qos\030\003 \001(\005:\0010\0221\n\021reporting_"
-    "account\030\004 \001(\0132\026.bgs.protocol.EntityId\0226\n"
-    "\026reporting_game_account\030\005 \001(\0132\026.bgs.prot"
-    "ocol.EntityId\022\030\n\020report_timestamp\030\006 \001(\006B"
-    "\005H\001\200\001\000", 1686);
+    "ocol.account.v1.GameAccountHandle\022\032\n\nbat"
+    "tle_tag\030\002 \001(\tB\006\202\371+\002\010\001\"K\n\rHackingReport\022:"
+    "\n\006target\030\001 \001(\0132*.bgs.protocol.account.v1"
+    ".GameAccountHandle\"K\n\rBottingReport\022:\n\006t"
+    "arget\030\001 \001(\0132*.bgs.protocol.account.v1.Ga"
+    "meAccountHandle\"\345\001\n\006Report\022\023\n\013report_typ"
+    "e\030\001 \002(\t\022*\n\tattribute\030\002 \003(\0132\027.bgs.protoco"
+    "l.Attribute\022\025\n\nreport_qos\030\003 \001(\005:\0010\0221\n\021re"
+    "porting_account\030\004 \001(\0132\026.bgs.protocol.Ent"
+    "ityId\0226\n\026reporting_game_account\030\005 \001(\0132\026."
+    "bgs.protocol.EntityId\022\030\n\020report_timestam"
+    "p\030\006 \001(\006B\005H\001\200\001\000", 1694);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "report_types.proto", &protobuf_RegisterTypes);
   ReportType::default_instance_ = new ReportType();
diff --git a/src/server/proto/Client/rpc_types.pb.cc b/src/server/proto/Client/rpc_types.pb.cc
index cb2cd963a93..732ba73bee9 100644
--- a/src/server/proto/Client/rpc_types.pb.cc
+++ b/src/server/proto/Client/rpc_types.pb.cc
@@ -155,9 +155,10 @@ void protobuf_AssignDesc_rpc_5ftypes_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ErrorInfo));
   FanoutTarget_descriptor_ = file->message_type(6);
-  static const int FanoutTarget_offsets_[2] = {
+  static const int FanoutTarget_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FanoutTarget, client_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FanoutTarget, key_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FanoutTarget, object_id_),
   };
   FanoutTarget_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -171,7 +172,7 @@ void protobuf_AssignDesc_rpc_5ftypes_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FanoutTarget));
   Header_descriptor_ = file->message_type(7);
-  static const int Header_offsets_[14] = {
+  static const int Header_offsets_[19] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, service_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, method_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, token_),
@@ -186,6 +187,11 @@ void protobuf_AssignDesc_rpc_5ftypes_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, client_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, fanout_target_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, client_id_fanout_target_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, client_record_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, original_sender_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, sender_token_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, router_label_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, error_reason_),
   };
   Header_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -300,25 +306,28 @@ void protobuf_AddDesc_rpc_5ftypes_2eproto() {
     "\n\tobject_id\030\002 \001(\004:\0010\"\010\n\006NoData\"y\n\tErrorI"
     "nfo\0223\n\016object_address\030\001 \002(\0132\033.bgs.protoc"
     "ol.ObjectAddress\022\016\n\006status\030\002 \002(\r\022\024\n\014serv"
-    "ice_hash\030\003 \002(\r\022\021\n\tmethod_id\030\004 \002(\r\".\n\014Fan"
+    "ice_hash\030\003 \002(\r\022\021\n\tmethod_id\030\004 \002(\r\"A\n\014Fan"
     "outTarget\022\021\n\tclient_id\030\001 \001(\t\022\013\n\003key\030\002 \001("
-    "\014\"\365\002\n\006Header\022\022\n\nservice_id\030\001 \002(\r\022\021\n\tmeth"
-    "od_id\030\002 \001(\r\022\r\n\005token\030\003 \002(\r\022\024\n\tobject_id\030"
-    "\004 \001(\004:\0010\022\017\n\004size\030\005 \001(\r:\0010\022\021\n\006status\030\006 \001("
-    "\r:\0010\022&\n\005error\030\007 \003(\0132\027.bgs.protocol.Error"
-    "Info\022\017\n\007timeout\030\010 \001(\004\022\023\n\013is_response\030\t \001"
-    "(\010\0220\n\017forward_targets\030\n \003(\0132\027.bgs.protoc"
-    "ol.ProcessId\022\024\n\014service_hash\030\013 \001(\007\022\021\n\tcl"
-    "ient_id\030\r \001(\t\0221\n\rfanout_target\030\016 \003(\0132\032.b"
-    "gs.protocol.FanoutTarget\022\037\n\027client_id_fa"
-    "nout_target\030\017 \003(\t\"\352\001\n\013KafkaHeader\022\024\n\014ser"
-    "vice_hash\030\001 \001(\007\022\021\n\tmethod_id\030\002 \001(\r\022\r\n\005to"
-    "ken\030\003 \001(\r\022\024\n\tobject_id\030\004 \001(\004:\0010\022\017\n\004size\030"
-    "\005 \001(\r:\0010\022\021\n\006status\030\006 \001(\r:\0010\022\017\n\007timeout\030\007"
-    " \001(\004\022/\n\016forward_target\030\010 \001(\0132\027.bgs.proto"
-    "col.ProcessId\022\024\n\014return_topic\030\t \001(\t\022\021\n\tc"
-    "lient_id\030\013 \001(\tB\033\n\rbnet.protocolB\010RpcProt"
-    "oH\001P\000P\001P\002P\003", 1211);
+    "\014\022\021\n\tobject_id\030\003 \001(\004\"\347\003\n\006Header\022\022\n\nservi"
+    "ce_id\030\001 \002(\r\022\021\n\tmethod_id\030\002 \001(\r\022\r\n\005token\030"
+    "\003 \002(\r\022\024\n\tobject_id\030\004 \001(\004:\0010\022\017\n\004size\030\005 \001("
+    "\r:\0010\022\021\n\006status\030\006 \001(\r:\0010\022&\n\005error\030\007 \003(\0132\027"
+    ".bgs.protocol.ErrorInfo\022\017\n\007timeout\030\010 \001(\004"
+    "\022\023\n\013is_response\030\t \001(\010\0220\n\017forward_targets"
+    "\030\n \003(\0132\027.bgs.protocol.ProcessId\022\024\n\014servi"
+    "ce_hash\030\013 \001(\007\022\021\n\tclient_id\030\r \001(\t\0221\n\rfano"
+    "ut_target\030\016 \003(\0132\032.bgs.protocol.FanoutTar"
+    "get\022\037\n\027client_id_fanout_target\030\017 \003(\t\022\025\n\r"
+    "client_record\030\020 \001(\014\022\027\n\017original_sender\030\021"
+    " \001(\014\022\024\n\014sender_token\030\022 \001(\r\022\024\n\014router_lab"
+    "el\030\023 \001(\r\022\024\n\014error_reason\030\024 \001(\t\"\352\001\n\013Kafka"
+    "Header\022\024\n\014service_hash\030\001 \001(\007\022\021\n\tmethod_i"
+    "d\030\002 \001(\r\022\r\n\005token\030\003 \001(\r\022\024\n\tobject_id\030\004 \001("
+    "\004:\0010\022\017\n\004size\030\005 \001(\r:\0010\022\021\n\006status\030\006 \001(\r:\0010"
+    "\022\017\n\007timeout\030\007 \001(\004\022/\n\016forward_target\030\010 \001("
+    "\0132\027.bgs.protocol.ProcessId\022\024\n\014return_top"
+    "ic\030\t \001(\t\022\021\n\tclient_id\030\013 \001(\tB\033\n\rbnet.prot"
+    "ocolB\010RpcProtoH\001P\000P\001P\002P\003", 1344);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "rpc_types.proto", &protobuf_RegisterTypes);
   NO_RESPONSE::default_instance_ = new NO_RESPONSE();
@@ -1896,6 +1905,7 @@ void ErrorInfo::Swap(ErrorInfo* other) {
 #ifndef _MSC_VER
 const int FanoutTarget::kClientIdFieldNumber;
 const int FanoutTarget::kKeyFieldNumber;
+const int FanoutTarget::kObjectIdFieldNumber;
 #endif  // !_MSC_VER
 
 FanoutTarget::FanoutTarget()
@@ -1919,6 +1929,7 @@ void FanoutTarget::SharedCtor() {
   _cached_size_ = 0;
   client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  object_id_ = GOOGLE_ULONGLONG(0);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -1960,7 +1971,7 @@ FanoutTarget* FanoutTarget::New() const {
 }
 
 void FanoutTarget::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
+  if (_has_bits_[0 / 32] & 7) {
     if (has_client_id()) {
       if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
         client_id_->clear();
@@ -1971,6 +1982,7 @@ void FanoutTarget::Clear() {
         key_->clear();
       }
     }
+    object_id_ = GOOGLE_ULONGLONG(0);
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -2011,6 +2023,21 @@ bool FanoutTarget::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(24)) goto parse_object_id;
+        break;
+      }
+
+      // optional uint64 object_id = 3;
+      case 3: {
+        if (tag == 24) {
+         parse_object_id:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &object_id_)));
+          set_has_object_id();
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -2056,6 +2083,11 @@ void FanoutTarget::SerializeWithCachedSizes(
       2, this->key(), output);
   }
 
+  // optional uint64 object_id = 3;
+  if (has_object_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->object_id(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2084,6 +2116,11 @@ void FanoutTarget::SerializeWithCachedSizes(
         2, this->key(), target);
   }
 
+  // optional uint64 object_id = 3;
+  if (has_object_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->object_id(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -2110,6 +2147,13 @@ int FanoutTarget::ByteSize() const {
           this->key());
     }
 
+    // optional uint64 object_id = 3;
+    if (has_object_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->object_id());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -2143,6 +2187,9 @@ void FanoutTarget::MergeFrom(const FanoutTarget& from) {
     if (from.has_key()) {
       set_key(from.key());
     }
+    if (from.has_object_id()) {
+      set_object_id(from.object_id());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -2168,6 +2215,7 @@ void FanoutTarget::Swap(FanoutTarget* other) {
   if (other != this) {
     std::swap(client_id_, other->client_id_);
     std::swap(key_, other->key_);
+    std::swap(object_id_, other->object_id_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -2200,6 +2248,11 @@ const int Header::kServiceHashFieldNumber;
 const int Header::kClientIdFieldNumber;
 const int Header::kFanoutTargetFieldNumber;
 const int Header::kClientIdFanoutTargetFieldNumber;
+const int Header::kClientRecordFieldNumber;
+const int Header::kOriginalSenderFieldNumber;
+const int Header::kSenderTokenFieldNumber;
+const int Header::kRouterLabelFieldNumber;
+const int Header::kErrorReasonFieldNumber;
 #endif  // !_MSC_VER
 
 Header::Header()
@@ -2231,6 +2284,11 @@ void Header::SharedCtor() {
   is_response_ = false;
   service_hash_ = 0u;
   client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  client_record_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  original_sender_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  sender_token_ = 0u;
+  router_label_ = 0u;
+  error_reason_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -2243,6 +2301,15 @@ void Header::SharedDtor() {
   if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete client_id_;
   }
+  if (client_record_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete client_record_;
+  }
+  if (original_sender_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete original_sender_;
+  }
+  if (error_reason_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete error_reason_;
+  }
   if (this != default_instance_) {
   }
 }
@@ -2284,7 +2351,7 @@ void Header::Clear() {
     status_ = 0u;
     timeout_ = GOOGLE_ULONGLONG(0);
   }
-  if (_has_bits_[8 / 32] & 3328) {
+  if (_has_bits_[8 / 32] & 52480) {
     is_response_ = false;
     service_hash_ = 0u;
     if (has_client_id()) {
@@ -2292,6 +2359,25 @@ void Header::Clear() {
         client_id_->clear();
       }
     }
+    if (has_client_record()) {
+      if (client_record_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        client_record_->clear();
+      }
+    }
+    if (has_original_sender()) {
+      if (original_sender_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        original_sender_->clear();
+      }
+    }
+  }
+  if (_has_bits_[16 / 32] & 458752) {
+    sender_token_ = 0u;
+    router_label_ = 0u;
+    if (has_error_reason()) {
+      if (error_reason_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        error_reason_->clear();
+      }
+    }
   }
 
 #undef OFFSET_OF_FIELD_
@@ -2311,7 +2397,7 @@ bool Header::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:bgs.protocol.Header)
   for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
@@ -2523,6 +2609,79 @@ bool Header::MergePartialFromCodedStream(
           goto handle_unusual;
         }
         if (input->ExpectTag(122)) goto parse_client_id_fanout_target;
+        if (input->ExpectTag(130)) goto parse_client_record;
+        break;
+      }
+
+      // optional bytes client_record = 16;
+      case 16: {
+        if (tag == 130) {
+         parse_client_record:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
+                input, this->mutable_client_record()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(138)) goto parse_original_sender;
+        break;
+      }
+
+      // optional bytes original_sender = 17;
+      case 17: {
+        if (tag == 138) {
+         parse_original_sender:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
+                input, this->mutable_original_sender()));
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(144)) goto parse_sender_token;
+        break;
+      }
+
+      // optional uint32 sender_token = 18;
+      case 18: {
+        if (tag == 144) {
+         parse_sender_token:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &sender_token_)));
+          set_has_sender_token();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(152)) goto parse_router_label;
+        break;
+      }
+
+      // optional uint32 router_label = 19;
+      case 19: {
+        if (tag == 152) {
+         parse_router_label:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &router_label_)));
+          set_has_router_label();
+        } else {
+          goto handle_unusual;
+        }
+        if (input->ExpectTag(162)) goto parse_error_reason;
+        break;
+      }
+
+      // optional string error_reason = 20;
+      case 20: {
+        if (tag == 162) {
+         parse_error_reason:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_error_reason()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->error_reason().data(), this->error_reason().length(),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "error_reason");
+        } else {
+          goto handle_unusual;
+        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -2635,6 +2794,38 @@ void Header::SerializeWithCachedSizes(
       15, this->client_id_fanout_target(i), output);
   }
 
+  // optional bytes client_record = 16;
+  if (has_client_record()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased(
+      16, this->client_record(), output);
+  }
+
+  // optional bytes original_sender = 17;
+  if (has_original_sender()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased(
+      17, this->original_sender(), output);
+  }
+
+  // optional uint32 sender_token = 18;
+  if (has_sender_token()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(18, this->sender_token(), output);
+  }
+
+  // optional uint32 router_label = 19;
+  if (has_router_label()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(19, this->router_label(), output);
+  }
+
+  // optional string error_reason = 20;
+  if (has_error_reason()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->error_reason().data(), this->error_reason().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "error_reason");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      20, this->error_reason(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2732,6 +2923,41 @@ void Header::SerializeWithCachedSizes(
       WriteStringToArray(15, this->client_id_fanout_target(i), target);
   }
 
+  // optional bytes client_record = 16;
+  if (has_client_record()) {
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteBytesToArray(
+        16, this->client_record(), target);
+  }
+
+  // optional bytes original_sender = 17;
+  if (has_original_sender()) {
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteBytesToArray(
+        17, this->original_sender(), target);
+  }
+
+  // optional uint32 sender_token = 18;
+  if (has_sender_token()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(18, this->sender_token(), target);
+  }
+
+  // optional uint32 router_label = 19;
+  if (has_router_label()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(19, this->router_label(), target);
+  }
+
+  // optional string error_reason = 20;
+  if (has_error_reason()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->error_reason().data(), this->error_reason().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "error_reason");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        20, this->error_reason(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -2812,6 +3038,43 @@ int Header::ByteSize() const {
           this->client_id());
     }
 
+    // optional bytes client_record = 16;
+    if (has_client_record()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::BytesSize(
+          this->client_record());
+    }
+
+    // optional bytes original_sender = 17;
+    if (has_original_sender()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::BytesSize(
+          this->original_sender());
+    }
+
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // optional uint32 sender_token = 18;
+    if (has_sender_token()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->sender_token());
+    }
+
+    // optional uint32 router_label = 19;
+    if (has_router_label()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->router_label());
+    }
+
+    // optional string error_reason = 20;
+    if (has_error_reason()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->error_reason());
+    }
+
   }
   // repeated .bgs.protocol.ErrorInfo error = 7;
   total_size += 1 * this->error_size();
@@ -2906,6 +3169,23 @@ void Header::MergeFrom(const Header& from) {
     if (from.has_client_id()) {
       set_client_id(from.client_id());
     }
+    if (from.has_client_record()) {
+      set_client_record(from.client_record());
+    }
+    if (from.has_original_sender()) {
+      set_original_sender(from.original_sender());
+    }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (from.has_sender_token()) {
+      set_sender_token(from.sender_token());
+    }
+    if (from.has_router_label()) {
+      set_router_label(from.router_label());
+    }
+    if (from.has_error_reason()) {
+      set_error_reason(from.error_reason());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -2946,6 +3226,11 @@ void Header::Swap(Header* other) {
     std::swap(client_id_, other->client_id_);
     fanout_target_.Swap(&other->fanout_target_);
     client_id_fanout_target_.Swap(&other->client_id_fanout_target_);
+    std::swap(client_record_, other->client_record_);
+    std::swap(original_sender_, other->original_sender_);
+    std::swap(sender_token_, other->sender_token_);
+    std::swap(router_label_, other->router_label_);
+    std::swap(error_reason_, other->error_reason_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/rpc_types.pb.h b/src/server/proto/Client/rpc_types.pb.h
index 7808a857c03..79b33592440 100644
--- a/src/server/proto/Client/rpc_types.pb.h
+++ b/src/server/proto/Client/rpc_types.pb.h
@@ -651,12 +651,21 @@ class TC_PROTO_API FanoutTarget : public ::google::protobuf::Message {
   inline ::std::string* release_key();
   inline void set_allocated_key(::std::string* key);
 
+  // optional uint64 object_id = 3;
+  inline bool has_object_id() const;
+  inline void clear_object_id();
+  static const int kObjectIdFieldNumber = 3;
+  inline ::google::protobuf::uint64 object_id() const;
+  inline void set_object_id(::google::protobuf::uint64 value);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.FanoutTarget)
  private:
   inline void set_has_client_id();
   inline void clear_has_client_id();
   inline void set_has_key();
   inline void clear_has_key();
+  inline void set_has_object_id();
+  inline void clear_has_object_id();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -664,6 +673,7 @@ class TC_PROTO_API FanoutTarget : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::std::string* client_id_;
   ::std::string* key_;
+  ::google::protobuf::uint64 object_id_;
   friend void TC_PROTO_API protobuf_AddDesc_rpc_5ftypes_2eproto();
   friend void protobuf_AssignDesc_rpc_5ftypes_2eproto();
   friend void protobuf_ShutdownFile_rpc_5ftypes_2eproto();
@@ -853,6 +863,56 @@ class TC_PROTO_API Header : public ::google::protobuf::Message {
   inline const ::google::protobuf::RepeatedPtrField< ::std::string>& client_id_fanout_target() const;
   inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_client_id_fanout_target();
 
+  // optional bytes client_record = 16;
+  inline bool has_client_record() const;
+  inline void clear_client_record();
+  static const int kClientRecordFieldNumber = 16;
+  inline const ::std::string& client_record() const;
+  inline void set_client_record(const ::std::string& value);
+  inline void set_client_record(const char* value);
+  inline void set_client_record(const void* value, size_t size);
+  inline ::std::string* mutable_client_record();
+  inline ::std::string* release_client_record();
+  inline void set_allocated_client_record(::std::string* client_record);
+
+  // optional bytes original_sender = 17;
+  inline bool has_original_sender() const;
+  inline void clear_original_sender();
+  static const int kOriginalSenderFieldNumber = 17;
+  inline const ::std::string& original_sender() const;
+  inline void set_original_sender(const ::std::string& value);
+  inline void set_original_sender(const char* value);
+  inline void set_original_sender(const void* value, size_t size);
+  inline ::std::string* mutable_original_sender();
+  inline ::std::string* release_original_sender();
+  inline void set_allocated_original_sender(::std::string* original_sender);
+
+  // optional uint32 sender_token = 18;
+  inline bool has_sender_token() const;
+  inline void clear_sender_token();
+  static const int kSenderTokenFieldNumber = 18;
+  inline ::google::protobuf::uint32 sender_token() const;
+  inline void set_sender_token(::google::protobuf::uint32 value);
+
+  // optional uint32 router_label = 19;
+  inline bool has_router_label() const;
+  inline void clear_router_label();
+  static const int kRouterLabelFieldNumber = 19;
+  inline ::google::protobuf::uint32 router_label() const;
+  inline void set_router_label(::google::protobuf::uint32 value);
+
+  // optional string error_reason = 20;
+  inline bool has_error_reason() const;
+  inline void clear_error_reason();
+  static const int kErrorReasonFieldNumber = 20;
+  inline const ::std::string& error_reason() const;
+  inline void set_error_reason(const ::std::string& value);
+  inline void set_error_reason(const char* value);
+  inline void set_error_reason(const char* value, size_t size);
+  inline ::std::string* mutable_error_reason();
+  inline ::std::string* release_error_reason();
+  inline void set_allocated_error_reason(::std::string* error_reason);
+
   // @@protoc_insertion_point(class_scope:bgs.protocol.Header)
  private:
   inline void set_has_service_id();
@@ -875,6 +935,16 @@ class TC_PROTO_API Header : public ::google::protobuf::Message {
   inline void clear_has_service_hash();
   inline void set_has_client_id();
   inline void clear_has_client_id();
+  inline void set_has_client_record();
+  inline void clear_has_client_record();
+  inline void set_has_original_sender();
+  inline void clear_has_original_sender();
+  inline void set_has_sender_token();
+  inline void clear_has_sender_token();
+  inline void set_has_router_label();
+  inline void clear_has_router_label();
+  inline void set_has_error_reason();
+  inline void clear_has_error_reason();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -894,6 +964,11 @@ class TC_PROTO_API Header : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::FanoutTarget > fanout_target_;
   ::google::protobuf::RepeatedPtrField< ::std::string> client_id_fanout_target_;
   ::google::protobuf::uint32 service_hash_;
+  ::google::protobuf::uint32 sender_token_;
+  ::std::string* client_record_;
+  ::std::string* original_sender_;
+  ::std::string* error_reason_;
+  ::google::protobuf::uint32 router_label_;
   friend void TC_PROTO_API protobuf_AddDesc_rpc_5ftypes_2eproto();
   friend void protobuf_AssignDesc_rpc_5ftypes_2eproto();
   friend void protobuf_ShutdownFile_rpc_5ftypes_2eproto();
@@ -1594,6 +1669,30 @@ inline void FanoutTarget::set_allocated_key(::std::string* key) {
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.FanoutTarget.key)
 }
 
+// optional uint64 object_id = 3;
+inline bool FanoutTarget::has_object_id() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void FanoutTarget::set_has_object_id() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void FanoutTarget::clear_has_object_id() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void FanoutTarget::clear_object_id() {
+  object_id_ = GOOGLE_ULONGLONG(0);
+  clear_has_object_id();
+}
+inline ::google::protobuf::uint64 FanoutTarget::object_id() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.FanoutTarget.object_id)
+  return object_id_;
+}
+inline void FanoutTarget::set_object_id(::google::protobuf::uint64 value) {
+  set_has_object_id();
+  object_id_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.FanoutTarget.object_id)
+}
+
 // -------------------------------------------------------------------
 
 // Header
@@ -2034,6 +2133,282 @@ Header::mutable_client_id_fanout_target() {
   return &client_id_fanout_target_;
 }
 
+// optional bytes client_record = 16;
+inline bool Header::has_client_record() const {
+  return (_has_bits_[0] & 0x00004000u) != 0;
+}
+inline void Header::set_has_client_record() {
+  _has_bits_[0] |= 0x00004000u;
+}
+inline void Header::clear_has_client_record() {
+  _has_bits_[0] &= ~0x00004000u;
+}
+inline void Header::clear_client_record() {
+  if (client_record_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    client_record_->clear();
+  }
+  clear_has_client_record();
+}
+inline const ::std::string& Header::client_record() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.Header.client_record)
+  return *client_record_;
+}
+inline void Header::set_client_record(const ::std::string& value) {
+  set_has_client_record();
+  if (client_record_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    client_record_ = new ::std::string;
+  }
+  client_record_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.Header.client_record)
+}
+inline void Header::set_client_record(const char* value) {
+  set_has_client_record();
+  if (client_record_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    client_record_ = new ::std::string;
+  }
+  client_record_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.Header.client_record)
+}
+inline void Header::set_client_record(const void* value, size_t size) {
+  set_has_client_record();
+  if (client_record_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    client_record_ = new ::std::string;
+  }
+  client_record_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.Header.client_record)
+}
+inline ::std::string* Header::mutable_client_record() {
+  set_has_client_record();
+  if (client_record_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    client_record_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.Header.client_record)
+  return client_record_;
+}
+inline ::std::string* Header::release_client_record() {
+  clear_has_client_record();
+  if (client_record_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = client_record_;
+    client_record_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void Header::set_allocated_client_record(::std::string* client_record) {
+  if (client_record_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete client_record_;
+  }
+  if (client_record) {
+    set_has_client_record();
+    client_record_ = client_record;
+  } else {
+    clear_has_client_record();
+    client_record_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.Header.client_record)
+}
+
+// optional bytes original_sender = 17;
+inline bool Header::has_original_sender() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void Header::set_has_original_sender() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void Header::clear_has_original_sender() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void Header::clear_original_sender() {
+  if (original_sender_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    original_sender_->clear();
+  }
+  clear_has_original_sender();
+}
+inline const ::std::string& Header::original_sender() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.Header.original_sender)
+  return *original_sender_;
+}
+inline void Header::set_original_sender(const ::std::string& value) {
+  set_has_original_sender();
+  if (original_sender_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    original_sender_ = new ::std::string;
+  }
+  original_sender_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.Header.original_sender)
+}
+inline void Header::set_original_sender(const char* value) {
+  set_has_original_sender();
+  if (original_sender_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    original_sender_ = new ::std::string;
+  }
+  original_sender_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.Header.original_sender)
+}
+inline void Header::set_original_sender(const void* value, size_t size) {
+  set_has_original_sender();
+  if (original_sender_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    original_sender_ = new ::std::string;
+  }
+  original_sender_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.Header.original_sender)
+}
+inline ::std::string* Header::mutable_original_sender() {
+  set_has_original_sender();
+  if (original_sender_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    original_sender_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.Header.original_sender)
+  return original_sender_;
+}
+inline ::std::string* Header::release_original_sender() {
+  clear_has_original_sender();
+  if (original_sender_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = original_sender_;
+    original_sender_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void Header::set_allocated_original_sender(::std::string* original_sender) {
+  if (original_sender_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete original_sender_;
+  }
+  if (original_sender) {
+    set_has_original_sender();
+    original_sender_ = original_sender;
+  } else {
+    clear_has_original_sender();
+    original_sender_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.Header.original_sender)
+}
+
+// optional uint32 sender_token = 18;
+inline bool Header::has_sender_token() const {
+  return (_has_bits_[0] & 0x00010000u) != 0;
+}
+inline void Header::set_has_sender_token() {
+  _has_bits_[0] |= 0x00010000u;
+}
+inline void Header::clear_has_sender_token() {
+  _has_bits_[0] &= ~0x00010000u;
+}
+inline void Header::clear_sender_token() {
+  sender_token_ = 0u;
+  clear_has_sender_token();
+}
+inline ::google::protobuf::uint32 Header::sender_token() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.Header.sender_token)
+  return sender_token_;
+}
+inline void Header::set_sender_token(::google::protobuf::uint32 value) {
+  set_has_sender_token();
+  sender_token_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.Header.sender_token)
+}
+
+// optional uint32 router_label = 19;
+inline bool Header::has_router_label() const {
+  return (_has_bits_[0] & 0x00020000u) != 0;
+}
+inline void Header::set_has_router_label() {
+  _has_bits_[0] |= 0x00020000u;
+}
+inline void Header::clear_has_router_label() {
+  _has_bits_[0] &= ~0x00020000u;
+}
+inline void Header::clear_router_label() {
+  router_label_ = 0u;
+  clear_has_router_label();
+}
+inline ::google::protobuf::uint32 Header::router_label() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.Header.router_label)
+  return router_label_;
+}
+inline void Header::set_router_label(::google::protobuf::uint32 value) {
+  set_has_router_label();
+  router_label_ = value;
+  // @@protoc_insertion_point(field_set:bgs.protocol.Header.router_label)
+}
+
+// optional string error_reason = 20;
+inline bool Header::has_error_reason() const {
+  return (_has_bits_[0] & 0x00040000u) != 0;
+}
+inline void Header::set_has_error_reason() {
+  _has_bits_[0] |= 0x00040000u;
+}
+inline void Header::clear_has_error_reason() {
+  _has_bits_[0] &= ~0x00040000u;
+}
+inline void Header::clear_error_reason() {
+  if (error_reason_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    error_reason_->clear();
+  }
+  clear_has_error_reason();
+}
+inline const ::std::string& Header::error_reason() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.Header.error_reason)
+  return *error_reason_;
+}
+inline void Header::set_error_reason(const ::std::string& value) {
+  set_has_error_reason();
+  if (error_reason_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    error_reason_ = new ::std::string;
+  }
+  error_reason_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.Header.error_reason)
+}
+inline void Header::set_error_reason(const char* value) {
+  set_has_error_reason();
+  if (error_reason_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    error_reason_ = new ::std::string;
+  }
+  error_reason_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.Header.error_reason)
+}
+inline void Header::set_error_reason(const char* value, size_t size) {
+  set_has_error_reason();
+  if (error_reason_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    error_reason_ = new ::std::string;
+  }
+  error_reason_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.Header.error_reason)
+}
+inline ::std::string* Header::mutable_error_reason() {
+  set_has_error_reason();
+  if (error_reason_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    error_reason_ = new ::std::string;
+  }
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.Header.error_reason)
+  return error_reason_;
+}
+inline ::std::string* Header::release_error_reason() {
+  clear_has_error_reason();
+  if (error_reason_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    return NULL;
+  } else {
+    ::std::string* temp = error_reason_;
+    error_reason_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    return temp;
+  }
+}
+inline void Header::set_allocated_error_reason(::std::string* error_reason) {
+  if (error_reason_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete error_reason_;
+  }
+  if (error_reason) {
+    set_has_error_reason();
+    error_reason_ = error_reason;
+  } else {
+    clear_has_error_reason();
+    error_reason_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  }
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.Header.error_reason)
+}
+
 // -------------------------------------------------------------------
 
 // KafkaHeader
diff --git a/src/server/proto/Client/user_manager_service.pb.cc b/src/server/proto/Client/user_manager_service.pb.cc
index 24b26102f33..dd6bd307548 100644
--- a/src/server/proto/Client/user_manager_service.pb.cc
+++ b/src/server/proto/Client/user_manager_service.pb.cc
@@ -89,10 +89,9 @@ void protobuf_AssignDesc_user_5fmanager_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SubscribeRequest));
   SubscribeResponse_descriptor_ = file->message_type(1);
-  static const int SubscribeResponse_offsets_[3] = {
+  static const int SubscribeResponse_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeResponse, blocked_players_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeResponse, recent_players_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeResponse, role_),
   };
   SubscribeResponse_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -155,10 +154,9 @@ void protobuf_AssignDesc_user_5fmanager_5fservice_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ClearRecentPlayersRequest));
   BlockPlayerRequest_descriptor_ = file->message_type(5);
-  static const int BlockPlayerRequest_offsets_[3] = {
+  static const int BlockPlayerRequest_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockPlayerRequest, agent_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockPlayerRequest, target_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockPlayerRequest, role_),
   };
   BlockPlayerRequest_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -324,83 +322,82 @@ void protobuf_AddDesc_user_5fmanager_5fservice_2eproto() {
 
   ::bgs::protocol::user_manager::v1::protobuf_AddDesc_user_5fmanager_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_entity_5ftypes_2eproto();
-  ::bgs::protocol::protobuf_AddDesc_role_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\032user_manager_service.proto\022\034bgs.protoc"
     "ol.user_manager.v1\032\030user_manager_types.p"
-    "roto\032\022entity_types.proto\032\020role_types.pro"
-    "to\032\017rpc_types.proto\"O\n\020SubscribeRequest\022"
-    "(\n\010agent_id\030\001 \001(\0132\026.bgs.protocol.EntityI"
-    "d\022\021\n\tobject_id\030\002 \002(\004\"\277\001\n\021SubscribeRespon"
-    "se\022D\n\017blocked_players\030\001 \003(\0132+.bgs.protoc"
-    "ol.user_manager.v1.BlockedPlayer\022B\n\016rece"
-    "nt_players\030\002 \003(\0132*.bgs.protocol.user_man"
-    "ager.v1.RecentPlayer\022 \n\004role\030\003 \003(\0132\022.bgs"
-    ".protocol.Role\"Q\n\022UnsubscribeRequest\022(\n\010"
-    "agent_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022\021"
-    "\n\tobject_id\030\002 \001(\004\"\221\001\n\027AddRecentPlayersRe"
-    "quest\022;\n\007players\030\001 \003(\0132*.bgs.protocol.us"
-    "er_manager.v1.RecentPlayer\022(\n\010agent_id\030\002"
-    " \001(\0132\026.bgs.protocol.EntityId\022\017\n\007program\030"
-    "\003 \001(\r\"V\n\031ClearRecentPlayersRequest\022(\n\010ag"
-    "ent_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022\017\n\007"
-    "program\030\002 \001(\r\"w\n\022BlockPlayerRequest\022(\n\010a"
-    "gent_id\030\001 \001(\0132\026.bgs.protocol.EntityId\022)\n"
-    "\ttarget_id\030\002 \002(\0132\026.bgs.protocol.EntityId"
-    "\022\014\n\004role\030\003 \001(\r\"k\n\024UnblockPlayerRequest\022("
-    "\n\010agent_id\030\001 \001(\0132\026.bgs.protocol.EntityId"
-    "\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.protocol.Entit"
-    "yId\"\272\001\n\036BlockedPlayerAddedNotification\022;"
-    "\n\006player\030\001 \002(\0132+.bgs.protocol.user_manag"
-    "er.v1.BlockedPlayer\022/\n\017game_account_id\030\002"
-    " \001(\0132\026.bgs.protocol.EntityId\022*\n\naccount_"
-    "id\030\003 \001(\0132\026.bgs.protocol.EntityId\"\274\001\n Blo"
-    "ckedPlayerRemovedNotification\022;\n\006player\030"
-    "\001 \002(\0132+.bgs.protocol.user_manager.v1.Blo"
-    "ckedPlayer\022/\n\017game_account_id\030\002 \001(\0132\026.bg"
-    "s.protocol.EntityId\022*\n\naccount_id\030\003 \001(\0132"
-    "\026.bgs.protocol.EntityId\"\\\n\036RecentPlayers"
-    "AddedNotification\022:\n\006player\030\001 \003(\0132*.bgs."
-    "protocol.user_manager.v1.RecentPlayer\"^\n"
-    " RecentPlayersRemovedNotification\022:\n\006pla"
-    "yer\030\001 \003(\0132*.bgs.protocol.user_manager.v1"
-    ".RecentPlayer2\263\006\n\022UserManagerService\022t\n\t"
-    "Subscribe\022..bgs.protocol.user_manager.v1"
-    ".SubscribeRequest\032/.bgs.protocol.user_ma"
-    "nager.v1.SubscribeResponse\"\006\202\371+\002\010\001\022g\n\020Ad"
-    "dRecentPlayers\0225.bgs.protocol.user_manag"
-    "er.v1.AddRecentPlayersRequest\032\024.bgs.prot"
-    "ocol.NoData\"\006\202\371+\002\010\n\022k\n\022ClearRecentPlayer"
-    "s\0227.bgs.protocol.user_manager.v1.ClearRe"
-    "centPlayersRequest\032\024.bgs.protocol.NoData"
-    "\"\006\202\371+\002\010\013\022]\n\013BlockPlayer\0220.bgs.protocol.u"
-    "ser_manager.v1.BlockPlayerRequest\032\024.bgs."
-    "protocol.NoData\"\006\202\371+\002\010\024\022a\n\rUnblockPlayer"
-    "\0222.bgs.protocol.user_manager.v1.UnblockP"
-    "layerRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002"
-    "\010\025\022g\n\025BlockPlayerForSession\0220.bgs.protoc"
-    "ol.user_manager.v1.BlockPlayerRequest\032\024."
-    "bgs.protocol.NoData\"\006\202\371+\002\010(\022]\n\013Unsubscri"
-    "be\0220.bgs.protocol.user_manager.v1.Unsubs"
-    "cribeRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002"
-    "\0103\032G\202\371+=\n-bnet.protocol.user_manager.Use"
-    "rManagerService*\014user_manager\212\371+\002\020\0012\273\004\n\023"
-    "UserManagerListener\022w\n\024OnBlockedPlayerAd"
-    "ded\022<.bgs.protocol.user_manager.v1.Block"
-    "edPlayerAddedNotification\032\031.bgs.protocol"
-    ".NO_RESPONSE\"\006\202\371+\002\010\001\022{\n\026OnBlockedPlayerR"
-    "emoved\022>.bgs.protocol.user_manager.v1.Bl"
-    "ockedPlayerRemovedNotification\032\031.bgs.pro"
-    "tocol.NO_RESPONSE\"\006\202\371+\002\010\002\022w\n\024OnRecentPla"
-    "yersAdded\022<.bgs.protocol.user_manager.v1"
-    ".RecentPlayersAddedNotification\032\031.bgs.pr"
-    "otocol.NO_RESPONSE\"\006\202\371+\002\010\013\022{\n\026OnRecentPl"
-    "ayersRemoved\022>.bgs.protocol.user_manager"
-    ".v1.RecentPlayersRemovedNotification\032\031.b"
-    "gs.protocol.NO_RESPONSE\"\006\202\371+\002\010\014\0328\202\371+.\n,b"
-    "net.protocol.user_manager.UserManagerNot"
-    "ify\212\371+\002\010\001B\005H\001\200\001\000", 2936);
+    "roto\032\022entity_types.proto\032\017rpc_types.prot"
+    "o\"W\n\020SubscribeRequest\0220\n\010agent_id\030\001 \001(\0132"
+    "\026.bgs.protocol.EntityIdB\006\202\371+\002 \001\022\021\n\tobjec"
+    "t_id\030\002 \002(\004\"\235\001\n\021SubscribeResponse\022D\n\017bloc"
+    "ked_players\030\001 \003(\0132+.bgs.protocol.user_ma"
+    "nager.v1.BlockedPlayer\022B\n\016recent_players"
+    "\030\002 \003(\0132*.bgs.protocol.user_manager.v1.Re"
+    "centPlayer\"Y\n\022UnsubscribeRequest\0220\n\010agen"
+    "t_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371+\002"
+    " \001\022\021\n\tobject_id\030\002 \001(\004\"\257\001\n\027AddRecentPlaye"
+    "rsRequest\022I\n\007players\030\001 \003(\0132*.bgs.protoco"
+    "l.user_manager.v1.RecentPlayerB\014\212\371+\010*\006\n\004"
+    "\010\001\020\024\0220\n\010agent_id\030\002 \001(\0132\026.bgs.protocol.En"
+    "tityIdB\006\202\371+\002 \001\022\017\n\007program\030\003 \001(\r:\006\202\371+\002\020\001\""
+    "^\n\031ClearRecentPlayersRequest\0220\n\010agent_id"
+    "\030\001 \001(\0132\026.bgs.protocol.EntityIdB\006\202\371+\002 \001\022\017"
+    "\n\007program\030\002 \001(\r\"y\n\022BlockPlayerRequest\0220\n"
+    "\010agent_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB"
+    "\006\202\371+\002 \001\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.protoco"
+    "l.EntityId:\006\202\371+\002\020\001\"{\n\024UnblockPlayerReque"
+    "st\0220\n\010agent_id\030\001 \001(\0132\026.bgs.protocol.Enti"
+    "tyIdB\006\202\371+\002 \001\022)\n\ttarget_id\030\002 \002(\0132\026.bgs.pr"
+    "otocol.EntityId:\006\202\371+\002\020\001\"\272\001\n\036BlockedPlaye"
+    "rAddedNotification\022;\n\006player\030\001 \002(\0132+.bgs"
+    ".protocol.user_manager.v1.BlockedPlayer\022"
+    "/\n\017game_account_id\030\002 \001(\0132\026.bgs.protocol."
+    "EntityId\022*\n\naccount_id\030\003 \001(\0132\026.bgs.proto"
+    "col.EntityId\"\274\001\n BlockedPlayerRemovedNot"
+    "ification\022;\n\006player\030\001 \002(\0132+.bgs.protocol"
+    ".user_manager.v1.BlockedPlayer\022/\n\017game_a"
+    "ccount_id\030\002 \001(\0132\026.bgs.protocol.EntityId\022"
+    "*\n\naccount_id\030\003 \001(\0132\026.bgs.protocol.Entit"
+    "yId\"\\\n\036RecentPlayersAddedNotification\022:\n"
+    "\006player\030\001 \003(\0132*.bgs.protocol.user_manage"
+    "r.v1.RecentPlayer\"^\n RecentPlayersRemove"
+    "dNotification\022:\n\006player\030\001 \003(\0132*.bgs.prot"
+    "ocol.user_manager.v1.RecentPlayer2\265\006\n\022Us"
+    "erManagerService\022t\n\tSubscribe\022..bgs.prot"
+    "ocol.user_manager.v1.SubscribeRequest\032/."
+    "bgs.protocol.user_manager.v1.SubscribeRe"
+    "sponse\"\006\202\371+\002\010\001\022g\n\020AddRecentPlayers\0225.bgs"
+    ".protocol.user_manager.v1.AddRecentPlaye"
+    "rsRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\n\022"
+    "k\n\022ClearRecentPlayers\0227.bgs.protocol.use"
+    "r_manager.v1.ClearRecentPlayersRequest\032\024"
+    ".bgs.protocol.NoData\"\006\202\371+\002\010\013\022]\n\013BlockPla"
+    "yer\0220.bgs.protocol.user_manager.v1.Block"
+    "PlayerRequest\032\024.bgs.protocol.NoData\"\006\202\371+"
+    "\002\010\024\022a\n\rUnblockPlayer\0222.bgs.protocol.user"
+    "_manager.v1.UnblockPlayerRequest\032\024.bgs.p"
+    "rotocol.NoData\"\006\202\371+\002\010\025\022g\n\025BlockPlayerFor"
+    "Session\0220.bgs.protocol.user_manager.v1.B"
+    "lockPlayerRequest\032\024.bgs.protocol.NoData\""
+    "\006\202\371+\002\010(\022]\n\013Unsubscribe\0220.bgs.protocol.us"
+    "er_manager.v1.UnsubscribeRequest\032\024.bgs.p"
+    "rotocol.NoData\"\006\202\371+\002\0103\032I\202\371+\?\n-bnet.proto"
+    "col.user_manager.UserManagerService*\014use"
+    "r_manager0\001\212\371+\002\020\0012\273\004\n\023UserManagerListene"
+    "r\022w\n\024OnBlockedPlayerAdded\022<.bgs.protocol"
+    ".user_manager.v1.BlockedPlayerAddedNotif"
+    "ication\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002"
+    "\010\001\022{\n\026OnBlockedPlayerRemoved\022>.bgs.proto"
+    "col.user_manager.v1.BlockedPlayerRemoved"
+    "Notification\032\031.bgs.protocol.NO_RESPONSE\""
+    "\006\202\371+\002\010\002\022w\n\024OnRecentPlayersAdded\022<.bgs.pr"
+    "otocol.user_manager.v1.RecentPlayersAdde"
+    "dNotification\032\031.bgs.protocol.NO_RESPONSE"
+    "\"\006\202\371+\002\010\013\022{\n\026OnRecentPlayersRemoved\022>.bgs"
+    ".protocol.user_manager.v1.RecentPlayersR"
+    "emovedNotification\032\031.bgs.protocol.NO_RES"
+    "PONSE\"\006\202\371+\002\010\014\0328\202\371+.\n,bnet.protocol.user_"
+    "manager.UserManagerNotify\212\371+\002\010\001B\005H\001\200\001\000", 2958);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "user_manager_service.proto", &protobuf_RegisterTypes);
   SubscribeRequest::default_instance_ = new SubscribeRequest();
@@ -712,7 +709,6 @@ void SubscribeRequest::Swap(SubscribeRequest* other) {
 #ifndef _MSC_VER
 const int SubscribeResponse::kBlockedPlayersFieldNumber;
 const int SubscribeResponse::kRecentPlayersFieldNumber;
-const int SubscribeResponse::kRoleFieldNumber;
 #endif  // !_MSC_VER
 
 SubscribeResponse::SubscribeResponse()
@@ -770,7 +766,6 @@ SubscribeResponse* SubscribeResponse::New() const {
 void SubscribeResponse::Clear() {
   blocked_players_.Clear();
   recent_players_.Clear();
-  role_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
@@ -809,20 +804,6 @@ bool SubscribeResponse::MergePartialFromCodedStream(
           goto handle_unusual;
         }
         if (input->ExpectTag(18)) goto parse_recent_players;
-        if (input->ExpectTag(26)) goto parse_role;
-        break;
-      }
-
-      // repeated .bgs.protocol.Role role = 3;
-      case 3: {
-        if (tag == 26) {
-         parse_role:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_role()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(26)) goto parse_role;
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -864,12 +845,6 @@ void SubscribeResponse::SerializeWithCachedSizes(
       2, this->recent_players(i), output);
   }
 
-  // repeated .bgs.protocol.Role role = 3;
-  for (int i = 0; i < this->role_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->role(i), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -894,13 +869,6 @@ void SubscribeResponse::SerializeWithCachedSizes(
         2, this->recent_players(i), target);
   }
 
-  // repeated .bgs.protocol.Role role = 3;
-  for (int i = 0; i < this->role_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->role(i), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -928,14 +896,6 @@ int SubscribeResponse::ByteSize() const {
         this->recent_players(i));
   }
 
-  // repeated .bgs.protocol.Role role = 3;
-  total_size += 1 * this->role_size();
-  for (int i = 0; i < this->role_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->role(i));
-  }
-
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -963,7 +923,6 @@ void SubscribeResponse::MergeFrom(const SubscribeResponse& from) {
   GOOGLE_CHECK_NE(&from, this);
   blocked_players_.MergeFrom(from.blocked_players_);
   recent_players_.MergeFrom(from.recent_players_);
-  role_.MergeFrom(from.role_);
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
@@ -983,7 +942,6 @@ bool SubscribeResponse::IsInitialized() const {
 
   if (!::google::protobuf::internal::AllAreInitialized(this->blocked_players())) return false;
   if (!::google::protobuf::internal::AllAreInitialized(this->recent_players())) return false;
-  if (!::google::protobuf::internal::AllAreInitialized(this->role())) return false;
   return true;
 }
 
@@ -991,7 +949,6 @@ void SubscribeResponse::Swap(SubscribeResponse* other) {
   if (other != this) {
     blocked_players_.Swap(&other->blocked_players_);
     recent_players_.Swap(&other->recent_players_);
-    role_.Swap(&other->role_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -1866,7 +1823,6 @@ void ClearRecentPlayersRequest::Swap(ClearRecentPlayersRequest* other) {
 #ifndef _MSC_VER
 const int BlockPlayerRequest::kAgentIdFieldNumber;
 const int BlockPlayerRequest::kTargetIdFieldNumber;
-const int BlockPlayerRequest::kRoleFieldNumber;
 #endif  // !_MSC_VER
 
 BlockPlayerRequest::BlockPlayerRequest()
@@ -1891,7 +1847,6 @@ void BlockPlayerRequest::SharedCtor() {
   _cached_size_ = 0;
   agent_id_ = NULL;
   target_id_ = NULL;
-  role_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -1929,14 +1884,13 @@ BlockPlayerRequest* BlockPlayerRequest::New() const {
 }
 
 void BlockPlayerRequest::Clear() {
-  if (_has_bits_[0 / 32] & 7) {
+  if (_has_bits_[0 / 32] & 3) {
     if (has_agent_id()) {
       if (agent_id_ != NULL) agent_id_->::bgs::protocol::EntityId::Clear();
     }
     if (has_target_id()) {
       if (target_id_ != NULL) target_id_->::bgs::protocol::EntityId::Clear();
     }
-    role_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -1973,21 +1927,6 @@ bool BlockPlayerRequest::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(24)) goto parse_role;
-        break;
-      }
-
-      // optional uint32 role = 3;
-      case 3: {
-        if (tag == 24) {
-         parse_role:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &role_)));
-          set_has_role();
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectAtEnd()) goto success;
         break;
       }
@@ -2029,11 +1968,6 @@ void BlockPlayerRequest::SerializeWithCachedSizes(
       2, this->target_id(), output);
   }
 
-  // optional uint32 role = 3;
-  if (has_role()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->role(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2058,11 +1992,6 @@ void BlockPlayerRequest::SerializeWithCachedSizes(
         2, this->target_id(), target);
   }
 
-  // optional uint32 role = 3;
-  if (has_role()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->role(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -2089,13 +2018,6 @@ int BlockPlayerRequest::ByteSize() const {
           this->target_id());
     }
 
-    // optional uint32 role = 3;
-    if (has_role()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->role());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -2129,9 +2051,6 @@ void BlockPlayerRequest::MergeFrom(const BlockPlayerRequest& from) {
     if (from.has_target_id()) {
       mutable_target_id()->::bgs::protocol::EntityId::MergeFrom(from.target_id());
     }
-    if (from.has_role()) {
-      set_role(from.role());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -2164,7 +2083,6 @@ void BlockPlayerRequest::Swap(BlockPlayerRequest* other) {
   if (other != this) {
     std::swap(agent_id_, other->agent_id_);
     std::swap(target_id_, other->target_id_);
-    std::swap(role_, other->role_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/src/server/proto/Client/user_manager_service.pb.h b/src/server/proto/Client/user_manager_service.pb.h
index 7bdd083a75f..11953a0f7a2 100644
--- a/src/server/proto/Client/user_manager_service.pb.h
+++ b/src/server/proto/Client/user_manager_service.pb.h
@@ -26,7 +26,6 @@
 #include <google/protobuf/unknown_field_set.h>
 #include "user_manager_types.pb.h"
 #include "entity_types.pb.h"
-#include "role_types.pb.h"
 #include "rpc_types.pb.h"
 #include "ServiceBase.h"
 #include "MessageBuffer.h"
@@ -226,18 +225,6 @@ class TC_PROTO_API SubscribeResponse : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::user_manager::v1::RecentPlayer >*
       mutable_recent_players();
 
-  // repeated .bgs.protocol.Role role = 3;
-  inline int role_size() const;
-  inline void clear_role();
-  static const int kRoleFieldNumber = 3;
-  inline const ::bgs::protocol::Role& role(int index) const;
-  inline ::bgs::protocol::Role* mutable_role(int index);
-  inline ::bgs::protocol::Role* add_role();
-  inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Role >&
-      role() const;
-  inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Role >*
-      mutable_role();
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.user_manager.v1.SubscribeResponse)
  private:
 
@@ -247,7 +234,6 @@ class TC_PROTO_API SubscribeResponse : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::user_manager::v1::BlockedPlayer > blocked_players_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::user_manager::v1::RecentPlayer > recent_players_;
-  ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Role > role_;
   friend void TC_PROTO_API protobuf_AddDesc_user_5fmanager_5fservice_2eproto();
   friend void protobuf_AssignDesc_user_5fmanager_5fservice_2eproto();
   friend void protobuf_ShutdownFile_user_5fmanager_5fservice_2eproto();
@@ -614,21 +600,12 @@ class TC_PROTO_API BlockPlayerRequest : public ::google::protobuf::Message {
   inline ::bgs::protocol::EntityId* release_target_id();
   inline void set_allocated_target_id(::bgs::protocol::EntityId* target_id);
 
-  // optional uint32 role = 3;
-  inline bool has_role() const;
-  inline void clear_role();
-  static const int kRoleFieldNumber = 3;
-  inline ::google::protobuf::uint32 role() const;
-  inline void set_role(::google::protobuf::uint32 value);
-
   // @@protoc_insertion_point(class_scope:bgs.protocol.user_manager.v1.BlockPlayerRequest)
  private:
   inline void set_has_agent_id();
   inline void clear_has_agent_id();
   inline void set_has_target_id();
   inline void clear_has_target_id();
-  inline void set_has_role();
-  inline void clear_has_role();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -636,7 +613,6 @@ class TC_PROTO_API BlockPlayerRequest : public ::google::protobuf::Message {
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* agent_id_;
   ::bgs::protocol::EntityId* target_id_;
-  ::google::protobuf::uint32 role_;
   friend void TC_PROTO_API protobuf_AddDesc_user_5fmanager_5fservice_2eproto();
   friend void protobuf_AssignDesc_user_5fmanager_5fservice_2eproto();
   friend void protobuf_ShutdownFile_user_5fmanager_5fservice_2eproto();
@@ -1307,36 +1283,6 @@ SubscribeResponse::mutable_recent_players() {
   return &recent_players_;
 }
 
-// repeated .bgs.protocol.Role role = 3;
-inline int SubscribeResponse::role_size() const {
-  return role_.size();
-}
-inline void SubscribeResponse::clear_role() {
-  role_.Clear();
-}
-inline const ::bgs::protocol::Role& SubscribeResponse::role(int index) const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.user_manager.v1.SubscribeResponse.role)
-  return role_.Get(index);
-}
-inline ::bgs::protocol::Role* SubscribeResponse::mutable_role(int index) {
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.user_manager.v1.SubscribeResponse.role)
-  return role_.Mutable(index);
-}
-inline ::bgs::protocol::Role* SubscribeResponse::add_role() {
-  // @@protoc_insertion_point(field_add:bgs.protocol.user_manager.v1.SubscribeResponse.role)
-  return role_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Role >&
-SubscribeResponse::role() const {
-  // @@protoc_insertion_point(field_list:bgs.protocol.user_manager.v1.SubscribeResponse.role)
-  return role_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Role >*
-SubscribeResponse::mutable_role() {
-  // @@protoc_insertion_point(field_mutable_list:bgs.protocol.user_manager.v1.SubscribeResponse.role)
-  return &role_;
-}
-
 // -------------------------------------------------------------------
 
 // UnsubscribeRequest
@@ -1660,30 +1606,6 @@ inline void BlockPlayerRequest::set_allocated_target_id(::bgs::protocol::EntityI
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.user_manager.v1.BlockPlayerRequest.target_id)
 }
 
-// optional uint32 role = 3;
-inline bool BlockPlayerRequest::has_role() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void BlockPlayerRequest::set_has_role() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void BlockPlayerRequest::clear_has_role() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void BlockPlayerRequest::clear_role() {
-  role_ = 0u;
-  clear_has_role();
-}
-inline ::google::protobuf::uint32 BlockPlayerRequest::role() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.user_manager.v1.BlockPlayerRequest.role)
-  return role_;
-}
-inline void BlockPlayerRequest::set_role(::google::protobuf::uint32 value) {
-  set_has_role();
-  role_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.user_manager.v1.BlockPlayerRequest.role)
-}
-
 // -------------------------------------------------------------------
 
 // UnblockPlayerRequest
diff --git a/src/server/proto/Client/user_manager_types.pb.cc b/src/server/proto/Client/user_manager_types.pb.cc
index 2606b6440c0..fc8b17141cc 100644
--- a/src/server/proto/Client/user_manager_types.pb.cc
+++ b/src/server/proto/Client/user_manager_types.pb.cc
@@ -42,12 +42,11 @@ void protobuf_AssignDesc_user_5fmanager_5ftypes_2eproto() {
       "user_manager_types.proto");
   GOOGLE_CHECK(file != NULL);
   RecentPlayer_descriptor_ = file->message_type(0);
-  static const int RecentPlayer_offsets_[6] = {
+  static const int RecentPlayer_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecentPlayer, entity_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecentPlayer, program_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecentPlayer, timestamp_played_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecentPlayer, attributes_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecentPlayer, id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecentPlayer, counter_),
   };
   RecentPlayer_reflection_ =
@@ -64,7 +63,7 @@ void protobuf_AssignDesc_user_5fmanager_5ftypes_2eproto() {
   BlockedPlayer_descriptor_ = file->message_type(1);
   static const int BlockedPlayer_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockedPlayer, account_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockedPlayer, name_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockedPlayer, battle_tag_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockedPlayer, role_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BlockedPlayer, privileges_),
   };
@@ -112,20 +111,22 @@ void protobuf_AddDesc_user_5fmanager_5ftypes_2eproto() {
   already_here = true;
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
+  ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto();
   ::bgs::protocol::protobuf_AddDesc_entity_5ftypes_2eproto();
   ::bgs::protocol::protobuf_AddDesc_attribute_5ftypes_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\030user_manager_types.proto\022\034bgs.protocol"
-    ".user_manager.v1\032\022entity_types.proto\032\025at"
-    "tribute_types.proto\"\264\001\n\014RecentPlayer\022)\n\t"
-    "entity_id\030\001 \002(\0132\026.bgs.protocol.EntityId\022"
-    "\017\n\007program\030\002 \001(\t\022\030\n\020timestamp_played\030\003 \001"
-    "(\006\022+\n\nattributes\030\004 \003(\0132\027.bgs.protocol.At"
-    "tribute\022\r\n\002id\030\005 \001(\007:\0010\022\022\n\007counter\030\006 \001(\007:"
-    "\0010\"r\n\rBlockedPlayer\022*\n\naccount_id\030\001 \002(\0132"
-    "\026.bgs.protocol.EntityId\022\014\n\004name\030\002 \001(\t\022\020\n"
-    "\004role\030\003 \003(\rB\002\020\001\022\025\n\nprivileges\030\004 \001(\004:\0010B\002"
-    "H\001", 402);
+    ".user_manager.v1\032%global_extensions/fiel"
+    "d_options.proto\032\022entity_types.proto\032\025att"
+    "ribute_types.proto\"\245\001\n\014RecentPlayer\022)\n\te"
+    "ntity_id\030\001 \002(\0132\026.bgs.protocol.EntityId\022\017"
+    "\n\007program\030\002 \001(\t\022\030\n\020timestamp_played\030\003 \001("
+    "\006\022+\n\nattributes\030\004 \003(\0132\027.bgs.protocol.Att"
+    "ribute\022\022\n\007counter\030\006 \001(\007:\0010\"\201\001\n\rBlockedPl"
+    "ayer\022*\n\naccount_id\030\001 \002(\0132\026.bgs.protocol."
+    "EntityId\022\032\n\nbattle_tag\030\002 \001(\tB\006\202\371+\002\010\001\022\020\n\004"
+    "role\030\003 \003(\rB\002\030\001\022\026\n\nprivileges\030\004 \001(\004B\002\030\001B\002"
+    "H\001P\000", 444);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "user_manager_types.proto", &protobuf_RegisterTypes);
   RecentPlayer::default_instance_ = new RecentPlayer();
@@ -149,7 +150,6 @@ const int RecentPlayer::kEntityIdFieldNumber;
 const int RecentPlayer::kProgramFieldNumber;
 const int RecentPlayer::kTimestampPlayedFieldNumber;
 const int RecentPlayer::kAttributesFieldNumber;
-const int RecentPlayer::kIdFieldNumber;
 const int RecentPlayer::kCounterFieldNumber;
 #endif  // !_MSC_VER
 
@@ -176,7 +176,6 @@ void RecentPlayer::SharedCtor() {
   entity_id_ = NULL;
   program_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   timestamp_played_ = GOOGLE_ULONGLONG(0);
-  id_ = 0u;
   counter_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -217,18 +216,7 @@ RecentPlayer* RecentPlayer::New() const {
 }
 
 void RecentPlayer::Clear() {
-#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
-  &reinterpret_cast<RecentPlayer*>(16)->f) - \
-   reinterpret_cast<char*>(16))
-
-#define ZR_(first, last) do {                              \
-    size_t f = OFFSET_OF_FIELD_(first);                    \
-    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
-    ::memset(&first, 0, n);                                \
-  } while (0)
-
-  if (_has_bits_[0 / 32] & 55) {
-    ZR_(id_, counter_);
+  if (_has_bits_[0 / 32] & 23) {
     if (has_entity_id()) {
       if (entity_id_ != NULL) entity_id_->::bgs::protocol::EntityId::Clear();
     }
@@ -238,11 +226,8 @@ void RecentPlayer::Clear() {
       }
     }
     timestamp_played_ = GOOGLE_ULONGLONG(0);
+    counter_ = 0u;
   }
-
-#undef OFFSET_OF_FIELD_
-#undef ZR_
-
   attributes_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -312,21 +297,6 @@ bool RecentPlayer::MergePartialFromCodedStream(
           goto handle_unusual;
         }
         if (input->ExpectTag(34)) goto parse_attributes;
-        if (input->ExpectTag(45)) goto parse_id;
-        break;
-      }
-
-      // optional fixed32 id = 5 [default = 0];
-      case 5: {
-        if (tag == 45) {
-         parse_id:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>(
-                 input, &id_)));
-          set_has_id();
-        } else {
-          goto handle_unusual;
-        }
         if (input->ExpectTag(53)) goto parse_counter;
         break;
       }
@@ -398,11 +368,6 @@ void RecentPlayer::SerializeWithCachedSizes(
       4, this->attributes(i), output);
   }
 
-  // optional fixed32 id = 5 [default = 0];
-  if (has_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteFixed32(5, this->id(), output);
-  }
-
   // optional fixed32 counter = 6 [default = 0];
   if (has_counter()) {
     ::google::protobuf::internal::WireFormatLite::WriteFixed32(6, this->counter(), output);
@@ -448,11 +413,6 @@ void RecentPlayer::SerializeWithCachedSizes(
         4, this->attributes(i), target);
   }
 
-  // optional fixed32 id = 5 [default = 0];
-  if (has_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(5, this->id(), target);
-  }
-
   // optional fixed32 counter = 6 [default = 0];
   if (has_counter()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(6, this->counter(), target);
@@ -489,11 +449,6 @@ int RecentPlayer::ByteSize() const {
       total_size += 1 + 8;
     }
 
-    // optional fixed32 id = 5 [default = 0];
-    if (has_id()) {
-      total_size += 1 + 4;
-    }
-
     // optional fixed32 counter = 6 [default = 0];
     if (has_counter()) {
       total_size += 1 + 4;
@@ -544,9 +499,6 @@ void RecentPlayer::MergeFrom(const RecentPlayer& from) {
     if (from.has_timestamp_played()) {
       set_timestamp_played(from.timestamp_played());
     }
-    if (from.has_id()) {
-      set_id(from.id());
-    }
     if (from.has_counter()) {
       set_counter(from.counter());
     }
@@ -582,7 +534,6 @@ void RecentPlayer::Swap(RecentPlayer* other) {
     std::swap(program_, other->program_);
     std::swap(timestamp_played_, other->timestamp_played_);
     attributes_.Swap(&other->attributes_);
-    std::swap(id_, other->id_);
     std::swap(counter_, other->counter_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
@@ -603,7 +554,7 @@ void RecentPlayer::Swap(RecentPlayer* other) {
 
 #ifndef _MSC_VER
 const int BlockedPlayer::kAccountIdFieldNumber;
-const int BlockedPlayer::kNameFieldNumber;
+const int BlockedPlayer::kBattleTagFieldNumber;
 const int BlockedPlayer::kRoleFieldNumber;
 const int BlockedPlayer::kPrivilegesFieldNumber;
 #endif  // !_MSC_VER
@@ -629,8 +580,7 @@ void BlockedPlayer::SharedCtor() {
   ::google::protobuf::internal::GetEmptyString();
   _cached_size_ = 0;
   account_id_ = NULL;
-  name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  _role_cached_byte_size_ = 0;
+  battle_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   privileges_ = GOOGLE_ULONGLONG(0);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -641,8 +591,8 @@ BlockedPlayer::~BlockedPlayer() {
 }
 
 void BlockedPlayer::SharedDtor() {
-  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    delete name_;
+  if (battle_tag_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete battle_tag_;
   }
   if (this != default_instance_) {
     delete account_id_;
@@ -675,9 +625,9 @@ void BlockedPlayer::Clear() {
     if (has_account_id()) {
       if (account_id_ != NULL) account_id_->::bgs::protocol::EntityId::Clear();
     }
-    if (has_name()) {
-      if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-        name_->clear();
+    if (has_battle_tag()) {
+      if (battle_tag_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+        battle_tag_->clear();
       }
     }
     privileges_ = GOOGLE_ULONGLONG(0);
@@ -705,46 +655,47 @@ bool BlockedPlayer::MergePartialFromCodedStream(
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(18)) goto parse_name;
+        if (input->ExpectTag(18)) goto parse_battle_tag;
         break;
       }
 
-      // optional string name = 2;
+      // optional string battle_tag = 2;
       case 2: {
         if (tag == 18) {
-         parse_name:
+         parse_battle_tag:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_name()));
+                input, this->mutable_battle_tag()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->name().data(), this->name().length(),
+            this->battle_tag().data(), this->battle_tag().length(),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "name");
+            "battle_tag");
         } else {
           goto handle_unusual;
         }
-        if (input->ExpectTag(26)) goto parse_role;
+        if (input->ExpectTag(24)) goto parse_role;
         break;
       }
 
-      // repeated uint32 role = 3 [packed = true];
+      // repeated uint32 role = 3 [deprecated = true];
       case 3: {
-        if (tag == 26) {
+        if (tag == 24) {
          parse_role:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, this->mutable_role())));
-        } else if (tag == 24) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
+                 1, 24, input, this->mutable_role())));
+        } else if (tag == 26) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 1, 26, input, this->mutable_role())));
+                 input, this->mutable_role())));
         } else {
           goto handle_unusual;
         }
+        if (input->ExpectTag(24)) goto parse_role;
         if (input->ExpectTag(32)) goto parse_privileges;
         break;
       }
 
-      // optional uint64 privileges = 4 [default = 0];
+      // optional uint64 privileges = 4 [deprecated = true];
       case 4: {
         if (tag == 32) {
          parse_privileges:
@@ -790,27 +741,23 @@ void BlockedPlayer::SerializeWithCachedSizes(
       1, this->account_id(), output);
   }
 
-  // optional string name = 2;
-  if (has_name()) {
+  // optional string battle_tag = 2;
+  if (has_battle_tag()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->name().data(), this->name().length(),
+      this->battle_tag().data(), this->battle_tag().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "name");
+      "battle_tag");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      2, this->name(), output);
+      2, this->battle_tag(), output);
   }
 
-  // repeated uint32 role = 3 [packed = true];
-  if (this->role_size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteTag(3, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
-    output->WriteVarint32(_role_cached_byte_size_);
-  }
+  // repeated uint32 role = 3 [deprecated = true];
   for (int i = 0; i < this->role_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32NoTag(
-      this->role(i), output);
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(
+      3, this->role(i), output);
   }
 
-  // optional uint64 privileges = 4 [default = 0];
+  // optional uint64 privileges = 4 [deprecated = true];
   if (has_privileges()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->privileges(), output);
   }
@@ -832,32 +779,24 @@ void BlockedPlayer::SerializeWithCachedSizes(
         1, this->account_id(), target);
   }
 
-  // optional string name = 2;
-  if (has_name()) {
+  // optional string battle_tag = 2;
+  if (has_battle_tag()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->name().data(), this->name().length(),
+      this->battle_tag().data(), this->battle_tag().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "name");
+      "battle_tag");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->name(), target);
+        2, this->battle_tag(), target);
   }
 
-  // repeated uint32 role = 3 [packed = true];
-  if (this->role_size() > 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
-      3,
-      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-      target);
-    target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(
-      _role_cached_byte_size_, target);
-  }
+  // repeated uint32 role = 3 [deprecated = true];
   for (int i = 0; i < this->role_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteUInt32NoTagToArray(this->role(i), target);
+      WriteUInt32ToArray(3, this->role(i), target);
   }
 
-  // optional uint64 privileges = 4 [default = 0];
+  // optional uint64 privileges = 4 [deprecated = true];
   if (has_privileges()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->privileges(), target);
   }
@@ -881,14 +820,14 @@ int BlockedPlayer::ByteSize() const {
           this->account_id());
     }
 
-    // optional string name = 2;
-    if (has_name()) {
+    // optional string battle_tag = 2;
+    if (has_battle_tag()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->name());
+          this->battle_tag());
     }
 
-    // optional uint64 privileges = 4 [default = 0];
+    // optional uint64 privileges = 4 [deprecated = true];
     if (has_privileges()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt64Size(
@@ -896,21 +835,14 @@ int BlockedPlayer::ByteSize() const {
     }
 
   }
-  // repeated uint32 role = 3 [packed = true];
+  // repeated uint32 role = 3 [deprecated = true];
   {
     int data_size = 0;
     for (int i = 0; i < this->role_size(); i++) {
       data_size += ::google::protobuf::internal::WireFormatLite::
         UInt32Size(this->role(i));
     }
-    if (data_size > 0) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);
-    }
-    GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-    _role_cached_byte_size_ = data_size;
-    GOOGLE_SAFE_CONCURRENT_WRITES_END();
-    total_size += data_size;
+    total_size += 1 * this->role_size() + data_size;
   }
 
   if (!unknown_fields().empty()) {
@@ -943,8 +875,8 @@ void BlockedPlayer::MergeFrom(const BlockedPlayer& from) {
     if (from.has_account_id()) {
       mutable_account_id()->::bgs::protocol::EntityId::MergeFrom(from.account_id());
     }
-    if (from.has_name()) {
-      set_name(from.name());
+    if (from.has_battle_tag()) {
+      set_battle_tag(from.battle_tag());
     }
     if (from.has_privileges()) {
       set_privileges(from.privileges());
@@ -977,7 +909,7 @@ bool BlockedPlayer::IsInitialized() const {
 void BlockedPlayer::Swap(BlockedPlayer* other) {
   if (other != this) {
     std::swap(account_id_, other->account_id_);
-    std::swap(name_, other->name_);
+    std::swap(battle_tag_, other->battle_tag_);
     role_.Swap(&other->role_);
     std::swap(privileges_, other->privileges_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
diff --git a/src/server/proto/Client/user_manager_types.pb.h b/src/server/proto/Client/user_manager_types.pb.h
index 91f624c8bd6..0e38d13b8de 100644
--- a/src/server/proto/Client/user_manager_types.pb.h
+++ b/src/server/proto/Client/user_manager_types.pb.h
@@ -24,6 +24,7 @@
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/extension_set.h>
 #include <google/protobuf/unknown_field_set.h>
+#include "global_extensions/field_options.pb.h"  // IWYU pragma: export
 #include "entity_types.pb.h"
 #include "attribute_types.pb.h"
 #include "Define.h" // for TC_PROTO_API
@@ -137,13 +138,6 @@ class TC_PROTO_API RecentPlayer : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute >*
       mutable_attributes();
 
-  // optional fixed32 id = 5 [default = 0];
-  inline bool has_id() const;
-  inline void clear_id();
-  static const int kIdFieldNumber = 5;
-  inline ::google::protobuf::uint32 id() const;
-  inline void set_id(::google::protobuf::uint32 value);
-
   // optional fixed32 counter = 6 [default = 0];
   inline bool has_counter() const;
   inline void clear_counter();
@@ -159,8 +153,6 @@ class TC_PROTO_API RecentPlayer : public ::google::protobuf::Message {
   inline void clear_has_program();
   inline void set_has_timestamp_played();
   inline void clear_has_timestamp_played();
-  inline void set_has_id();
-  inline void clear_has_id();
   inline void set_has_counter();
   inline void clear_has_counter();
 
@@ -172,7 +164,6 @@ class TC_PROTO_API RecentPlayer : public ::google::protobuf::Message {
   ::std::string* program_;
   ::google::protobuf::uint64 timestamp_played_;
   ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute > attributes_;
-  ::google::protobuf::uint32 id_;
   ::google::protobuf::uint32 counter_;
   friend void TC_PROTO_API protobuf_AddDesc_user_5fmanager_5ftypes_2eproto();
   friend void protobuf_AssignDesc_user_5fmanager_5ftypes_2eproto();
@@ -245,43 +236,43 @@ class TC_PROTO_API BlockedPlayer : public ::google::protobuf::Message {
   inline ::bgs::protocol::EntityId* release_account_id();
   inline void set_allocated_account_id(::bgs::protocol::EntityId* account_id);
 
-  // optional string name = 2;
-  inline bool has_name() const;
-  inline void clear_name();
-  static const int kNameFieldNumber = 2;
-  inline const ::std::string& name() const;
-  inline void set_name(const ::std::string& value);
-  inline void set_name(const char* value);
-  inline void set_name(const char* value, size_t size);
-  inline ::std::string* mutable_name();
-  inline ::std::string* release_name();
-  inline void set_allocated_name(::std::string* name);
-
-  // repeated uint32 role = 3 [packed = true];
-  inline int role_size() const;
-  inline void clear_role();
+  // optional string battle_tag = 2;
+  inline bool has_battle_tag() const;
+  inline void clear_battle_tag();
+  static const int kBattleTagFieldNumber = 2;
+  inline const ::std::string& battle_tag() const;
+  inline void set_battle_tag(const ::std::string& value);
+  inline void set_battle_tag(const char* value);
+  inline void set_battle_tag(const char* value, size_t size);
+  inline ::std::string* mutable_battle_tag();
+  inline ::std::string* release_battle_tag();
+  inline void set_allocated_battle_tag(::std::string* battle_tag);
+
+  // repeated uint32 role = 3 [deprecated = true];
+  inline int role_size() const PROTOBUF_DEPRECATED;
+  inline void clear_role() PROTOBUF_DEPRECATED;
   static const int kRoleFieldNumber = 3;
-  inline ::google::protobuf::uint32 role(int index) const;
-  inline void set_role(int index, ::google::protobuf::uint32 value);
-  inline void add_role(::google::protobuf::uint32 value);
+  inline ::google::protobuf::uint32 role(int index) const PROTOBUF_DEPRECATED;
+  inline void set_role(int index, ::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
+  inline void add_role(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-      role() const;
+      role() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-      mutable_role();
+      mutable_role() PROTOBUF_DEPRECATED;
 
-  // optional uint64 privileges = 4 [default = 0];
-  inline bool has_privileges() const;
-  inline void clear_privileges();
+  // optional uint64 privileges = 4 [deprecated = true];
+  inline bool has_privileges() const PROTOBUF_DEPRECATED;
+  inline void clear_privileges() PROTOBUF_DEPRECATED;
   static const int kPrivilegesFieldNumber = 4;
-  inline ::google::protobuf::uint64 privileges() const;
-  inline void set_privileges(::google::protobuf::uint64 value);
+  inline ::google::protobuf::uint64 privileges() const PROTOBUF_DEPRECATED;
+  inline void set_privileges(::google::protobuf::uint64 value) PROTOBUF_DEPRECATED;
 
   // @@protoc_insertion_point(class_scope:bgs.protocol.user_manager.v1.BlockedPlayer)
  private:
   inline void set_has_account_id();
   inline void clear_has_account_id();
-  inline void set_has_name();
-  inline void clear_has_name();
+  inline void set_has_battle_tag();
+  inline void clear_has_battle_tag();
   inline void set_has_privileges();
   inline void clear_has_privileges();
 
@@ -290,9 +281,8 @@ class TC_PROTO_API BlockedPlayer : public ::google::protobuf::Message {
   ::google::protobuf::uint32 _has_bits_[1];
   mutable int _cached_size_;
   ::bgs::protocol::EntityId* account_id_;
-  ::std::string* name_;
+  ::std::string* battle_tag_;
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > role_;
-  mutable int _role_cached_byte_size_;
   ::google::protobuf::uint64 privileges_;
   friend void TC_PROTO_API protobuf_AddDesc_user_5fmanager_5ftypes_2eproto();
   friend void protobuf_AssignDesc_user_5fmanager_5ftypes_2eproto();
@@ -482,39 +472,15 @@ RecentPlayer::mutable_attributes() {
   return &attributes_;
 }
 
-// optional fixed32 id = 5 [default = 0];
-inline bool RecentPlayer::has_id() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
-}
-inline void RecentPlayer::set_has_id() {
-  _has_bits_[0] |= 0x00000010u;
-}
-inline void RecentPlayer::clear_has_id() {
-  _has_bits_[0] &= ~0x00000010u;
-}
-inline void RecentPlayer::clear_id() {
-  id_ = 0u;
-  clear_has_id();
-}
-inline ::google::protobuf::uint32 RecentPlayer::id() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.user_manager.v1.RecentPlayer.id)
-  return id_;
-}
-inline void RecentPlayer::set_id(::google::protobuf::uint32 value) {
-  set_has_id();
-  id_ = value;
-  // @@protoc_insertion_point(field_set:bgs.protocol.user_manager.v1.RecentPlayer.id)
-}
-
 // optional fixed32 counter = 6 [default = 0];
 inline bool RecentPlayer::has_counter() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
 inline void RecentPlayer::set_has_counter() {
-  _has_bits_[0] |= 0x00000020u;
+  _has_bits_[0] |= 0x00000010u;
 }
 inline void RecentPlayer::clear_has_counter() {
-  _has_bits_[0] &= ~0x00000020u;
+  _has_bits_[0] &= ~0x00000010u;
 }
 inline void RecentPlayer::clear_counter() {
   counter_ = 0u;
@@ -575,83 +541,83 @@ inline void BlockedPlayer::set_allocated_account_id(::bgs::protocol::EntityId* a
   // @@protoc_insertion_point(field_set_allocated:bgs.protocol.user_manager.v1.BlockedPlayer.account_id)
 }
 
-// optional string name = 2;
-inline bool BlockedPlayer::has_name() const {
+// optional string battle_tag = 2;
+inline bool BlockedPlayer::has_battle_tag() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void BlockedPlayer::set_has_name() {
+inline void BlockedPlayer::set_has_battle_tag() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void BlockedPlayer::clear_has_name() {
+inline void BlockedPlayer::clear_has_battle_tag() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void BlockedPlayer::clear_name() {
-  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    name_->clear();
+inline void BlockedPlayer::clear_battle_tag() {
+  if (battle_tag_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    battle_tag_->clear();
   }
-  clear_has_name();
+  clear_has_battle_tag();
 }
-inline const ::std::string& BlockedPlayer::name() const {
-  // @@protoc_insertion_point(field_get:bgs.protocol.user_manager.v1.BlockedPlayer.name)
-  return *name_;
+inline const ::std::string& BlockedPlayer::battle_tag() const {
+  // @@protoc_insertion_point(field_get:bgs.protocol.user_manager.v1.BlockedPlayer.battle_tag)
+  return *battle_tag_;
 }
-inline void BlockedPlayer::set_name(const ::std::string& value) {
-  set_has_name();
-  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    name_ = new ::std::string;
+inline void BlockedPlayer::set_battle_tag(const ::std::string& value) {
+  set_has_battle_tag();
+  if (battle_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    battle_tag_ = new ::std::string;
   }
-  name_->assign(value);
-  // @@protoc_insertion_point(field_set:bgs.protocol.user_manager.v1.BlockedPlayer.name)
+  battle_tag_->assign(value);
+  // @@protoc_insertion_point(field_set:bgs.protocol.user_manager.v1.BlockedPlayer.battle_tag)
 }
-inline void BlockedPlayer::set_name(const char* value) {
-  set_has_name();
-  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    name_ = new ::std::string;
+inline void BlockedPlayer::set_battle_tag(const char* value) {
+  set_has_battle_tag();
+  if (battle_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    battle_tag_ = new ::std::string;
   }
-  name_->assign(value);
-  // @@protoc_insertion_point(field_set_char:bgs.protocol.user_manager.v1.BlockedPlayer.name)
+  battle_tag_->assign(value);
+  // @@protoc_insertion_point(field_set_char:bgs.protocol.user_manager.v1.BlockedPlayer.battle_tag)
 }
-inline void BlockedPlayer::set_name(const char* value, size_t size) {
-  set_has_name();
-  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    name_ = new ::std::string;
+inline void BlockedPlayer::set_battle_tag(const char* value, size_t size) {
+  set_has_battle_tag();
+  if (battle_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    battle_tag_ = new ::std::string;
   }
-  name_->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.user_manager.v1.BlockedPlayer.name)
+  battle_tag_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:bgs.protocol.user_manager.v1.BlockedPlayer.battle_tag)
 }
-inline ::std::string* BlockedPlayer::mutable_name() {
-  set_has_name();
-  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    name_ = new ::std::string;
+inline ::std::string* BlockedPlayer::mutable_battle_tag() {
+  set_has_battle_tag();
+  if (battle_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    battle_tag_ = new ::std::string;
   }
-  // @@protoc_insertion_point(field_mutable:bgs.protocol.user_manager.v1.BlockedPlayer.name)
-  return name_;
+  // @@protoc_insertion_point(field_mutable:bgs.protocol.user_manager.v1.BlockedPlayer.battle_tag)
+  return battle_tag_;
 }
-inline ::std::string* BlockedPlayer::release_name() {
-  clear_has_name();
-  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+inline ::std::string* BlockedPlayer::release_battle_tag() {
+  clear_has_battle_tag();
+  if (battle_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     return NULL;
   } else {
-    ::std::string* temp = name_;
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    ::std::string* temp = battle_tag_;
+    battle_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
     return temp;
   }
 }
-inline void BlockedPlayer::set_allocated_name(::std::string* name) {
-  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-    delete name_;
+inline void BlockedPlayer::set_allocated_battle_tag(::std::string* battle_tag) {
+  if (battle_tag_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+    delete battle_tag_;
   }
-  if (name) {
-    set_has_name();
-    name_ = name;
+  if (battle_tag) {
+    set_has_battle_tag();
+    battle_tag_ = battle_tag;
   } else {
-    clear_has_name();
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+    clear_has_battle_tag();
+    battle_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
-  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.user_manager.v1.BlockedPlayer.name)
+  // @@protoc_insertion_point(field_set_allocated:bgs.protocol.user_manager.v1.BlockedPlayer.battle_tag)
 }
 
-// repeated uint32 role = 3 [packed = true];
+// repeated uint32 role = 3 [deprecated = true];
 inline int BlockedPlayer::role_size() const {
   return role_.size();
 }
@@ -681,7 +647,7 @@ BlockedPlayer::mutable_role() {
   return &role_;
 }
 
-// optional uint64 privileges = 4 [default = 0];
+// optional uint64 privileges = 4 [deprecated = true];
 inline bool BlockedPlayer::has_privileges() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
diff --git a/src/server/proto/Client/voice_types.pb.cc b/src/server/proto/Client/voice_types.pb.cc
index c1a6934a710..4cb98a8187d 100644
--- a/src/server/proto/Client/voice_types.pb.cc
+++ b/src/server/proto/Client/voice_types.pb.cc
@@ -28,6 +28,7 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
   VoiceCredentials_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* VoiceJoinType_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* VoiceMuteReason_descriptor_ = NULL;
+const ::google::protobuf::EnumDescriptor* VoiceProviderVersion_descriptor_ = NULL;
 
 }  // namespace
 
@@ -59,6 +60,7 @@ void protobuf_AssignDesc_voice_5ftypes_2eproto() {
       sizeof(VoiceCredentials));
   VoiceJoinType_descriptor_ = file->enum_type(0);
   VoiceMuteReason_descriptor_ = file->enum_type(1);
+  VoiceProviderVersion_descriptor_ = file->enum_type(2);
 }
 
 namespace {
@@ -99,7 +101,9 @@ void protobuf_AddDesc_voice_5ftypes_2eproto() {
     "on\022\032\n\026VOICE_MUTE_REASON_NONE\020\000\0222\n.VOICE_"
     "MUTE_REASON_PARENTAL_CONTROL_LISTEN_ONLY"
     "\020\001\022\037\n\033VOICE_MUTE_REASON_REQUESTED\020\002\022\037\n\033V"
-    "OICE_MUTE_REASON_SQUELCHED\020\003B\002H\001", 432);
+    "OICE_MUTE_REASON_SQUELCHED\020\003*D\n\024VoicePro"
+    "viderVersion\022\025\n\021VOICE_PROVIDER_V4\020\000\022\025\n\021V"
+    "OICE_PROVIDER_V5\020\001B\002H\001", 502);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "voice_types.proto", &protobuf_RegisterTypes);
   VoiceCredentials::default_instance_ = new VoiceCredentials();
@@ -143,6 +147,20 @@ bool VoiceMuteReason_IsValid(int value) {
   }
 }
 
+const ::google::protobuf::EnumDescriptor* VoiceProviderVersion_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return VoiceProviderVersion_descriptor_;
+}
+bool VoiceProviderVersion_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+      return true;
+    default:
+      return false;
+  }
+}
+
 
 // ===================================================================
 
diff --git a/src/server/proto/Client/voice_types.pb.h b/src/server/proto/Client/voice_types.pb.h
index 3784af85015..d98b9c2f3a7 100644
--- a/src/server/proto/Client/voice_types.pb.h
+++ b/src/server/proto/Client/voice_types.pb.h
@@ -78,6 +78,25 @@ inline bool VoiceMuteReason_Parse(
   return ::google::protobuf::internal::ParseNamedEnum<VoiceMuteReason>(
     VoiceMuteReason_descriptor(), name, value);
 }
+enum VoiceProviderVersion {
+  VOICE_PROVIDER_V4 = 0,
+  VOICE_PROVIDER_V5 = 1
+};
+TC_PROTO_API bool VoiceProviderVersion_IsValid(int value);
+const VoiceProviderVersion VoiceProviderVersion_MIN = VOICE_PROVIDER_V4;
+const VoiceProviderVersion VoiceProviderVersion_MAX = VOICE_PROVIDER_V5;
+const int VoiceProviderVersion_ARRAYSIZE = VoiceProviderVersion_MAX + 1;
+
+TC_PROTO_API const ::google::protobuf::EnumDescriptor* VoiceProviderVersion_descriptor();
+inline const ::std::string& VoiceProviderVersion_Name(VoiceProviderVersion value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    VoiceProviderVersion_descriptor(), value);
+}
+inline bool VoiceProviderVersion_Parse(
+    const ::std::string& name, VoiceProviderVersion* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<VoiceProviderVersion>(
+    VoiceProviderVersion_descriptor(), name, value);
+}
 // ===================================================================
 
 class TC_PROTO_API VoiceCredentials : public ::google::protobuf::Message {
@@ -520,6 +539,11 @@ template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::bgs::protocol::VoiceMuteReason>() {
   return ::bgs::protocol::VoiceMuteReason_descriptor();
 }
+template <> struct is_proto_enum< ::bgs::protocol::VoiceProviderVersion> : ::google::protobuf::internal::true_type {};
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::bgs::protocol::VoiceProviderVersion>() {
+  return ::bgs::protocol::VoiceProviderVersion_descriptor();
+}
 
 }  // namespace google
 }  // namespace protobuf