Replaced all usages of passed parameters in implementation.

Replaced all usages of passed parameters in implementation from
application manager proxy to indirect call

Add missed factories

Remove commands includes

53 files changed, 83 insertions, 89 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc
index 978aadcd8b..3a3d4b8d91 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc
@@ -59,7 +59,7 @@ void AddStatisticsInfoNotification::Run() {
   int type = (*message_)[strings::msg_params][hmi_notification::statistic_type]
                  .asInt();
 
-  application_manager_.GetPolicyHandler().AddStatisticsInfo(type);
+  policy_handler_.AddStatisticsInfo(type);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc
index 13c0d7d270..f1ce20e670 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc
@@ -63,7 +63,7 @@ void ButtonGetCapabilitiesResponse::Run() {
     return;
   }
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   hmi_capabilities.set_button_capabilities(
       (*message_)[strings::msg_params][hmi_response::capabilities]);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc
index 636c41b0a5..7f1c586d5e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc
@@ -60,7 +60,7 @@ void DecryptCertificateResponse::Run() {
 
   const bool is_succeeded = hmi_apis::Common_Result::SUCCESS == code;
 
-  application_manager_.GetPolicyHandler().OnCertificateDecrypted(is_succeeded);
+  policy_handler_.OnCertificateDecrypted(is_succeeded);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc
index 912330e112..a8b6536f33 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc
@@ -60,7 +60,7 @@ void GetSystemInfoResponse::Run() {
 
   // We have to set preloaded flag as false in policy table on any response
   // of GetSystemInfo (SDLAQ-CRS-2365)
-  application_manager_.GetPolicyHandler().OnGetSystemInfo(
+  policy_handler_.OnGetSystemInfo(
       info.ccpu_version, info.wers_country_code, info.language);
 }
 
@@ -83,7 +83,7 @@ const SystemInfo GetSystemInfoResponse::GetSystemInfo(
   info.language = application_manager::MessageHelper::CommonLanguageToString(
       static_cast<hmi_apis::Common_Language::eType>(lang_code));
 
-  application_manager_.hmi_capabilities().set_ccpu_version(info.ccpu_version);
+  hmi_capabilities_.set_ccpu_version(info.ccpu_version);
 
   return info;
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc
index 51e4a6bdd5..1cf5551cc5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc
@@ -59,7 +59,7 @@ void GetUrls::Run() {
   namespace Common_Result = hmi_apis::Common_Result;
   using policy::EndpointUrls;
 
-  if (!application_manager_.GetPolicyHandler().PolicyEnabled()) {
+  if (!policy_handler_.PolicyEnabled()) {
     SendResponseToHMI(Common_Result::DATA_NOT_AVAILABLE);
     return;
   }
@@ -68,8 +68,7 @@ void GetUrls::Run() {
       (*message_)[strings::msg_params][hmi_request::service].asUInt();
 
   EndpointUrls endpoints;
-  application_manager_.GetPolicyHandler().GetUpdateUrls(service_to_check,
-                                                        endpoints);
+  policy_handler_.GetUpdateUrls(service_to_check, endpoints);
 
   if (endpoints.empty()) {
     LOG4CXX_ERROR(logger_, "No URLs for service " << service_to_check);
@@ -134,7 +133,7 @@ void GetUrls::ProcessServiceURLs(const policy::EndpointUrls& endpoints) {
 void GetUrls::SendResponseToHMI(hmi_apis::Common_Result::eType result) {
   (*message_)[strings::params][strings::message_type] = MessageType::kResponse;
   (*message_)[strings::params][hmi_response::code] = result;
-  application_manager_.GetRPCService().ManageHMICommand(message_);
+  rpc_service_.ManageHMICommand(message_);
 }
 
 #ifdef PROPRIETARY_MODE
@@ -171,8 +170,7 @@ void GetUrls::ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints) {
   using namespace strings;
   using namespace hmi_apis;
 
-  const uint32_t app_id_to_send_to =
-      application_manager_.GetPolicyHandler().GetAppIdForSending();
+  const uint32_t app_id_to_send_to = policy_handler_.GetAppIdForSending();
 
   if (!app_id_to_send_to) {
     LOG4CXX_ERROR(logger_,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc
index d93f9f3293..ef977d461d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc
@@ -56,7 +56,7 @@ void GetUrlsResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc
index ec66756a6c..c7ea91f7ca 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc
@@ -53,7 +53,7 @@ MixingAudioSupportedResponse::~MixingAudioSupportedResponse() {}
 void MixingAudioSupportedResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
   hmi_capabilities.set_attenuated_supported(
       (*message_)[strings::msg_params][hmi_response::attenuated_supported]
           .asBool());
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc
index f9d6786845..9c3f073145 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc
@@ -72,7 +72,7 @@ void NaviIsReadyRequest::on_event(const event_engine::Event& event) {
           HmiInterfaces::HMI_INTERFACE_Navigation);
 
       HMICapabilities& hmi_capabilities =
-          application_manager_.hmi_capabilities();
+          hmi_capabilities_;
       hmi_capabilities.set_is_navi_cooperating(is_available);
       break;
     }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc
index bdc864adcb..cdb938d5d7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc
@@ -71,7 +71,7 @@ void NotificationFromHMI::SendNotificationToMobile(
     const application_manager::commands::MessageSharedPtr& message) {
   (*message)[strings::params][strings::message_type] =
       static_cast<int32_t>(application_manager::MessageType::kNotification);
-  application_manager_.GetRPCService().ManageMobileCommand(message, SOURCE_SDL);
+  rpc_service_.ManageMobileCommand(message, SOURCE_SDL);
 }
 
 void NotificationFromHMI::CreateHMIRequest(
@@ -100,7 +100,7 @@ void NotificationFromHMI::CreateHMIRequest(
 
   request[strings::msg_params] = msg_params;
 
-  if (!application_manager_.GetRPCService().ManageHMICommand(result)) {
+  if (!rpc_service_.ManageHMICommand(result)) {
     LOG4CXX_ERROR(logger_, "Unable to send request");
     return;
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc
index ffef55b409..0c4e64ebdd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc
@@ -67,7 +67,7 @@ void NotificationToHMI::Run() {}
 void NotificationToHMI::SendNotification() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc
index 2f4ef5a169..988d07c823 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc
@@ -59,7 +59,7 @@ void OnAllowSDLFunctionalityNotification::Run() {
   if ((*message_)[strings::msg_params].keyExists("device")) {
     device_id = (*message_)[strings::msg_params]["device"]["id"].asString();
   }
-  application_manager_.GetPolicyHandler().OnAllowSDLFunctionalityNotification(
+  policy_handler_.OnAllowSDLFunctionalityNotification(
       (*message_)[strings::msg_params][hmi_response::allowed].asBool(),
       device_id);
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc
index 00269b90da..1fd8deab29 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc
@@ -173,11 +173,10 @@ void OnAppPermissionConsentNotification::Run() {
                   system_external_consent_status->end(),
                   status_appender);
   }
-  application_manager_.GetPolicyHandler().OnAppPermissionConsent(
+  policy_handler_.OnAppPermissionConsent(
       connection_key, permission_consent, external_consent_status);
 #else
-  application_manager_.GetPolicyHandler().OnAppPermissionConsent(
-      connection_key, permission_consent);
+  policy_handler_.OnAppPermissionConsent(connection_key, permission_consent);
 #endif
 }
 }  // commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc
index 0d6e93d9cf..5c0c948da3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc
@@ -115,7 +115,7 @@ void OnDeviceStateChangedNotification::Run() {
       device_id = encryption::MakeHash(bt_mac);
       LOG4CXX_DEBUG(logger_, "Device_id hashed as BT MAC : " << device_id);
     }
-    application_manager_.GetPolicyHandler().RemoveDevice(device_id);
+    policy_handler_.RemoveDevice(device_id);
   }
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc
index 8c240897aa..e0e3da9545 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc
@@ -117,7 +117,7 @@ void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() {
   (*message)[strings::params][strings::correlation_id] =
       application_manager_.GetNextHMICorrelationID();
 
-  application_manager_.GetRPCService().ManageHMICommand(message);
+  rpc_service_.ManageHMICommand(message);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc
index 8d9fbe632a..ac8cc55403 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc
@@ -83,7 +83,7 @@ void OnExitApplicationNotification::Run() {
       break;
     }
     case Common_ApplicationExitReason::UNAUTHORIZED_TRANSPORT_REGISTRATION: {
-      application_manager_.GetRPCService().ManageMobileCommand(
+      rpc_service_.ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app_id, AppInterfaceUnregisteredReason::APP_UNAUTHORIZED),
           SOURCE_SDL);
@@ -92,7 +92,7 @@ void OnExitApplicationNotification::Run() {
       return;
     }
     case Common_ApplicationExitReason::UNSUPPORTED_HMI_RESOURCE: {
-      application_manager_.GetRPCService().ManageMobileCommand(
+      rpc_service_.ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE),
           SOURCE_SDL);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc
index f031f4bf6b..738c4d06c6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc
@@ -54,7 +54,7 @@ OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() {}
 
 void OnIgnitionCycleOverNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
-  application_manager_.GetPolicyHandler().OnIgnitionCycleOver();
+  policy_handler_.OnIgnitionCycleOver();
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc
index 328e4770e6..fcd5d342e6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc
@@ -53,7 +53,7 @@ OnPolicyUpdate::~OnPolicyUpdate() {}
 
 void OnPolicyUpdate::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
-  application_manager_.GetPolicyHandler().OnPTExchangeNeeded();
+  policy_handler_.OnPTExchangeNeeded();
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc
index 747c2df908..eacf966843 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc
@@ -64,8 +64,7 @@ void OnReceivedPolicyUpdate::Run() {
     LOG4CXX_ERROR(logger_, "Failed to read Update file.");
     return;
   }
-  application_manager_.GetPolicyHandler().ReceiveMessageFromSDK(file_path,
-                                                                file_content);
+  policy_handler_.ReceiveMessageFromSDK(file_path, file_content);
 #else
   LOG4CXX_WARN(logger_,
                "This RPC is part of extended policy flow."
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc
index b821915deb..8ccbf7165e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc
@@ -59,7 +59,7 @@ void OnSystemErrorNotification::Run() {
   const int code =
       (*message_)[strings::msg_params][hmi_notification::error].asInt();
 
-  application_manager_.GetPolicyHandler().OnSystemError(code);
+  policy_handler_.OnSystemError(code);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc
index 0eaa149a0d..81429c9ac3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc
@@ -61,7 +61,7 @@ void OnSystemInfoChangedNotification::Run() {
       application_manager::MessageHelper::CommonLanguageToString(
           static_cast<hmi_apis::Common_Language::eType>(lang_code));
 
-  application_manager_.GetPolicyHandler().OnSystemInfoChanged(language);
+  policy_handler_.OnSystemInfoChanged(language);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc
index 20b7282635..daddbfa9ed 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc
@@ -81,8 +81,7 @@ void OnSystemRequestNotification::Run() {
                   "Received OnSystemRequest without appID."
                   " One of registered apps will be used.");
     LOG4CXX_DEBUG(logger_, "Searching registered app to send OnSystemRequest.");
-    const PolicyHandlerInterface& policy_handler =
-        application_manager_.GetPolicyHandler();
+    const PolicyHandlerInterface& policy_handler = policy_handler_;
     const uint32_t selected_app_id = policy_handler.GetAppIdForSending();
     if (0 == selected_app_id) {
       LOG4CXX_WARN(logger_,
@@ -104,8 +103,7 @@ void OnSystemRequestNotification::Run() {
       .GetDataOnDeviceID(app->device(), NULL, NULL, &device_mac, NULL);
 
   if (policy::kDeviceAllowed !=
-      application_manager_.GetPolicyHandler().GetUserConsentForDevice(
-          device_mac)) {
+      policy_handler_.GetUserConsentForDevice(device_mac)) {
     LOG4CXX_WARN(logger_,
                  "Application "
                      << app->policy_app_id()
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc
index f33836470c..1d774a40e8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc
@@ -59,7 +59,7 @@ OnTTSLanguageChangeNotification::~OnTTSLanguageChangeNotification() {}
 void OnTTSLanguageChangeNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   hmi_capabilities.set_active_tts_language(
       static_cast<hmi_apis::Common_Language::eType>(
@@ -87,7 +87,7 @@ void OnTTSLanguageChangeNotification::Run() {
 
     if (static_cast<int>(app->language()) !=
         (*message_)[strings::msg_params][strings::language].asInt()) {
-      application_manager_.GetRPCService().ManageMobileCommand(
+      rpc_service_.ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app->app_id(),
               mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE),
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc
index aad896734e..316d50be98 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc
@@ -59,7 +59,7 @@ OnUILanguageChangeNotification::~OnUILanguageChangeNotification() {}
 void OnUILanguageChangeNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   hmi_capabilities.set_active_ui_language(
       static_cast<hmi_apis::Common_Language::eType>(
@@ -86,7 +86,7 @@ void OnUILanguageChangeNotification::Run() {
     if (app->ui_language() !=
         (*message_)[strings::msg_params][strings::hmi_display_language]
             .asInt()) {
-      application_manager_.GetRPCService().ManageMobileCommand(
+      rpc_service_.ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app->app_id(),
               mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE),
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
index 755aa42805..e0554f0db0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
@@ -60,7 +60,7 @@ OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() {}
 void OnVRLanguageChangeNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   hmi_capabilities.set_active_vr_language(
       static_cast<hmi_apis::Common_Language::eType>(
@@ -85,7 +85,7 @@ void OnVRLanguageChangeNotification::Run() {
       application_manager_.state_controller().SetRegularState(
           app, mobile_api::HMILevel::HMI_NONE, false);
 
-      application_manager_.GetRPCService().ManageMobileCommand(
+      rpc_service_.ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app->app_id(),
               mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE),
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc
index adc325aad3..b4820dedac 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc
@@ -53,7 +53,7 @@ RCGetCapabilitiesResponse::~RCGetCapabilitiesResponse() {}
 void RCGetCapabilitiesResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
   bool capability_exists =
       (*message_)[strings::msg_params].keyExists(strings::rc_capability);
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc
index f6c5bc0c06..77cff7bd62 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc
@@ -70,7 +70,7 @@ void RCIsReadyRequest::on_event(const event_engine::Event& event) {
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_RC);
 
       HMICapabilities& hmi_capabilities =
-          application_manager_.hmi_capabilities();
+          hmi_capabilities_;
       hmi_capabilities.set_is_rc_cooperating(is_available);
       if (!is_available) {
         hmi_capabilities.set_rc_supported(false);
@@ -101,7 +101,7 @@ void RCIsReadyRequest::SendMessageToHMI() {
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::RC_GetCapabilities, application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
+  rpc_service_.ManageHMICommand(get_capabilities);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc
index 6c96427428..c158052b89 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc
@@ -77,7 +77,7 @@ void ResponseFromHMI::SendResponseToMobile(
     ApplicationManager& application_manager) {
   (*message)[strings::params][strings::message_type] = MessageType::kResponse;
 
-  application_manager_.GetRPCService().ManageMobileCommand(message, SOURCE_SDL);
+  rpc_service_.ManageMobileCommand(message, SOURCE_SDL);
 }
 
 void ResponseFromHMI::CreateHMIRequest(
@@ -105,7 +105,7 @@ void ResponseFromHMI::CreateHMIRequest(
 
   request[strings::msg_params] = msg_params;
 
-  if (!application_manager_.GetRPCService().ManageHMICommand(result)) {
+  if (!rpc_service_.ManageHMICommand(result)) {
     LOG4CXX_ERROR(logger_, "Unable to send request");
     return;
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc
index bbf3cd962a..7aeddf28e5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc
@@ -66,7 +66,7 @@ void ResponseToHMI::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
index c2f8521c40..7c14ef86a2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
@@ -126,7 +126,7 @@ void SDLActivateAppRequest::Run() {
                       "HMIDeactivate is active");
   } else {
     const uint32_t application_id = app_id();
-    application_manager_.GetPolicyHandler().OnActivateApp(application_id,
+    policy_handler_.OnActivateApp(application_id,
                                                           correlation_id());
   }
 }
@@ -180,7 +180,7 @@ void SDLActivateAppRequest::Run() {
 
   if (app_to_activate->IsRegistered()) {
     LOG4CXX_DEBUG(logger_, "Application is registered. Activating.");
-    application_manager_.GetPolicyHandler().OnActivateApp(application_id,
+    policy_handler_.OnActivateApp(application_id,
                                                           correlation_id());
     return;
   }
@@ -250,7 +250,7 @@ void SDLActivateAppRequest::on_event(const event_engine::Event& event) {
         logger_, "Application not found by HMI app id: " << hmi_application_id);
     return;
   }
-  application_manager_.GetPolicyHandler().OnActivateApp(app->app_id(),
+  policy_handler_.OnActivateApp(app->app_id(),
                                                         correlation_id());
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc
index a7c29610e0..c545f2ce67 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc
@@ -57,7 +57,7 @@ void SDLActivateAppResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc
index 35d7ecd62d..08fc122ef5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc
@@ -58,7 +58,7 @@ void SDLGetListOfPermissionsRequest::Run() {
   if ((*message_)[strings::msg_params].keyExists(strings::app_id)) {
     connection_key = (*message_)[strings::msg_params][strings::app_id].asUInt();
   }
-  application_manager_.GetPolicyHandler().OnGetListOfPermissions(
+  policy_handler_.OnGetListOfPermissions(
       connection_key,
       (*message_)[strings::params][strings::correlation_id].asUInt());
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc
index 4442d53945..dc896ab881 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc
@@ -57,7 +57,7 @@ void SDLGetListOfPermissionsResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc
index a6e78781c5..bde120708f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc
@@ -54,7 +54,7 @@ SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() {}
 
 void SDLGetStatusUpdateRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
-  application_manager_.GetPolicyHandler().OnGetStatusUpdate(
+  policy_handler_.OnGetStatusUpdate(
       (*message_)[strings::params][strings::correlation_id].asUInt());
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc
index a948ca612d..812f9cc98c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc
@@ -57,7 +57,7 @@ void SDLGetStatusUpdateResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc
index 33ff924819..51cadb8e16 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc
@@ -80,13 +80,13 @@ void SDLGetUserFriendlyMessageRequest::Run() {
             static_cast<hmi_apis::Common_Language::eType>(lang_code));
   } else {
     hmi_apis::Common_Language::eType ui_language =
-        application_manager_.hmi_capabilities().active_ui_language();
+        hmi_capabilities_.active_ui_language();
 
     required_language =
         application_manager::MessageHelper::CommonLanguageToString(ui_language);
   }
 
-  application_manager_.GetPolicyHandler().OnGetUserFriendlyMessage(
+  policy_handler_.OnGetUserFriendlyMessage(
       msg_codes,
       required_language,
       (*message_)[strings::params][strings::correlation_id].asInt());
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc
index 91442cf70f..64a6b13b6c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc
@@ -57,7 +57,7 @@ void SDLGetUserFriendlyMessageResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc
index ae97a81875..364630255c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc
@@ -53,7 +53,7 @@ TTSGetCapabilitiesResponse::~TTSGetCapabilitiesResponse() {}
 void TTSGetCapabilitiesResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
   if ((*message_)[strings::msg_params].keyExists(
           hmi_response::speech_capabilities)) {
     hmi_capabilities.set_speech_capabilities(
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc
index 4da3f102af..921909c4c5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc
@@ -64,7 +64,7 @@ void TTSGetLanguageResponse::Run() {
         (*message_)[strings::msg_params][hmi_response::language].asInt());
   }
 
-  application_manager_.hmi_capabilities().set_active_tts_language(language);
+  hmi_capabilities_.set_active_tts_language(language);
 
   LOG4CXX_DEBUG(logger_,
                 "Raising event for function_id " << function_id()
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc
index 4d62c521de..c3ada953ea 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc
@@ -60,7 +60,7 @@ void TTSGetSupportedLanguagesResponse::Run() {
           (*message_)[strings::params][hmi_response::code].asInt());
 
   if (hmi_apis::Common_Result::SUCCESS == code) {
-    HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+    HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
     hmi_capabilities.set_tts_supported_languages(
         (*message_)[strings::msg_params][hmi_response::languages]);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc
index 15e67d55b1..da8599ab20 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc
@@ -71,7 +71,7 @@ void TTSIsReadyRequest::on_event(const event_engine::Event& event) {
       const bool is_available = app_mngr::commands::ChangeInterfaceState(
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_TTS);
       HMICapabilities& hmi_capabilities =
-          application_manager_.hmi_capabilities();
+          hmi_capabilities_;
       hmi_capabilities.set_is_tts_cooperating(is_available);
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_TTS)) {
@@ -98,18 +98,18 @@ void TTSIsReadyRequest::SendMessageToHMI() {
   utils::SharedPtr<smart_objects::SmartObject> get_language(
       MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::TTS_GetLanguage,
                                         application_manager_));
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
   hmi_capabilities.set_handle_response_for(*get_language);
-  application_manager_.GetRPCService().ManageHMICommand(get_language);
+  rpc_service_.ManageHMICommand(get_language);
   utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::TTS_GetSupportedLanguages,
           application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_all_languages);
+  rpc_service_.ManageHMICommand(get_all_languages);
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::TTS_GetCapabilities, application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
+  rpc_service_.ManageHMICommand(get_capabilities);
 }
 }  // namespace commands
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
index bedb972171..8b2e8095ca 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
@@ -53,7 +53,7 @@ UIGetCapabilitiesResponse::~UIGetCapabilitiesResponse() {}
 void UIGetCapabilitiesResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   const smart_objects::SmartObject& msg_params =
       (*message_)[strings::msg_params];
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc
index e875397450..44ab6b6226 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc
@@ -65,7 +65,7 @@ void UIGetLanguageResponse::Run() {
         (*message_)[strings::msg_params][hmi_response::language].asInt());
   }
 
-  application_manager_.hmi_capabilities().set_active_ui_language(language);
+  hmi_capabilities_.set_active_ui_language(language);
 
   LOG4CXX_DEBUG(logger_,
                 "Raising event for function_id " << function_id()
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc
index 688f8d4ee5..4fe3108292 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc
@@ -60,7 +60,7 @@ void UIGetSupportedLanguagesResponse::Run() {
           (*message_)[strings::params][hmi_response::code].asInt());
 
   if (hmi_apis::Common_Result::SUCCESS == code) {
-    HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+    HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
     hmi_capabilities.set_ui_supported_languages(
         (*message_)[strings::msg_params][hmi_response::languages]);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
index 2130097045..961bc8e5a4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
@@ -70,7 +70,7 @@ void UIIsReadyRequest::on_event(const event_engine::Event& event) {
       const bool is_available = app_mngr::commands::ChangeInterfaceState(
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_UI);
       HMICapabilities& hmi_capabilities =
-          application_manager_.hmi_capabilities();
+          hmi_capabilities_;
       hmi_capabilities.set_is_ui_cooperating(is_available);
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_UI)) {
@@ -97,18 +97,18 @@ void UIIsReadyRequest::SendMessageToHMI() {
   utils::SharedPtr<smart_objects::SmartObject> get_language(
       MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::UI_GetLanguage,
                                         application_manager_));
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
   hmi_capabilities.set_handle_response_for(*get_language);
-  application_manager_.GetRPCService().ManageHMICommand(get_language);
+  rpc_service_.ManageHMICommand(get_language);
   utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::UI_GetSupportedLanguages,
           application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_all_languages);
+  rpc_service_.ManageHMICommand(get_all_languages);
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::UI_GetCapabilities, application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
+  rpc_service_.ManageHMICommand(get_capabilities);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc
index a748da56f0..07c58f3cde 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc
@@ -55,7 +55,7 @@ UpdateSDLRequest::~UpdateSDLRequest() {}
 void UpdateSDLRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  application_manager_.GetPolicyHandler().PTExchangeAtUserRequest(
+  policy_handler_.PTExchangeAtUserRequest(
       (*message_)[strings::params][strings::correlation_id].asInt());
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc
index ac70c92e93..06ed723fda 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc
@@ -56,7 +56,7 @@ void UpdateSDLResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.GetRPCService().SendMessageToHMI(message_);
+  rpc_service_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc
index bd81ccde5f..e99452c9fa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc
@@ -79,7 +79,7 @@ void VIGetVehicleDataResponse::Run() {
     event.set_smart_object(result);
   } else {
     event.set_smart_object(*message_);
-    application_manager_.GetPolicyHandler().OnVehicleDataUpdated(*message_);
+    policy_handler_.OnVehicleDataUpdated(*message_);
   }
 
   event.raise(application_manager_.event_dispatcher());
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc
index 23b5b93a7d..a80b7f3dfa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc
@@ -53,7 +53,7 @@ VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() {}
 void VIGetVehicleTypeResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   hmi_capabilities.set_vehicle_type(
       (*message_)[strings::msg_params][hmi_response::vehicle_type]);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc
index 22cabab1b2..8fc5b6a9ca 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc
@@ -74,9 +74,9 @@ void VIIsReadyRequest::on_event(const event_engine::Event& event) {
           HmiInterfaces::HMI_INTERFACE_VehicleInfo);
 
       HMICapabilities& hmi_capabilities =
-          application_manager_.hmi_capabilities();
+          hmi_capabilities_;
       hmi_capabilities.set_is_ivi_cooperating(is_available);
-      application_manager_.GetPolicyHandler().OnVIIsReady();
+      policy_handler_.OnVIIsReady();
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_VehicleInfo)) {
         LOG4CXX_INFO(
@@ -105,7 +105,7 @@ void VIIsReadyRequest::SendMessageToHMI() {
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::VehicleInfo_GetVehicleType,
           application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_type);
+  rpc_service_.ManageHMICommand(get_type);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc
index 36c71fbc47..9f45a7fa7a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc
@@ -53,7 +53,7 @@ VRGetCapabilitiesResponse::~VRGetCapabilitiesResponse() {}
 void VRGetCapabilitiesResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   hmi_capabilities.set_vr_capabilities(
       (*message_)[strings::msg_params][strings::vr_capabilities]);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc
index 3e7694d460..324afff3a2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc
@@ -65,7 +65,7 @@ void VRGetLanguageResponse::Run() {
         (*message_)[strings::msg_params][hmi_response::language].asInt());
   }
 
-  application_manager_.hmi_capabilities().set_active_vr_language(language);
+  hmi_capabilities_.set_active_vr_language(language);
 
   LOG4CXX_DEBUG(logger_,
                 "Raising event for function_id " << function_id()
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc
index edeb14ddb7..459fad70a9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc
@@ -61,7 +61,7 @@ void VRGetSupportedLanguagesResponse::Run() {
           (*message_)[strings::params][hmi_response::code].asInt());
 
   if (hmi_apis::Common_Result::SUCCESS == code) {
-    HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+    HMICapabilities& hmi_capabilities = hmi_capabilities_;
     hmi_capabilities.set_vr_supported_languages(
         (*message_)[strings::msg_params][hmi_response::languages]);
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc
index 9516cb19da..78a33f64e7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc
@@ -70,7 +70,7 @@ void VRIsReadyRequest::on_event(const event_engine::Event& event) {
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_VR);
 
       HMICapabilities& hmi_capabilities =
-          application_manager_.hmi_capabilities();
+          hmi_capabilities_;
       hmi_capabilities.set_is_vr_cooperating(is_available);
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_VR)) {
@@ -97,18 +97,18 @@ void VRIsReadyRequest::SendMessageToHMI() {
   utils::SharedPtr<smart_objects::SmartObject> get_language(
       MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::VR_GetLanguage,
                                         application_manager_));
-  HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
+  HMICapabilities& hmi_capabilities = hmi_capabilities_;
   hmi_capabilities.set_handle_response_for(*get_language);
-  application_manager_.GetRPCService().ManageHMICommand(get_language);
+  rpc_service_.ManageHMICommand(get_language);
   utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::VR_GetSupportedLanguages,
           application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_all_languages);
+  rpc_service_.ManageHMICommand(get_all_languages);
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::VR_GetCapabilities, application_manager_));
-  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
+  rpc_service_.ManageHMICommand(get_capabilities);
 }
 
 }  // namespace commands