Contrib: Updated protoc plugin to generate service classes suitable for dynamic linking

22 files changed, 211 insertions, 109 deletions

diff --git a/src/server/proto/Client/account_service.pb.cc b/src/server/proto/Client/account_service.pb.cc
index f90546e85ec..097d1caaaf7 100644
--- a/src/server/proto/Client/account_service.pb.cc
+++ b/src/server/proto/Client/account_service.pb.cc
@@ -10726,12 +10726,18 @@ void GameAccountSessionNotification::Swap(GameAccountSessionNotification* other)
 
 // ===================================================================
 
+AccountService::AccountService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+AccountService::~AccountService() {
+}
+
 google::protobuf::ServiceDescriptor const* AccountService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return AccountService_descriptor_;
 }
 
-void AccountService::GetGameAccount(::bgs::protocol::account::v1::GameAccountHandle const* request, std::function<void(::bgs::protocol::account::v1::GameAccountBlob const*)> responseCallback) { 
+void AccountService::GetGameAccount(::bgs::protocol::account::v1::GameAccountHandle const* request, std::function<void(::bgs::protocol::account::v1::GameAccountBlob const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameAccount(bgs.protocol.account.v1.GameAccountHandle{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10742,7 +10748,7 @@ void AccountService::GetGameAccount(::bgs::protocol::account::v1::GameAccountHan
   SendRequest(service_hash_, 12, request, std::move(callback));
 }
 
-void AccountService::GetAccount(::bgs::protocol::account::v1::GetAccountRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAccountResponse const*)> responseCallback) { 
+void AccountService::GetAccount(::bgs::protocol::account::v1::GetAccountRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAccountResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetAccount(bgs.protocol.account.v1.GetAccountRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10753,7 +10759,7 @@ void AccountService::GetAccount(::bgs::protocol::account::v1::GetAccountRequest
   SendRequest(service_hash_, 13, request, std::move(callback));
 }
 
-void AccountService::CreateGameAccount(::bgs::protocol::account::v1::CreateGameAccountRequest const* request, std::function<void(::bgs::protocol::account::v1::GameAccountHandle const*)> responseCallback) { 
+void AccountService::CreateGameAccount(::bgs::protocol::account::v1::CreateGameAccountRequest const* request, std::function<void(::bgs::protocol::account::v1::GameAccountHandle const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.CreateGameAccount(bgs.protocol.account.v1.CreateGameAccountRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10764,7 +10770,7 @@ void AccountService::CreateGameAccount(::bgs::protocol::account::v1::CreateGameA
   SendRequest(service_hash_, 14, request, std::move(callback));
 }
 
-void AccountService::IsIgrAddress(::bgs::protocol::account::v1::IsIgrAddressRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AccountService::IsIgrAddress(::bgs::protocol::account::v1::IsIgrAddressRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.IsIgrAddress(bgs.protocol.account.v1.IsIgrAddressRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10781,7 +10787,7 @@ void AccountService::CacheExpire(::bgs::protocol::account::v1::CacheExpireReques
   SendRequest(service_hash_, 20, request);
 }
 
-void AccountService::CredentialUpdate(::bgs::protocol::account::v1::CredentialUpdateRequest const* request, std::function<void(::bgs::protocol::account::v1::CredentialUpdateResponse const*)> responseCallback) { 
+void AccountService::CredentialUpdate(::bgs::protocol::account::v1::CredentialUpdateRequest const* request, std::function<void(::bgs::protocol::account::v1::CredentialUpdateResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.CredentialUpdate(bgs.protocol.account.v1.CredentialUpdateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10792,7 +10798,7 @@ void AccountService::CredentialUpdate(::bgs::protocol::account::v1::CredentialUp
   SendRequest(service_hash_, 21, request, std::move(callback));
 }
 
-void AccountService::Subscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, std::function<void(::bgs::protocol::account::v1::SubscriptionUpdateResponse const*)> responseCallback) { 
+void AccountService::Subscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, std::function<void(::bgs::protocol::account::v1::SubscriptionUpdateResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.Subscribe(bgs.protocol.account.v1.SubscriptionUpdateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10803,7 +10809,7 @@ void AccountService::Subscribe(::bgs::protocol::account::v1::SubscriptionUpdateR
   SendRequest(service_hash_, 25, request, std::move(callback));
 }
 
-void AccountService::Unsubscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AccountService::Unsubscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.Unsubscribe(bgs.protocol.account.v1.SubscriptionUpdateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10814,7 +10820,7 @@ void AccountService::Unsubscribe(::bgs::protocol::account::v1::SubscriptionUpdat
   SendRequest(service_hash_, 26, request, std::move(callback));
 }
 
-void AccountService::GetAccountState(::bgs::protocol::account::v1::GetAccountStateRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAccountStateResponse const*)> responseCallback) { 
+void AccountService::GetAccountState(::bgs::protocol::account::v1::GetAccountStateRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAccountStateResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetAccountState(bgs.protocol.account.v1.GetAccountStateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10825,7 +10831,7 @@ void AccountService::GetAccountState(::bgs::protocol::account::v1::GetAccountSta
   SendRequest(service_hash_, 30, request, std::move(callback));
 }
 
-void AccountService::GetGameAccountState(::bgs::protocol::account::v1::GetGameAccountStateRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameAccountStateResponse const*)> responseCallback) { 
+void AccountService::GetGameAccountState(::bgs::protocol::account::v1::GetGameAccountStateRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameAccountStateResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameAccountState(bgs.protocol.account.v1.GetGameAccountStateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10836,7 +10842,7 @@ void AccountService::GetGameAccountState(::bgs::protocol::account::v1::GetGameAc
   SendRequest(service_hash_, 31, request, std::move(callback));
 }
 
-void AccountService::GetLicenses(::bgs::protocol::account::v1::GetLicensesRequest const* request, std::function<void(::bgs::protocol::account::v1::GetLicensesResponse const*)> responseCallback) { 
+void AccountService::GetLicenses(::bgs::protocol::account::v1::GetLicensesRequest const* request, std::function<void(::bgs::protocol::account::v1::GetLicensesResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetLicenses(bgs.protocol.account.v1.GetLicensesRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10847,7 +10853,7 @@ void AccountService::GetLicenses(::bgs::protocol::account::v1::GetLicensesReques
   SendRequest(service_hash_, 32, request, std::move(callback));
 }
 
-void AccountService::GetGameTimeRemainingInfo(::bgs::protocol::account::v1::GetGameTimeRemainingInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameTimeRemainingInfoResponse const*)> responseCallback) { 
+void AccountService::GetGameTimeRemainingInfo(::bgs::protocol::account::v1::GetGameTimeRemainingInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameTimeRemainingInfoResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameTimeRemainingInfo(bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10858,7 +10864,7 @@ void AccountService::GetGameTimeRemainingInfo(::bgs::protocol::account::v1::GetG
   SendRequest(service_hash_, 33, request, std::move(callback));
 }
 
-void AccountService::GetGameSessionInfo(::bgs::protocol::account::v1::GetGameSessionInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameSessionInfoResponse const*)> responseCallback) { 
+void AccountService::GetGameSessionInfo(::bgs::protocol::account::v1::GetGameSessionInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameSessionInfoResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameSessionInfo(bgs.protocol.account.v1.GetGameSessionInfoRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10869,7 +10875,7 @@ void AccountService::GetGameSessionInfo(::bgs::protocol::account::v1::GetGameSes
   SendRequest(service_hash_, 34, request, std::move(callback));
 }
 
-void AccountService::GetCAISInfo(::bgs::protocol::account::v1::GetCAISInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetCAISInfoResponse const*)> responseCallback) { 
+void AccountService::GetCAISInfo(::bgs::protocol::account::v1::GetCAISInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetCAISInfoResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetCAISInfo(bgs.protocol.account.v1.GetCAISInfoRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10880,7 +10886,7 @@ void AccountService::GetCAISInfo(::bgs::protocol::account::v1::GetCAISInfoReques
   SendRequest(service_hash_, 35, request, std::move(callback));
 }
 
-void AccountService::ForwardCacheExpire(::bgs::protocol::account::v1::ForwardCacheExpireRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AccountService::ForwardCacheExpire(::bgs::protocol::account::v1::ForwardCacheExpireRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.ForwardCacheExpire(bgs.protocol.account.v1.ForwardCacheExpireRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -10891,7 +10897,7 @@ void AccountService::ForwardCacheExpire(::bgs::protocol::account::v1::ForwardCac
   SendRequest(service_hash_, 36, request, std::move(callback));
 }
 
-void AccountService::GetAuthorizedData(::bgs::protocol::account::v1::GetAuthorizedDataRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAuthorizedDataResponse const*)> responseCallback) { 
+void AccountService::GetAuthorizedData(::bgs::protocol::account::v1::GetAuthorizedDataRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAuthorizedDataResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetAuthorizedData(bgs.protocol.account.v1.GetAuthorizedDataRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -11348,6 +11354,12 @@ uint32 AccountService::HandleGameAccountFlagUpdate(::bgs::protocol::account::v1:
 
 // ===================================================================
 
+AccountListener::AccountListener(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+AccountListener::~AccountListener() {
+}
+
 google::protobuf::ServiceDescriptor const* AccountListener::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return AccountListener_descriptor_;
diff --git a/src/server/proto/Client/account_service.pb.h b/src/server/proto/Client/account_service.pb.h
index fb65de7145b..8abf83fd20b 100644
--- a/src/server/proto/Client/account_service.pb.h
+++ b/src/server/proto/Client/account_service.pb.h
@@ -3296,8 +3296,8 @@ class TC_SHARED_API AccountService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit AccountService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit AccountService(bool use_original_hash);
+  virtual ~AccountService();
 
   typedef std::integral_constant<uint32, 0x62DA0891u> OriginalHash;
   typedef std::integral_constant<uint32, 0x1E4DC42Fu> NameHash;
@@ -3360,8 +3360,8 @@ class TC_SHARED_API AccountListener : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit AccountListener(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit AccountListener(bool use_original_hash);
+  virtual ~AccountListener();
 
   typedef std::integral_constant<uint32, 0x54DFDA17u> OriginalHash;
   typedef std::integral_constant<uint32, 0x7807483Cu> NameHash;
diff --git a/src/server/proto/Client/authentication_service.pb.cc b/src/server/proto/Client/authentication_service.pb.cc
index 9ac0337beb9..e3fcdbf1ddc 100644
--- a/src/server/proto/Client/authentication_service.pb.cc
+++ b/src/server/proto/Client/authentication_service.pb.cc
@@ -7134,6 +7134,12 @@ void VerifyWebCredentialsRequest::Swap(VerifyWebCredentialsRequest* other) {
 
 // ===================================================================
 
+AuthenticationListener::AuthenticationListener(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+AuthenticationListener::~AuthenticationListener() {
+}
+
 google::protobuf::ServiceDescriptor const* AuthenticationListener::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return AuthenticationListener_descriptor_;
@@ -7145,7 +7151,7 @@ void AuthenticationListener::OnModuleLoad(::bgs::protocol::authentication::v1::M
   SendRequest(service_hash_, 1, request);
 }
 
-void AuthenticationListener::OnModuleMessage(::bgs::protocol::authentication::v1::ModuleMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AuthenticationListener::OnModuleMessage(::bgs::protocol::authentication::v1::ModuleMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationListener.OnModuleMessage(bgs.protocol.authentication.v1.ModuleMessageRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7168,7 +7174,7 @@ void AuthenticationListener::OnLogonComplete(::bgs::protocol::authentication::v1
   SendRequest(service_hash_, 5, request);
 }
 
-void AuthenticationListener::OnMemModuleLoad(::bgs::protocol::authentication::v1::MemModuleLoadRequest const* request, std::function<void(::bgs::protocol::authentication::v1::MemModuleLoadResponse const*)> responseCallback) { 
+void AuthenticationListener::OnMemModuleLoad(::bgs::protocol::authentication::v1::MemModuleLoadRequest const* request, std::function<void(::bgs::protocol::authentication::v1::MemModuleLoadResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationListener.OnMemModuleLoad(bgs.protocol.authentication.v1.MemModuleLoadRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7436,12 +7442,18 @@ uint32 AuthenticationListener::HandleOnGameAccountSelected(::bgs::protocol::auth
 
 // ===================================================================
 
+AuthenticationService::AuthenticationService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+AuthenticationService::~AuthenticationService() {
+}
+
 google::protobuf::ServiceDescriptor const* AuthenticationService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return AuthenticationService_descriptor_;
 }
 
-void AuthenticationService::Logon(::bgs::protocol::authentication::v1::LogonRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AuthenticationService::Logon(::bgs::protocol::authentication::v1::LogonRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.Logon(bgs.protocol.authentication.v1.LogonRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7452,7 +7464,7 @@ void AuthenticationService::Logon(::bgs::protocol::authentication::v1::LogonRequ
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void AuthenticationService::ModuleNotify(::bgs::protocol::authentication::v1::ModuleNotification const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AuthenticationService::ModuleNotify(::bgs::protocol::authentication::v1::ModuleNotification const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.ModuleNotify(bgs.protocol.authentication.v1.ModuleNotification{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7463,7 +7475,7 @@ void AuthenticationService::ModuleNotify(::bgs::protocol::authentication::v1::Mo
   SendRequest(service_hash_, 2, request, std::move(callback));
 }
 
-void AuthenticationService::ModuleMessage(::bgs::protocol::authentication::v1::ModuleMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AuthenticationService::ModuleMessage(::bgs::protocol::authentication::v1::ModuleMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.ModuleMessage(bgs.protocol.authentication.v1.ModuleMessageRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7474,7 +7486,7 @@ void AuthenticationService::ModuleMessage(::bgs::protocol::authentication::v1::M
   SendRequest(service_hash_, 3, request, std::move(callback));
 }
 
-void AuthenticationService::SelectGameAccount_DEPRECATED(::bgs::protocol::EntityId const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AuthenticationService::SelectGameAccount_DEPRECATED(::bgs::protocol::EntityId const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.SelectGameAccount_DEPRECATED(bgs.protocol.EntityId{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7485,7 +7497,7 @@ void AuthenticationService::SelectGameAccount_DEPRECATED(::bgs::protocol::Entity
   SendRequest(service_hash_, 4, request, std::move(callback));
 }
 
-void AuthenticationService::GenerateSSOToken(::bgs::protocol::authentication::v1::GenerateSSOTokenRequest const* request, std::function<void(::bgs::protocol::authentication::v1::GenerateSSOTokenResponse const*)> responseCallback) { 
+void AuthenticationService::GenerateSSOToken(::bgs::protocol::authentication::v1::GenerateSSOTokenRequest const* request, std::function<void(::bgs::protocol::authentication::v1::GenerateSSOTokenResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.GenerateSSOToken(bgs.protocol.authentication.v1.GenerateSSOTokenRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7496,7 +7508,7 @@ void AuthenticationService::GenerateSSOToken(::bgs::protocol::authentication::v1
   SendRequest(service_hash_, 5, request, std::move(callback));
 }
 
-void AuthenticationService::SelectGameAccount(::bgs::protocol::authentication::v1::SelectGameAccountRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AuthenticationService::SelectGameAccount(::bgs::protocol::authentication::v1::SelectGameAccountRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.SelectGameAccount(bgs.protocol.authentication.v1.SelectGameAccountRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7507,7 +7519,7 @@ void AuthenticationService::SelectGameAccount(::bgs::protocol::authentication::v
   SendRequest(service_hash_, 6, request, std::move(callback));
 }
 
-void AuthenticationService::VerifyWebCredentials(::bgs::protocol::authentication::v1::VerifyWebCredentialsRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void AuthenticationService::VerifyWebCredentials(::bgs::protocol::authentication::v1::VerifyWebCredentialsRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.VerifyWebCredentials(bgs.protocol.authentication.v1.VerifyWebCredentialsRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -7518,7 +7530,7 @@ void AuthenticationService::VerifyWebCredentials(::bgs::protocol::authentication
   SendRequest(service_hash_, 7, request, std::move(callback));
 }
 
-void AuthenticationService::GenerateWebCredentials(::bgs::protocol::authentication::v1::GenerateWebCredentialsRequest const* request, std::function<void(::bgs::protocol::authentication::v1::GenerateWebCredentialsResponse const*)> responseCallback) { 
+void AuthenticationService::GenerateWebCredentials(::bgs::protocol::authentication::v1::GenerateWebCredentialsRequest const* request, std::function<void(::bgs::protocol::authentication::v1::GenerateWebCredentialsResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.GenerateWebCredentials(bgs.protocol.authentication.v1.GenerateWebCredentialsRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
diff --git a/src/server/proto/Client/authentication_service.pb.h b/src/server/proto/Client/authentication_service.pb.h
index 1b46a60ed60..6929c3f16b9 100644
--- a/src/server/proto/Client/authentication_service.pb.h
+++ b/src/server/proto/Client/authentication_service.pb.h
@@ -2172,8 +2172,8 @@ class TC_SHARED_API AuthenticationListener : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit AuthenticationListener(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit AuthenticationListener(bool use_original_hash);
+  virtual ~AuthenticationListener();
 
   typedef std::integral_constant<uint32, 0x71240E35u> OriginalHash;
   typedef std::integral_constant<uint32, 0x4DA86228u> NameHash;
@@ -2220,8 +2220,8 @@ class TC_SHARED_API AuthenticationService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit AuthenticationService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit AuthenticationService(bool use_original_hash);
+  virtual ~AuthenticationService();
 
   typedef std::integral_constant<uint32, 0xDECFC01u> OriginalHash;
   typedef std::integral_constant<uint32, 0xFF5A6AC3u> NameHash;
diff --git a/src/server/proto/Client/challenge_service.pb.cc b/src/server/proto/Client/challenge_service.pb.cc
index cb58fc55fa2..222867f9feb 100644
--- a/src/server/proto/Client/challenge_service.pb.cc
+++ b/src/server/proto/Client/challenge_service.pb.cc
@@ -4461,12 +4461,18 @@ void ChallengeExternalResult::Swap(ChallengeExternalResult* other) {
 
 // ===================================================================
 
+ChallengeService::ChallengeService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+ChallengeService::~ChallengeService() {
+}
+
 google::protobuf::ServiceDescriptor const* ChallengeService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return ChallengeService_descriptor_;
 }
 
-void ChallengeService::ChallengePicked(::bgs::protocol::challenge::v1::ChallengePickedRequest const* request, std::function<void(::bgs::protocol::challenge::v1::ChallengePickedResponse const*)> responseCallback) { 
+void ChallengeService::ChallengePicked(::bgs::protocol::challenge::v1::ChallengePickedRequest const* request, std::function<void(::bgs::protocol::challenge::v1::ChallengePickedResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.ChallengePicked(bgs.protocol.challenge.v1.ChallengePickedRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4477,7 +4483,7 @@ void ChallengeService::ChallengePicked(::bgs::protocol::challenge::v1::Challenge
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void ChallengeService::ChallengeAnswered(::bgs::protocol::challenge::v1::ChallengeAnsweredRequest const* request, std::function<void(::bgs::protocol::challenge::v1::ChallengeAnsweredResponse const*)> responseCallback) { 
+void ChallengeService::ChallengeAnswered(::bgs::protocol::challenge::v1::ChallengeAnsweredRequest const* request, std::function<void(::bgs::protocol::challenge::v1::ChallengeAnsweredResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.ChallengeAnswered(bgs.protocol.challenge.v1.ChallengeAnsweredRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4488,7 +4494,7 @@ void ChallengeService::ChallengeAnswered(::bgs::protocol::challenge::v1::Challen
   SendRequest(service_hash_, 2, request, std::move(callback));
 }
 
-void ChallengeService::ChallengeCancelled(::bgs::protocol::challenge::v1::ChallengeCancelledRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChallengeService::ChallengeCancelled(::bgs::protocol::challenge::v1::ChallengeCancelledRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.ChallengeCancelled(bgs.protocol.challenge.v1.ChallengeCancelledRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4499,7 +4505,7 @@ void ChallengeService::ChallengeCancelled(::bgs::protocol::challenge::v1::Challe
   SendRequest(service_hash_, 3, request, std::move(callback));
 }
 
-void ChallengeService::SendChallengeToUser(::bgs::protocol::challenge::v1::SendChallengeToUserRequest const* request, std::function<void(::bgs::protocol::challenge::v1::SendChallengeToUserResponse const*)> responseCallback) { 
+void ChallengeService::SendChallengeToUser(::bgs::protocol::challenge::v1::SendChallengeToUserRequest const* request, std::function<void(::bgs::protocol::challenge::v1::SendChallengeToUserResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.SendChallengeToUser(bgs.protocol.challenge.v1.SendChallengeToUserRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4617,6 +4623,12 @@ uint32 ChallengeService::HandleSendChallengeToUser(::bgs::protocol::challenge::v
 
 // ===================================================================
 
+ChallengeListener::ChallengeListener(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+ChallengeListener::~ChallengeListener() {
+}
+
 google::protobuf::ServiceDescriptor const* ChallengeListener::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return ChallengeListener_descriptor_;
diff --git a/src/server/proto/Client/challenge_service.pb.h b/src/server/proto/Client/challenge_service.pb.h
index 0451375d46d..660af26e6a2 100644
--- a/src/server/proto/Client/challenge_service.pb.h
+++ b/src/server/proto/Client/challenge_service.pb.h
@@ -1357,8 +1357,8 @@ class TC_SHARED_API ChallengeService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit ChallengeService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit ChallengeService(bool use_original_hash);
+  virtual ~ChallengeService();
 
   typedef std::integral_constant<uint32, 0xDBBF6F19u> OriginalHash;
   typedef std::integral_constant<uint32, 0x71BB6833u> NameHash;
@@ -1393,8 +1393,8 @@ class TC_SHARED_API ChallengeListener : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit ChallengeListener(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit ChallengeListener(bool use_original_hash);
+  virtual ~ChallengeListener();
 
   typedef std::integral_constant<uint32, 0xBBDA171Fu> OriginalHash;
   typedef std::integral_constant<uint32, 0xC6D90AB8u> NameHash;
diff --git a/src/server/proto/Client/channel_service.pb.cc b/src/server/proto/Client/channel_service.pb.cc
index 2bbbe0d0d11..b231e5899e1 100644
--- a/src/server/proto/Client/channel_service.pb.cc
+++ b/src/server/proto/Client/channel_service.pb.cc
@@ -5985,12 +5985,18 @@ void UpdateMemberStateNotification::Swap(UpdateMemberStateNotification* other) {
 
 // ===================================================================
 
+ChannelService::ChannelService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+ChannelService::~ChannelService() {
+}
+
 google::protobuf::ServiceDescriptor const* ChannelService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return ChannelService_descriptor_;
 }
 
-void ChannelService::AddMember(::bgs::protocol::channel::v1::AddMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::AddMember(::bgs::protocol::channel::v1::AddMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.AddMember(bgs.protocol.channel.v1.AddMemberRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6001,7 +6007,7 @@ void ChannelService::AddMember(::bgs::protocol::channel::v1::AddMemberRequest co
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void ChannelService::RemoveMember(::bgs::protocol::channel::v1::RemoveMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::RemoveMember(::bgs::protocol::channel::v1::RemoveMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.RemoveMember(bgs.protocol.channel.v1.RemoveMemberRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6012,7 +6018,7 @@ void ChannelService::RemoveMember(::bgs::protocol::channel::v1::RemoveMemberRequ
   SendRequest(service_hash_, 2, request, std::move(callback));
 }
 
-void ChannelService::SendMessage(::bgs::protocol::channel::v1::SendMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::SendMessage(::bgs::protocol::channel::v1::SendMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.SendMessage(bgs.protocol.channel.v1.SendMessageRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6023,7 +6029,7 @@ void ChannelService::SendMessage(::bgs::protocol::channel::v1::SendMessageReques
   SendRequest(service_hash_, 3, request, std::move(callback));
 }
 
-void ChannelService::UpdateChannelState(::bgs::protocol::channel::v1::UpdateChannelStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::UpdateChannelState(::bgs::protocol::channel::v1::UpdateChannelStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.UpdateChannelState(bgs.protocol.channel.v1.UpdateChannelStateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6034,7 +6040,7 @@ void ChannelService::UpdateChannelState(::bgs::protocol::channel::v1::UpdateChan
   SendRequest(service_hash_, 4, request, std::move(callback));
 }
 
-void ChannelService::UpdateMemberState(::bgs::protocol::channel::v1::UpdateMemberStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::UpdateMemberState(::bgs::protocol::channel::v1::UpdateMemberStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.UpdateMemberState(bgs.protocol.channel.v1.UpdateMemberStateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6045,7 +6051,7 @@ void ChannelService::UpdateMemberState(::bgs::protocol::channel::v1::UpdateMembe
   SendRequest(service_hash_, 5, request, std::move(callback));
 }
 
-void ChannelService::Dissolve(::bgs::protocol::channel::v1::DissolveRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::Dissolve(::bgs::protocol::channel::v1::DissolveRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.Dissolve(bgs.protocol.channel.v1.DissolveRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6056,7 +6062,7 @@ void ChannelService::Dissolve(::bgs::protocol::channel::v1::DissolveRequest cons
   SendRequest(service_hash_, 6, request, std::move(callback));
 }
 
-void ChannelService::SetRoles(::bgs::protocol::channel::v1::SetRolesRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::SetRoles(::bgs::protocol::channel::v1::SetRolesRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.SetRoles(bgs.protocol.channel.v1.SetRolesRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6067,7 +6073,7 @@ void ChannelService::SetRoles(::bgs::protocol::channel::v1::SetRolesRequest cons
   SendRequest(service_hash_, 7, request, std::move(callback));
 }
 
-void ChannelService::UnsubscribeMember(::bgs::protocol::channel::v1::UnsubscribeMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ChannelService::UnsubscribeMember(::bgs::protocol::channel::v1::UnsubscribeMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.UnsubscribeMember(bgs.protocol.channel.v1.UnsubscribeMemberRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -6281,6 +6287,12 @@ uint32 ChannelService::HandleUnsubscribeMember(::bgs::protocol::channel::v1::Uns
 
 // ===================================================================
 
+ChannelListener::ChannelListener(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+ChannelListener::~ChannelListener() {
+}
+
 google::protobuf::ServiceDescriptor const* ChannelListener::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return ChannelListener_descriptor_;
diff --git a/src/server/proto/Client/channel_service.pb.h b/src/server/proto/Client/channel_service.pb.h
index 9f7ed094e63..c1aa60b5f66 100644
--- a/src/server/proto/Client/channel_service.pb.h
+++ b/src/server/proto/Client/channel_service.pb.h
@@ -1770,8 +1770,8 @@ class TC_SHARED_API ChannelService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit ChannelService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit ChannelService(bool use_original_hash);
+  virtual ~ChannelService();
 
   typedef std::integral_constant<uint32, 0xB732DB32u> OriginalHash;
   typedef std::integral_constant<uint32, 0xA913A87Bu> NameHash;
@@ -1814,8 +1814,8 @@ class TC_SHARED_API ChannelListener : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit ChannelListener(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit ChannelListener(bool use_original_hash);
+  virtual ~ChannelListener();
 
   typedef std::integral_constant<uint32, 0xBF8C8094u> OriginalHash;
   typedef std::integral_constant<uint32, 0xDA660990u> NameHash;
diff --git a/src/server/proto/Client/connection_service.pb.cc b/src/server/proto/Client/connection_service.pb.cc
index bfd2bfe151e..64e282fd1a6 100644
--- a/src/server/proto/Client/connection_service.pb.cc
+++ b/src/server/proto/Client/connection_service.pb.cc
@@ -3634,12 +3634,18 @@ void EncryptRequest::Swap(EncryptRequest* other) {
 
 // ===================================================================
 
+ConnectionService::ConnectionService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+ConnectionService::~ConnectionService() {
+}
+
 google::protobuf::ServiceDescriptor const* ConnectionService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return ConnectionService_descriptor_;
 }
 
-void ConnectionService::Connect(::bgs::protocol::connection::v1::ConnectRequest const* request, std::function<void(::bgs::protocol::connection::v1::ConnectResponse const*)> responseCallback) { 
+void ConnectionService::Connect(::bgs::protocol::connection::v1::ConnectRequest const* request, std::function<void(::bgs::protocol::connection::v1::ConnectResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Connect(bgs.protocol.connection.v1.ConnectRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -3650,7 +3656,7 @@ void ConnectionService::Connect(::bgs::protocol::connection::v1::ConnectRequest
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void ConnectionService::Bind(::bgs::protocol::connection::v1::BindRequest const* request, std::function<void(::bgs::protocol::connection::v1::BindResponse const*)> responseCallback) { 
+void ConnectionService::Bind(::bgs::protocol::connection::v1::BindRequest const* request, std::function<void(::bgs::protocol::connection::v1::BindResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Bind(bgs.protocol.connection.v1.BindRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -3661,7 +3667,7 @@ void ConnectionService::Bind(::bgs::protocol::connection::v1::BindRequest const*
   SendRequest(service_hash_, 2, request, std::move(callback));
 }
 
-void ConnectionService::Echo(::bgs::protocol::connection::v1::EchoRequest const* request, std::function<void(::bgs::protocol::connection::v1::EchoResponse const*)> responseCallback) { 
+void ConnectionService::Echo(::bgs::protocol::connection::v1::EchoRequest const* request, std::function<void(::bgs::protocol::connection::v1::EchoResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Echo(bgs.protocol.connection.v1.EchoRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -3684,7 +3690,7 @@ void ConnectionService::KeepAlive(::bgs::protocol::NoData const* request) {
   SendRequest(service_hash_, 5, request);
 }
 
-void ConnectionService::Encrypt(::bgs::protocol::connection::v1::EncryptRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ConnectionService::Encrypt(::bgs::protocol::connection::v1::EncryptRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Encrypt(bgs.protocol.connection.v1.EncryptRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
diff --git a/src/server/proto/Client/connection_service.pb.h b/src/server/proto/Client/connection_service.pb.h
index 0629391f5cf..514cfe31e61 100644
--- a/src/server/proto/Client/connection_service.pb.h
+++ b/src/server/proto/Client/connection_service.pb.h
@@ -1138,8 +1138,8 @@ class TC_SHARED_API ConnectionService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit ConnectionService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit ConnectionService(bool use_original_hash);
+  virtual ~ConnectionService();
 
   typedef std::integral_constant<uint32, 0x65446991u> OriginalHash;
   typedef std::integral_constant<uint32, 0x2782094Bu> NameHash;
diff --git a/src/server/proto/Client/friends_service.pb.cc b/src/server/proto/Client/friends_service.pb.cc
index 0da6ba192a8..af490c596a6 100644
--- a/src/server/proto/Client/friends_service.pb.cc
+++ b/src/server/proto/Client/friends_service.pb.cc
@@ -4443,12 +4443,18 @@ void InvitationNotification::Swap(InvitationNotification* other) {
 
 // ===================================================================
 
+FriendsService::FriendsService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+FriendsService::~FriendsService() {
+}
+
 google::protobuf::ServiceDescriptor const* FriendsService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return FriendsService_descriptor_;
 }
 
-void FriendsService::Subscribe(::bgs::protocol::friends::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::friends::v1::SubscribeResponse const*)> responseCallback) { 
+void FriendsService::Subscribe(::bgs::protocol::friends::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::friends::v1::SubscribeResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.Subscribe(bgs.protocol.friends.v1.SubscribeRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4459,7 +4465,7 @@ void FriendsService::Subscribe(::bgs::protocol::friends::v1::SubscribeRequest co
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void FriendsService::SendInvitation(::bgs::protocol::SendInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::SendInvitation(::bgs::protocol::SendInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.SendInvitation(bgs.protocol.SendInvitationRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4470,7 +4476,7 @@ void FriendsService::SendInvitation(::bgs::protocol::SendInvitationRequest const
   SendRequest(service_hash_, 2, request, std::move(callback));
 }
 
-void FriendsService::AcceptInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::AcceptInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.AcceptInvitation(bgs.protocol.GenericInvitationRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4481,7 +4487,7 @@ void FriendsService::AcceptInvitation(::bgs::protocol::GenericInvitationRequest
   SendRequest(service_hash_, 3, request, std::move(callback));
 }
 
-void FriendsService::RevokeInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::RevokeInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.RevokeInvitation(bgs.protocol.GenericInvitationRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4492,7 +4498,7 @@ void FriendsService::RevokeInvitation(::bgs::protocol::GenericInvitationRequest
   SendRequest(service_hash_, 4, request, std::move(callback));
 }
 
-void FriendsService::DeclineInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::DeclineInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.DeclineInvitation(bgs.protocol.GenericInvitationRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4503,7 +4509,7 @@ void FriendsService::DeclineInvitation(::bgs::protocol::GenericInvitationRequest
   SendRequest(service_hash_, 5, request, std::move(callback));
 }
 
-void FriendsService::IgnoreInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::IgnoreInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.IgnoreInvitation(bgs.protocol.GenericInvitationRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4514,7 +4520,7 @@ void FriendsService::IgnoreInvitation(::bgs::protocol::GenericInvitationRequest
   SendRequest(service_hash_, 6, request, std::move(callback));
 }
 
-void FriendsService::AssignRole(::bgs::protocol::friends::v1::AssignRoleRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::AssignRole(::bgs::protocol::friends::v1::AssignRoleRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.AssignRole(bgs.protocol.friends.v1.AssignRoleRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4525,7 +4531,7 @@ void FriendsService::AssignRole(::bgs::protocol::friends::v1::AssignRoleRequest
   SendRequest(service_hash_, 7, request, std::move(callback));
 }
 
-void FriendsService::RemoveFriend(::bgs::protocol::friends::v1::GenericFriendRequest const* request, std::function<void(::bgs::protocol::friends::v1::GenericFriendResponse const*)> responseCallback) { 
+void FriendsService::RemoveFriend(::bgs::protocol::friends::v1::GenericFriendRequest const* request, std::function<void(::bgs::protocol::friends::v1::GenericFriendResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.RemoveFriend(bgs.protocol.friends.v1.GenericFriendRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4536,7 +4542,7 @@ void FriendsService::RemoveFriend(::bgs::protocol::friends::v1::GenericFriendReq
   SendRequest(service_hash_, 8, request, std::move(callback));
 }
 
-void FriendsService::ViewFriends(::bgs::protocol::friends::v1::ViewFriendsRequest const* request, std::function<void(::bgs::protocol::friends::v1::ViewFriendsResponse const*)> responseCallback) { 
+void FriendsService::ViewFriends(::bgs::protocol::friends::v1::ViewFriendsRequest const* request, std::function<void(::bgs::protocol::friends::v1::ViewFriendsResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.ViewFriends(bgs.protocol.friends.v1.ViewFriendsRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4547,7 +4553,7 @@ void FriendsService::ViewFriends(::bgs::protocol::friends::v1::ViewFriendsReques
   SendRequest(service_hash_, 9, request, std::move(callback));
 }
 
-void FriendsService::UpdateFriendState(::bgs::protocol::friends::v1::UpdateFriendStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::UpdateFriendState(::bgs::protocol::friends::v1::UpdateFriendStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.UpdateFriendState(bgs.protocol.friends.v1.UpdateFriendStateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4558,7 +4564,7 @@ void FriendsService::UpdateFriendState(::bgs::protocol::friends::v1::UpdateFrien
   SendRequest(service_hash_, 10, request, std::move(callback));
 }
 
-void FriendsService::Unsubscribe(::bgs::protocol::friends::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::Unsubscribe(::bgs::protocol::friends::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.Unsubscribe(bgs.protocol.friends.v1.UnsubscribeRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4569,7 +4575,7 @@ void FriendsService::Unsubscribe(::bgs::protocol::friends::v1::UnsubscribeReques
   SendRequest(service_hash_, 11, request, std::move(callback));
 }
 
-void FriendsService::RevokeAllInvitations(::bgs::protocol::friends::v1::GenericFriendRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void FriendsService::RevokeAllInvitations(::bgs::protocol::friends::v1::GenericFriendRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.RevokeAllInvitations(bgs.protocol.friends.v1.GenericFriendRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4879,6 +4885,12 @@ uint32 FriendsService::HandleRevokeAllInvitations(::bgs::protocol::friends::v1::
 
 // ===================================================================
 
+FriendsListener::FriendsListener(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+FriendsListener::~FriendsListener() {
+}
+
 google::protobuf::ServiceDescriptor const* FriendsListener::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return FriendsListener_descriptor_;
diff --git a/src/server/proto/Client/friends_service.pb.h b/src/server/proto/Client/friends_service.pb.h
index 9453c1df1d4..aa20c6aff0a 100644
--- a/src/server/proto/Client/friends_service.pb.h
+++ b/src/server/proto/Client/friends_service.pb.h
@@ -1344,8 +1344,8 @@ class TC_SHARED_API FriendsService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit FriendsService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit FriendsService(bool use_original_hash);
+  virtual ~FriendsService();
 
   typedef std::integral_constant<uint32, 0xA3DDB1BDu> OriginalHash;
   typedef std::integral_constant<uint32, 0xABDFED63u> NameHash;
@@ -1396,8 +1396,8 @@ class TC_SHARED_API FriendsListener : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit FriendsListener(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit FriendsListener(bool use_original_hash);
+  virtual ~FriendsListener();
 
   typedef std::integral_constant<uint32, 0x6F259A13u> OriginalHash;
   typedef std::integral_constant<uint32, 0xA6717548u> NameHash;
diff --git a/src/server/proto/Client/game_utilities_service.pb.cc b/src/server/proto/Client/game_utilities_service.pb.cc
index fdb28b35fbb..a0d74bfa0d9 100644
--- a/src/server/proto/Client/game_utilities_service.pb.cc
+++ b/src/server/proto/Client/game_utilities_service.pb.cc
@@ -4245,12 +4245,18 @@ void GetAllValuesForAttributeResponse::Swap(GetAllValuesForAttributeResponse* ot
 
 // ===================================================================
 
+GameUtilitiesService::GameUtilitiesService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+GameUtilitiesService::~GameUtilitiesService() {
+}
+
 google::protobuf::ServiceDescriptor const* GameUtilitiesService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return GameUtilitiesService_descriptor_;
 }
 
-void GameUtilitiesService::ProcessClientRequest(::bgs::protocol::game_utilities::v1::ClientRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ClientResponse const*)> responseCallback) { 
+void GameUtilitiesService::ProcessClientRequest(::bgs::protocol::game_utilities::v1::ClientRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ClientResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.ProcessClientRequest(bgs.protocol.game_utilities.v1.ClientRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4261,7 +4267,7 @@ void GameUtilitiesService::ProcessClientRequest(::bgs::protocol::game_utilities:
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void GameUtilitiesService::PresenceChannelCreated(::bgs::protocol::game_utilities::v1::PresenceChannelCreatedRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void GameUtilitiesService::PresenceChannelCreated(::bgs::protocol::game_utilities::v1::PresenceChannelCreatedRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.PresenceChannelCreated(bgs.protocol.game_utilities.v1.PresenceChannelCreatedRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4272,7 +4278,7 @@ void GameUtilitiesService::PresenceChannelCreated(::bgs::protocol::game_utilitie
   SendRequest(service_hash_, 2, 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) { 
+void GameUtilitiesService::GetPlayerVariables(::bgs::protocol::game_utilities::v1::GetPlayerVariablesRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse const*)> responseCallback) {
   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 {
@@ -4283,7 +4289,7 @@ void GameUtilitiesService::GetPlayerVariables(::bgs::protocol::game_utilities::v
   SendRequest(service_hash_, 3, 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) { 
+void GameUtilitiesService::ProcessServerRequest(::bgs::protocol::game_utilities::v1::ServerRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ServerResponse const*)> responseCallback) {
   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());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4306,7 +4312,7 @@ void GameUtilitiesService::OnGameAccountOffline(::bgs::protocol::game_utilities:
   SendRequest(service_hash_, 8, request);
 }
 
-void GameUtilitiesService::GetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse const*)> responseCallback) { 
+void GameUtilitiesService::GetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse const*)> responseCallback) {
   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 {
@@ -4317,7 +4323,7 @@ void GameUtilitiesService::GetAchievementsFile(::bgs::protocol::game_utilities::
   SendRequest(service_hash_, 9, 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) { 
+void GameUtilitiesService::GetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse const*)> responseCallback) {
   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());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
diff --git a/src/server/proto/Client/game_utilities_service.pb.h b/src/server/proto/Client/game_utilities_service.pb.h
index 511e6ad79b4..f3a3303daef 100644
--- a/src/server/proto/Client/game_utilities_service.pb.h
+++ b/src/server/proto/Client/game_utilities_service.pb.h
@@ -1332,8 +1332,8 @@ class TC_SHARED_API GameUtilitiesService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit GameUtilitiesService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit GameUtilitiesService(bool use_original_hash);
+  virtual ~GameUtilitiesService();
 
   typedef std::integral_constant<uint32, 0x3FC1274Du> OriginalHash;
   typedef std::integral_constant<uint32, 0x51923A28u> NameHash;
diff --git a/src/server/proto/Client/presence_service.pb.cc b/src/server/proto/Client/presence_service.pb.cc
index 250e1a20a62..5642e97e115 100644
--- a/src/server/proto/Client/presence_service.pb.cc
+++ b/src/server/proto/Client/presence_service.pb.cc
@@ -2422,12 +2422,18 @@ void OwnershipRequest::Swap(OwnershipRequest* other) {
 
 // ===================================================================
 
+PresenceService::PresenceService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+PresenceService::~PresenceService() {
+}
+
 google::protobuf::ServiceDescriptor const* PresenceService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return PresenceService_descriptor_;
 }
 
-void PresenceService::Subscribe(::bgs::protocol::presence::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void PresenceService::Subscribe(::bgs::protocol::presence::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Subscribe(bgs.protocol.presence.v1.SubscribeRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -2438,7 +2444,7 @@ void PresenceService::Subscribe(::bgs::protocol::presence::v1::SubscribeRequest
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void PresenceService::Unsubscribe(::bgs::protocol::presence::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void PresenceService::Unsubscribe(::bgs::protocol::presence::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Unsubscribe(bgs.protocol.presence.v1.UnsubscribeRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -2449,7 +2455,7 @@ void PresenceService::Unsubscribe(::bgs::protocol::presence::v1::UnsubscribeRequ
   SendRequest(service_hash_, 2, request, std::move(callback));
 }
 
-void PresenceService::Update(::bgs::protocol::presence::v1::UpdateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void PresenceService::Update(::bgs::protocol::presence::v1::UpdateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Update(bgs.protocol.presence.v1.UpdateRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -2460,7 +2466,7 @@ void PresenceService::Update(::bgs::protocol::presence::v1::UpdateRequest const*
   SendRequest(service_hash_, 3, request, std::move(callback));
 }
 
-void PresenceService::Query(::bgs::protocol::presence::v1::QueryRequest const* request, std::function<void(::bgs::protocol::presence::v1::QueryResponse const*)> responseCallback) { 
+void PresenceService::Query(::bgs::protocol::presence::v1::QueryRequest const* request, std::function<void(::bgs::protocol::presence::v1::QueryResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Query(bgs.protocol.presence.v1.QueryRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -2471,7 +2477,7 @@ void PresenceService::Query(::bgs::protocol::presence::v1::QueryRequest const* r
   SendRequest(service_hash_, 4, request, std::move(callback));
 }
 
-void PresenceService::Ownership(::bgs::protocol::presence::v1::OwnershipRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void PresenceService::Ownership(::bgs::protocol::presence::v1::OwnershipRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Ownership(bgs.protocol.presence.v1.OwnershipRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -2482,7 +2488,7 @@ void PresenceService::Ownership(::bgs::protocol::presence::v1::OwnershipRequest
   SendRequest(service_hash_, 5, request, std::move(callback));
 }
 
-void PresenceService::SubscribeNotification(::bgs::protocol::presence::v1::SubscribeNotificationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void PresenceService::SubscribeNotification(::bgs::protocol::presence::v1::SubscribeNotificationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.SubscribeNotification(bgs.protocol.presence.v1.SubscribeNotificationRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
diff --git a/src/server/proto/Client/presence_service.pb.h b/src/server/proto/Client/presence_service.pb.h
index a9dd7c6678b..0565907b3b2 100644
--- a/src/server/proto/Client/presence_service.pb.h
+++ b/src/server/proto/Client/presence_service.pb.h
@@ -762,8 +762,8 @@ class TC_SHARED_API PresenceService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit PresenceService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit PresenceService(bool use_original_hash);
+  virtual ~PresenceService();
 
   typedef std::integral_constant<uint32, 0xFA0796FFu> OriginalHash;
   typedef std::integral_constant<uint32, 0xD8F94B3Bu> NameHash;
diff --git a/src/server/proto/Client/report_service.pb.cc b/src/server/proto/Client/report_service.pb.cc
index c922eccba99..209339f4be0 100644
--- a/src/server/proto/Client/report_service.pb.cc
+++ b/src/server/proto/Client/report_service.pb.cc
@@ -853,12 +853,18 @@ void SendReportRequest::Swap(SendReportRequest* other) {
 
 // ===================================================================
 
+ReportService::ReportService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+ReportService::~ReportService() {
+}
+
 google::protobuf::ServiceDescriptor const* ReportService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return ReportService_descriptor_;
 }
 
-void ReportService::SendReport(::bgs::protocol::report::v1::SendReportRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void ReportService::SendReport(::bgs::protocol::report::v1::SendReportRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ReportService.SendReport(bgs.protocol.report.v1.SendReportRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
diff --git a/src/server/proto/Client/report_service.pb.h b/src/server/proto/Client/report_service.pb.h
index c078aa079f1..166c1e34932 100644
--- a/src/server/proto/Client/report_service.pb.h
+++ b/src/server/proto/Client/report_service.pb.h
@@ -274,8 +274,8 @@ class TC_SHARED_API ReportService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit ReportService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit ReportService(bool use_original_hash);
+  virtual ~ReportService();
 
   typedef std::integral_constant<uint32, 0x7CAF61C9u> OriginalHash;
   typedef std::integral_constant<uint32, 0x724F5F47u> NameHash;
diff --git a/src/server/proto/Client/resource_service.pb.cc b/src/server/proto/Client/resource_service.pb.cc
index 4c60b14c4f6..3297f2246d6 100644
--- a/src/server/proto/Client/resource_service.pb.cc
+++ b/src/server/proto/Client/resource_service.pb.cc
@@ -430,12 +430,18 @@ void ContentHandleRequest::Swap(ContentHandleRequest* other) {
 
 // ===================================================================
 
+ResourcesService::ResourcesService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+ResourcesService::~ResourcesService() {
+}
+
 google::protobuf::ServiceDescriptor const* ResourcesService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return ResourcesService_descriptor_;
 }
 
-void ResourcesService::GetContentHandle(::bgs::protocol::resources::v1::ContentHandleRequest const* request, std::function<void(::bgs::protocol::ContentHandle const*)> responseCallback) { 
+void ResourcesService::GetContentHandle(::bgs::protocol::resources::v1::ContentHandleRequest const* request, std::function<void(::bgs::protocol::ContentHandle const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method ResourcesService.GetContentHandle(bgs.protocol.resources.v1.ContentHandleRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
diff --git a/src/server/proto/Client/resource_service.pb.h b/src/server/proto/Client/resource_service.pb.h
index 8d8613a9ea2..8e123f5a61e 100644
--- a/src/server/proto/Client/resource_service.pb.h
+++ b/src/server/proto/Client/resource_service.pb.h
@@ -149,8 +149,8 @@ class TC_SHARED_API ResourcesService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit ResourcesService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit ResourcesService(bool use_original_hash);
+  virtual ~ResourcesService();
 
   typedef std::integral_constant<uint32, 0xECBE75BAu> OriginalHash;
   typedef std::integral_constant<uint32, 0x4B104C53u> NameHash;
diff --git a/src/server/proto/Client/user_manager_service.pb.cc b/src/server/proto/Client/user_manager_service.pb.cc
index be91453644b..d29891864e1 100644
--- a/src/server/proto/Client/user_manager_service.pb.cc
+++ b/src/server/proto/Client/user_manager_service.pb.cc
@@ -4099,12 +4099,18 @@ void RecentPlayersRemovedNotification::Swap(RecentPlayersRemovedNotification* ot
 
 // ===================================================================
 
+UserManagerService::UserManagerService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+UserManagerService::~UserManagerService() {
+}
+
 google::protobuf::ServiceDescriptor const* UserManagerService::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return UserManagerService_descriptor_;
 }
 
-void UserManagerService::Subscribe(::bgs::protocol::user_manager::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::SubscribeResponse const*)> responseCallback) { 
+void UserManagerService::Subscribe(::bgs::protocol::user_manager::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::SubscribeResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.Subscribe(bgs.protocol.user_manager.v1.SubscribeRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4115,7 +4121,7 @@ void UserManagerService::Subscribe(::bgs::protocol::user_manager::v1::SubscribeR
   SendRequest(service_hash_, 1, request, std::move(callback));
 }
 
-void UserManagerService::AddRecentPlayers(::bgs::protocol::user_manager::v1::AddRecentPlayersRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::AddRecentPlayersResponse const*)> responseCallback) { 
+void UserManagerService::AddRecentPlayers(::bgs::protocol::user_manager::v1::AddRecentPlayersRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::AddRecentPlayersResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.AddRecentPlayers(bgs.protocol.user_manager.v1.AddRecentPlayersRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4126,7 +4132,7 @@ void UserManagerService::AddRecentPlayers(::bgs::protocol::user_manager::v1::Add
   SendRequest(service_hash_, 10, request, std::move(callback));
 }
 
-void UserManagerService::ClearRecentPlayers(::bgs::protocol::user_manager::v1::ClearRecentPlayersRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::ClearRecentPlayersResponse const*)> responseCallback) { 
+void UserManagerService::ClearRecentPlayers(::bgs::protocol::user_manager::v1::ClearRecentPlayersRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::ClearRecentPlayersResponse const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.ClearRecentPlayers(bgs.protocol.user_manager.v1.ClearRecentPlayersRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4137,7 +4143,7 @@ void UserManagerService::ClearRecentPlayers(::bgs::protocol::user_manager::v1::C
   SendRequest(service_hash_, 11, request, std::move(callback));
 }
 
-void UserManagerService::BlockPlayer(::bgs::protocol::user_manager::v1::BlockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void UserManagerService::BlockPlayer(::bgs::protocol::user_manager::v1::BlockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.BlockPlayer(bgs.protocol.user_manager.v1.BlockPlayerRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4148,7 +4154,7 @@ void UserManagerService::BlockPlayer(::bgs::protocol::user_manager::v1::BlockPla
   SendRequest(service_hash_, 20, request, std::move(callback));
 }
 
-void UserManagerService::UnblockPlayer(::bgs::protocol::user_manager::v1::UnblockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void UserManagerService::UnblockPlayer(::bgs::protocol::user_manager::v1::UnblockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.UnblockPlayer(bgs.protocol.user_manager.v1.UnblockPlayerRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4159,7 +4165,7 @@ void UserManagerService::UnblockPlayer(::bgs::protocol::user_manager::v1::Unbloc
   SendRequest(service_hash_, 21, request, std::move(callback));
 }
 
-void UserManagerService::BlockPlayerForSession(::bgs::protocol::user_manager::v1::BlockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void UserManagerService::BlockPlayerForSession(::bgs::protocol::user_manager::v1::BlockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.BlockPlayerForSession(bgs.protocol.user_manager.v1.BlockPlayerRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4170,7 +4176,7 @@ void UserManagerService::BlockPlayerForSession(::bgs::protocol::user_manager::v1
   SendRequest(service_hash_, 40, request, std::move(callback));
 }
 
-void UserManagerService::LoadBlockList(::bgs::protocol::EntityId const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void UserManagerService::LoadBlockList(::bgs::protocol::EntityId const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.LoadBlockList(bgs.protocol.EntityId{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4181,7 +4187,7 @@ void UserManagerService::LoadBlockList(::bgs::protocol::EntityId const* request,
   SendRequest(service_hash_, 50, request, std::move(callback));
 }
 
-void UserManagerService::Unsubscribe(::bgs::protocol::user_manager::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { 
+void UserManagerService::Unsubscribe(::bgs::protocol::user_manager::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) {
   TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.Unsubscribe(bgs.protocol.user_manager.v1.UnsubscribeRequest{ %s })",
     GetCallerInfo().c_str(), request->ShortDebugString().c_str());
   std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void {
@@ -4395,6 +4401,12 @@ uint32 UserManagerService::HandleUnsubscribe(::bgs::protocol::user_manager::v1::
 
 // ===================================================================
 
+UserManagerListener::UserManagerListener(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+}
+
+UserManagerListener::~UserManagerListener() {
+}
+
 google::protobuf::ServiceDescriptor const* UserManagerListener::descriptor() {
   protobuf_AssignDescriptorsOnce();
   return UserManagerListener_descriptor_;
diff --git a/src/server/proto/Client/user_manager_service.pb.h b/src/server/proto/Client/user_manager_service.pb.h
index a51ac759561..cb2d3375628 100644
--- a/src/server/proto/Client/user_manager_service.pb.h
+++ b/src/server/proto/Client/user_manager_service.pb.h
@@ -1296,8 +1296,8 @@ class TC_SHARED_API UserManagerService : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit UserManagerService(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit UserManagerService(bool use_original_hash);
+  virtual ~UserManagerService();
 
   typedef std::integral_constant<uint32, 0x3E19268Au> OriginalHash;
   typedef std::integral_constant<uint32, 0x8EE5694Eu> NameHash;
@@ -1340,8 +1340,8 @@ class TC_SHARED_API UserManagerListener : public ServiceBase
 {
  public:
 
-  template<typename HashSelector>
-  explicit UserManagerListener(HashSelector) : service_hash_(HashSelector::Result::value) { }
+  explicit UserManagerListener(bool use_original_hash);
+  virtual ~UserManagerListener();
 
   typedef std::integral_constant<uint32, 0xBC872C22u> OriginalHash;
   typedef std::integral_constant<uint32, 0xB3426BB3u> NameHash;