Hmi commands update after removing all singletones

author: Kozoriz <kozorizandriy@gmail.com> 2016-04-11 16:22:10 +0300
committer: Kozoriz <kozorizandriy@gmail.com> 2016-04-25 12:05:00 +0300
commit: 65350ac57da63f3c267d3a27dce05a3752ddbba7 (patch)
tree: 197f249f8bd3108c7fbb154d4c67a14bcb38318e /src/components/application_manager/include/application_manager/commands
parent: 2c7dc612ce41461bebc3416917d2607f24002285 (diff)
download: sdl_core-65350ac57da63f3c267d3a27dce05a3752ddbba7.tar.gz
237 files changed, 309 insertions, 281 deletions
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h
index 5122a0856b..4a74d38ee1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h
@@ -49,7 +49,7 @@ class ActivateAppRequest : public RequestToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit ActivateAppRequest(const MessageSharedPtr& message);
+    explicit ActivateAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief ActivateAppRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h
index a15d317077..3e3b7c3d4e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h
@@ -49,7 +49,7 @@ class ActivateAppResponse : public ResponseFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit ActivateAppResponse(const MessageSharedPtr& message);
+    explicit ActivateAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief ActivateAppResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h
index 1aa3b7a512..613121029e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h
@@ -49,7 +49,7 @@ class AddStatisticsInfoNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AddStatisticsInfoNotification(const MessageSharedPtr& message);
+  explicit AddStatisticsInfoNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief AddStatisticsInfoNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h
index 3d42b6d5a6..3e0d3ff715 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h
@@ -49,7 +49,7 @@ class AllowAllAppsRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AllowAllAppsRequest(const MessageSharedPtr& message);
+  explicit AllowAllAppsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief AllowAllAppsRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h
index ccc8d5ae7d..c74aa39c21 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h
@@ -49,7 +49,7 @@ class AllowAllAppsResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AllowAllAppsResponse(const MessageSharedPtr& message);
+  explicit AllowAllAppsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief AllowAllAppsResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h
index e90576a7df..1a01e0ecf7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h
@@ -49,7 +49,7 @@ class AllowAppRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AllowAppRequest(const MessageSharedPtr& message);
+  explicit AllowAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief AllowAppRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h
index 6bedf30a38..f60de5e9ec 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h
@@ -49,7 +49,7 @@ class AllowAppResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AllowAppResponse(const MessageSharedPtr& message);
+  explicit AllowAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief AllowAppResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h
index 867596f189..f3e1fb314e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h
@@ -49,7 +49,7 @@ class BasicCommunicationSystemRequest : public RequestToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit BasicCommunicationSystemRequest(const MessageSharedPtr& message);
+    explicit BasicCommunicationSystemRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief BasicCommunicationSystemRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h
index 5c174eac85..62cc2349b8 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h
@@ -49,7 +49,7 @@ class BasicCommunicationSystemResponse : public ResponseFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit BasicCommunicationSystemResponse(const MessageSharedPtr& message);
+    explicit BasicCommunicationSystemResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief BasicCommunicationSystemResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h
index 639800a047..46a9475d27 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h
@@ -49,7 +49,7 @@ class ButtonGetCapabilitiesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit ButtonGetCapabilitiesRequest(const MessageSharedPtr& message);
+  explicit ButtonGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief ButtonGetCapabilitiesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h
index 7cd174477b..607bec8be2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h
@@ -49,7 +49,7 @@ class ButtonGetCapabilitiesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit ButtonGetCapabilitiesResponse(const MessageSharedPtr& message);
+  explicit ButtonGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief ButtonGetCapabilitiesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h
index 34722bc4f1..af2f949757 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h
@@ -49,7 +49,7 @@ class ClosePopupRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit ClosePopupRequest(const MessageSharedPtr& message);
+  explicit ClosePopupRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief ClosePopupRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h
index ce3a6d2936..b0695168f5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h
@@ -49,7 +49,7 @@ class ClosePopupResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit ClosePopupResponse(const MessageSharedPtr& message);
+  explicit ClosePopupResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief ClosePopupResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h
index 59ad705e80..4d104d7ca1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h
@@ -50,7 +50,7 @@ class DialNumberRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit DialNumberRequest(const MessageSharedPtr& message);
+  explicit DialNumberRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief DialNumberRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h
index d6c1401783..ccbd3a55ac 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h
@@ -51,7 +51,7 @@ class DialNumberResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit DialNumberResponse(const MessageSharedPtr& message);
+  explicit DialNumberResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief DialNumberResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h
index 8262dbb6fa..32857a512b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h
@@ -49,7 +49,7 @@ class GetSystemInfoRequest : public RequestToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit GetSystemInfoRequest(const MessageSharedPtr& message);
+    explicit GetSystemInfoRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief GetSystemInfoRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h
index 9f57a492ac..fda2940d17 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_
 
 #include "application_manager/commands/hmi/response_from_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -55,7 +56,7 @@ class GetSystemInfoResponse : public ResponseFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit GetSystemInfoResponse(const MessageSharedPtr& message);
+    explicit GetSystemInfoResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief GetSystemInfoResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
index 551ab20431..916a6352f5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
@@ -48,7 +48,7 @@ class GetUrls : public RequestFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit GetUrls(const MessageSharedPtr& message);
+    explicit GetUrls(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief GetUrls class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h
index 956e5a788e..fb2077e5bd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h
@@ -45,7 +45,7 @@ class GetUrlsResponse : public ResponseToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit GetUrlsResponse(const MessageSharedPtr& message);
+    explicit GetUrlsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief GetUrlsResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h
index 2957693c9e..84c488fef4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h
@@ -49,7 +49,7 @@ class MixingAudioSupportedRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit MixingAudioSupportedRequest(const MessageSharedPtr& message);
+  explicit MixingAudioSupportedRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief MixingAudioSupportedRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h
index e2b5affe34..581ed708ae 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h
@@ -49,7 +49,7 @@ class MixingAudioSupportedResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit MixingAudioSupportedResponse(const MessageSharedPtr& message);
+  explicit MixingAudioSupportedResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief MixingAudioSupportedResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
index 58f85f829a..f98b1d6f04 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h
@@ -49,7 +49,7 @@ class NaviAlertManeuverRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviAlertManeuverRequest(const MessageSharedPtr& message);
+  explicit NaviAlertManeuverRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviAlertManeuverRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
index 11f46d5da8..ae919cce76 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h
@@ -49,7 +49,7 @@ class NaviAlertManeuverResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviAlertManeuverResponse(const MessageSharedPtr& message);
+  explicit NaviAlertManeuverResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviAlertManeuverResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
index 3e95c6b16b..86c0da947c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h
@@ -50,7 +50,7 @@ class AudioStartStreamRequest : public RequestToHMI,
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AudioStartStreamRequest(const MessageSharedPtr& message);
+  explicit AudioStartStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnNaviStartStreamRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h
index 01992eb3b7..ca080a9dcd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h
@@ -48,7 +48,7 @@ class AudioStartStreamResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AudioStartStreamResponse(const MessageSharedPtr& message);
+  explicit AudioStartStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief AudioStartStreamResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h
index 04bba8b752..df32f1d49b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h
@@ -48,7 +48,7 @@ class AudioStopStreamRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AudioStopStreamRequest(const MessageSharedPtr& message);
+  explicit AudioStopStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviStopStreamRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h
index 7275ac34d8..0f45f03746 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h
@@ -48,7 +48,7 @@ class AudioStopStreamResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit AudioStopStreamResponse(const MessageSharedPtr& message);
+  explicit AudioStopStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnNaviStopStreamResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h
index 1209e2b4cb..57c24aeff7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h
@@ -50,7 +50,8 @@ public:
      *
      * @param message Incoming SmartObject message
      **/
-    explicit NaviGetWayPointsRequest(const MessageSharedPtr& message);
+    NaviGetWayPointsRequest(const MessageSharedPtr& message,
+                            ApplicationManager& application_manager);
     /**
      * @brief NaviGetWayPointsRequest class destructor
      **/
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h
index 3e6a011300..4a9b848adc 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h
@@ -50,7 +50,8 @@ class NaviGetWayPointsResponse
      *
      * @param message Incoming SmartObject message
      **/
-    explicit NaviGetWayPointsResponse(const MessageSharedPtr& message);
+    NaviGetWayPointsResponse(const MessageSharedPtr& message,
+                             ApplicationManager& application_manager);
 
     /**
      * @brief NaviGetWaypoints class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h
index e779ecb699..ab36b3844d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h
@@ -49,7 +49,7 @@ class NaviIsReadyRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviIsReadyRequest(const MessageSharedPtr& message);
+  explicit NaviIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviIsReadyRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h
index 3da6933bc3..8279aefa3b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h
@@ -49,7 +49,7 @@ class NaviIsReadyResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviIsReadyResponse(const MessageSharedPtr& message);
+  explicit NaviIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviIsReadyResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h
index 45474b532a..9929c1e658 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h
@@ -49,7 +49,7 @@ class NaviSendLocationRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    */
-  explicit NaviSendLocationRequest(const MessageSharedPtr& message);
+  explicit NaviSendLocationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviSendLocationRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h
index ef9a605c36..1629cf3228 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h
@@ -49,7 +49,7 @@ class NaviSendLocationResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    */
-  explicit NaviSendLocationResponse(const MessageSharedPtr& message);
+  explicit NaviSendLocationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviSendLocationResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
index b866ce3e1f..1c4bf0d6dd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h
@@ -49,7 +49,7 @@ class NaviShowConstantTBTRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviShowConstantTBTRequest(const MessageSharedPtr& message);
+  explicit NaviShowConstantTBTRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviShowConstantTBTRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
index 3f212985f9..008eaa5a7f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h
@@ -49,7 +49,7 @@ class NaviShowConstantTBTResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviShowConstantTBTResponse(const MessageSharedPtr& message);
+  explicit NaviShowConstantTBTResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviShowConstantTBTResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h
index 0e8cd39cc9..93eb3ebbe3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h
@@ -50,7 +50,7 @@ class NaviStartStreamRequest : public RequestToHMI,
    *
    * @param message Incoming SmartObject message
    **/
-    explicit NaviStartStreamRequest(const MessageSharedPtr& message);
+    explicit NaviStartStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnNaviStartStreamRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h
index c94b6f219c..35c11ed20a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h
@@ -48,7 +48,7 @@ class NaviStartStreamResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviStartStreamResponse(const MessageSharedPtr& message);
+  explicit NaviStartStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviStartStreamResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h
index 86b0981c22..f62182618a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h
@@ -48,7 +48,7 @@ class NaviStopStreamRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviStopStreamRequest(const MessageSharedPtr& message);
+  explicit NaviStopStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviStopStreamRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h
index 6f4986e4c7..c3149f2f12 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h
@@ -48,7 +48,7 @@ class NaviStopStreamResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviStopStreamResponse(const MessageSharedPtr& message);
+  explicit NaviStopStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnNaviStopStreamResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h
index cdaff0bdc6..57bddf9c9d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h
@@ -50,7 +50,8 @@ public:
      *
      * @param message Incoming SmartObject message
      **/
-    explicit NaviSubscribeWayPointsRequest(const MessageSharedPtr& message);
+    NaviSubscribeWayPointsRequest(const MessageSharedPtr& messag,
+                                  ApplicationManager& application_manager);
     /**
      * @brief NaviSubscribeWayPointsRequest class destructor
      **/
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h
index d6637c709c..a60e9ce094 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h
@@ -50,7 +50,8 @@ class NaviSubscribeWayPointsResponse
      *
      * @param message Incoming SmartObject message
      **/
-    explicit NaviSubscribeWayPointsResponse(const MessageSharedPtr& message);
+    NaviSubscribeWayPointsResponse(const MessageSharedPtr& message,
+                                   ApplicationManager& application_manager);
 
     /**
      * @brief NaviSubscribeWaypoints class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h
index 3191fb375b..6566a2a841 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h
@@ -50,7 +50,8 @@ public:
      *
      * @param message Incoming SmartObject message
      **/
-    explicit NaviUnSubscribeWayPointsRequest(const MessageSharedPtr& message);
+    NaviUnSubscribeWayPointsRequest(const MessageSharedPtr& message,
+                                    ApplicationManager& application_manager);
     /**
      * @brief NaviUnSubscribeWayPointsRequest class destructor
      **/
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h
index 9ae12f7def..62d7900646 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h
@@ -50,7 +50,8 @@ class NaviUnsubscribeWayPointsResponse
      *
      * @param message Incoming SmartObject message
      **/
-    explicit NaviUnsubscribeWayPointsResponse(const MessageSharedPtr& message);
+    NaviUnsubscribeWayPointsResponse(const MessageSharedPtr& message,
+                                     ApplicationManager& application_manager);
 
     /**
      * @brief NaviUnSubscribeWaypoints class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h
index a5e2f8bf37..3a166f3b1e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h
@@ -49,7 +49,7 @@ class NaviUpdateTurnListRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviUpdateTurnListRequest(const MessageSharedPtr& message);
+  explicit NaviUpdateTurnListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviUpdateTurnListRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h
index 0e15a9175c..6062122935 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h
@@ -49,7 +49,7 @@ class NaviUpdateTurnListResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit NaviUpdateTurnListResponse(const MessageSharedPtr& message);
+  explicit NaviUpdateTurnListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief NaviUpdateTurnListResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h
index 1dcae4366d..bdd2829ab6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h
@@ -50,7 +50,8 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 
 class NotificationFromHMI : public CommandImpl {
  public:
-  explicit NotificationFromHMI(const MessageSharedPtr& message);
+  explicit NotificationFromHMI(const MessageSharedPtr& message,
+                               ApplicationManager& application_manager);
   virtual ~NotificationFromHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h
index 2372754b63..d53ea9e8b2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h
@@ -41,7 +41,8 @@ namespace commands {
 
 class NotificationToHMI : public CommandImpl {
  public:
-  explicit NotificationToHMI(const MessageSharedPtr& message);
+  explicit NotificationToHMI(const MessageSharedPtr& message,
+                             ApplicationManager& application_manager);
   virtual ~NotificationToHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
index 6ec14e35b0..5b29704263 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h
@@ -49,7 +49,7 @@ class OnAllowSDLFunctionalityNotification : public NotificationFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnAllowSDLFunctionalityNotification(const MessageSharedPtr& message);
+    explicit OnAllowSDLFunctionalityNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnAllowSDLFunctionalityNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h
index 011df3832c..9c12bec1b2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h
@@ -49,7 +49,7 @@ class OnAppActivatedNotification : public NotificationFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnAppActivatedNotification(const MessageSharedPtr& message);
+    explicit OnAppActivatedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnAppActivatedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h
index 8731fc43f1..a33560b03d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h
@@ -49,7 +49,7 @@ class OnAppDeactivatedNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnAppDeactivatedNotification(const MessageSharedPtr& message);
+  explicit OnAppDeactivatedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnAppDeactivatedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
index c6ea82a15c..72e62fbb8b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h
@@ -49,7 +49,7 @@ class OnAppPermissionChangedNotification : public NotificationToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnAppPermissionChangedNotification(const MessageSharedPtr& message);
+    explicit OnAppPermissionChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnAppPermissionChangedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
index ea36d55b39..cd18143604 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h
@@ -49,7 +49,7 @@ class OnAppPermissionConsentNotification : public NotificationFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnAppPermissionConsentNotification(const MessageSharedPtr& message);
+    explicit OnAppPermissionConsentNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnAppPermissionConsentNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h
index 1ebbfcd483..6a903661c9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h
@@ -49,7 +49,7 @@ class OnAppRegisteredNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnAppRegisteredNotification(const MessageSharedPtr& message);
+  explicit OnAppRegisteredNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnAppRegisteredNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h
index 96fd19e9bc..e619dc325e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h
@@ -49,7 +49,7 @@ class OnAppUnregisteredNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnAppUnregisteredNotification(const MessageSharedPtr& message);
+  explicit OnAppUnregisteredNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnAppUnregisteredNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h
index 97a979065e..7cf40fbb20 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h
@@ -49,7 +49,7 @@ class OnAudioDataStreamingNotification : public NotificationToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnAudioDataStreamingNotification(const MessageSharedPtr& message);
+    explicit OnAudioDataStreamingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnAudioDataStreamingNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h
index 0a56d7d924..ac908d5592 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h
@@ -53,7 +53,7 @@ class OnButtonEventNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnButtonEventNotification(const MessageSharedPtr& message);
+  explicit OnButtonEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief Execute command
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h
index ce5f1de8f1..d50a3f6a59 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h
@@ -53,7 +53,7 @@ class OnButtonPressNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnButtonPressNotification(const MessageSharedPtr& message);
+  explicit OnButtonPressNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief Execute command
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h
index c046380cd7..99c3d02e1c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h
@@ -51,7 +51,7 @@ class OnButtonSubscriptionNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnButtonSubscriptionNotification(const MessageSharedPtr& message);
+  explicit OnButtonSubscriptionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnButtonSubscriptionNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h
index 17ba26b7f7..5d3a06956e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h
@@ -49,7 +49,7 @@ class OnDeviceChosenNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnDeviceChosenNotification(const MessageSharedPtr& message);
+  explicit OnDeviceChosenNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnDeviceChosenNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h
index b87a6e2d9f..91a7adbe4b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h
@@ -49,7 +49,7 @@ class OnDeviceStateChangedNotification : public NotificationFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnDeviceStateChangedNotification(const MessageSharedPtr& message);
+    explicit OnDeviceStateChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnDeviceStateChangedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h
index 01a87aae05..f6eff5833b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h
@@ -53,7 +53,7 @@ class OnDriverDistractionNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnDriverDistractionNotification(const MessageSharedPtr& message);
+  explicit OnDriverDistractionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnDriverDistractionNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h
index b40bfb6ca0..4da565b4ee 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h
@@ -49,7 +49,7 @@ class OnEventChangedNotification : public NotificationFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnEventChangedNotification(const MessageSharedPtr& message);
+    explicit OnEventChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnEventChangedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
index 65d78f60c6..ea0e64783b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h
@@ -49,7 +49,7 @@ class OnExitAllApplicationsNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnExitAllApplicationsNotification(const MessageSharedPtr& message);
+  explicit OnExitAllApplicationsNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnExitAllApplicationsNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h
index 479dd3a09c..71966066a7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h
@@ -49,7 +49,7 @@ class OnExitApplicationNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnExitApplicationNotification(const MessageSharedPtr& message);
+  explicit OnExitApplicationNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnExitApplicationNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h
index cc47705c82..479e8c28ff 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h
@@ -49,7 +49,7 @@ class OnFileRemovedNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnFileRemovedNotification(const MessageSharedPtr& message);
+  explicit OnFileRemovedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnFileRemovedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h
index f9fb9cdb21..96e9104bde 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h
@@ -49,7 +49,7 @@ class OnFindApplications : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnFindApplications(const MessageSharedPtr& message);
+  explicit OnFindApplications(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnFindApplications class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
index f8fccdc382..620ea1bc6e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h
@@ -50,7 +50,7 @@ class OnIgnitionCycleOverNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnIgnitionCycleOverNotification(const MessageSharedPtr& message);
+  explicit OnIgnitionCycleOverNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnIgnitionCycleOverNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
index a657ffcc68..9e520d26c5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnNaviTBTClientStateNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnNaviTBTClientStateNotification(const MessageSharedPtr& message);
+  explicit OnNaviTBTClientStateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnNaviTBTClientStateNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h
index 85c46a5b5a..3f88beeb1e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,8 @@ class OnNaviWayPointChangeNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnNaviWayPointChangeNotification(const MessageSharedPtr& message);
+  explicit OnNaviWayPointChangeNotification(const MessageSharedPtr& message,
+                                            ApplicationManager& app_man);
 
   /**
    * @brief OnNaviWayPointChangeNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h
index 81278fb75a..afd1e9a64a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h
@@ -45,7 +45,7 @@ class OnPolicyUpdate : public NotificationFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnPolicyUpdate(const MessageSharedPtr& message);
+    explicit OnPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnPolicyUpdate class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h
index bc60284309..ce6e0456a2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h
@@ -50,7 +50,7 @@ class OnPutFileNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnPutFileNotification(const MessageSharedPtr& message);
+  explicit OnPutFileNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnPutFileNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h
index 24fc52deac..898619f177 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_READY_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnReadyNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnReadyNotification(const MessageSharedPtr& message);
+  explicit OnReadyNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnReadyNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h
index 0eeb28218f..c6c0a2d911 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h
@@ -46,7 +46,7 @@ class OnReceivedPolicyUpdate : public NotificationFromHMI {
        *
        * @param message Incoming SmartObject message
        **/
-    explicit OnReceivedPolicyUpdate(const MessageSharedPtr& message);
+    explicit OnReceivedPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnReceivedPolicyUpdate class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h
index 67cccdd816..1e84700ade 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h
@@ -49,7 +49,7 @@ class OnRecordStartdNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnRecordStartdNotification(const MessageSharedPtr& message);
+  explicit OnRecordStartdNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnRecordStartdNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
index 03f84d0907..59f7ec62de 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h
@@ -50,7 +50,7 @@ class OnResumeAudioSourceNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnResumeAudioSourceNotification(const MessageSharedPtr& message);
+  explicit OnResumeAudioSourceNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnResumeAudioSourceNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h
index 5b9ac04e8f..3a17dd4d07 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h
@@ -49,7 +49,7 @@ class OnSDLCloseNotification : public NotificationToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnSDLCloseNotification(const MessageSharedPtr& message);
+  explicit OnSDLCloseNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnSdlCloseNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
index 4f30873e4e..a1a2c949b3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h
@@ -49,7 +49,7 @@ class OnSDLConsentNeededNotification : public NotificationToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnSDLConsentNeededNotification(const MessageSharedPtr& message);
+    explicit OnSDLConsentNeededNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnSDLConsentNeededNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
index 6f8f3a6e1a..71a1afedaf 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h
@@ -49,7 +49,7 @@ class OnSDLPersistenceCompleteNotification : public NotificationToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnSDLPersistenceCompleteNotification(const MessageSharedPtr& message);
+    explicit OnSDLPersistenceCompleteNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnSDLPersistenceCompleteNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h
index bfa14f67fc..0f860cb675 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h
@@ -49,7 +49,7 @@ class OnStartDeviceDiscovery : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnStartDeviceDiscovery(const MessageSharedPtr& message);
+  explicit OnStartDeviceDiscovery(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnStartDeviceDiscovery class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h
index c123826886..c0b1d0256c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h
@@ -49,7 +49,7 @@ class OnStatusUpdateNotification : public NotificationToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnStatusUpdateNotification(const MessageSharedPtr& message);
+    explicit OnStatusUpdateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnGetStatusUpdateNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h
index b410c7b397..133ecc4b5e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h
@@ -51,7 +51,7 @@ class OnSystemContextNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnSystemContextNotification(const MessageSharedPtr& message);
+  explicit OnSystemContextNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnSystemContextNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h
index ee7df7acd6..5994c588d3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h
@@ -49,7 +49,7 @@ class OnSystemErrorNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnSystemErrorNotification(const MessageSharedPtr& message);
+  explicit OnSystemErrorNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnSystemErrorNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h
index 9b6c62782c..c09cb85da2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h
@@ -49,7 +49,7 @@ class OnSystemInfoChangedNotification : public NotificationFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnSystemInfoChangedNotification(const MessageSharedPtr& message);
+    explicit OnSystemInfoChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnSystemInfoChangedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h
index f1d25e24a4..9b4beee1b8 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h
@@ -50,7 +50,7 @@ class OnSystemRequestNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnSystemRequestNotification(const MessageSharedPtr& message);
+  explicit OnSystemRequestNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnSystemRequestNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h
index 79ae9b496e..c97554db99 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h
@@ -49,7 +49,7 @@ class OnTTSLanguageChangeNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnTTSLanguageChangeNotification(const MessageSharedPtr& message);
+  explicit OnTTSLanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnTTSLanguageChangeNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
index 11cb755544..f5fcb07370 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h
@@ -51,7 +51,7 @@ class OnTTSResetTimeoutNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnTTSResetTimeoutNotification(const MessageSharedPtr& message);
+  explicit OnTTSResetTimeoutNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnTTSResetTimeoutNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h
index c7e88ac558..e120d19519 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h
@@ -49,7 +49,7 @@ class OnTTSStartedNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnTTSStartedNotification(const MessageSharedPtr& message);
+  explicit OnTTSStartedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnTTSStartedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h
index bf5dc7fb9e..22b98bb912 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h
@@ -49,7 +49,7 @@ class OnTTSStoppedNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject OnTTSStartedNotificationmessage
    **/
-  explicit OnTTSStoppedNotification(const MessageSharedPtr& message);
+  explicit OnTTSStoppedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnTTSStoppedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h
index b4a0228c78..70ea3c18a4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h
@@ -49,7 +49,7 @@ class OnUICommandNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnUICommandNotification(const MessageSharedPtr& message);
+  explicit OnUICommandNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnUICommandNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
index 77b771065b..2d335b8938 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -52,7 +52,7 @@ class OnUIKeyBoardInputNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnUIKeyBoardInputNotification(const MessageSharedPtr& message);
+  explicit OnUIKeyBoardInputNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnUIKeyBoardInputNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h
index bcb661c89d..f37b8c245f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h
@@ -49,7 +49,7 @@ class OnUILanguageChangeNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnUILanguageChangeNotification(const MessageSharedPtr& message);
+  explicit OnUILanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnUILanguageChangeNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
index f97c8768b5..cdde8eabb0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h
@@ -51,7 +51,7 @@ class OnUIResetTimeoutNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnUIResetTimeoutNotification(const MessageSharedPtr& message);
+  explicit OnUIResetTimeoutNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnUIResetTimeoutNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
index 6d8005e12f..d3e4050bc8 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -52,7 +52,7 @@ class OnUITouchEventNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnUITouchEventNotification(const MessageSharedPtr& message);
+  explicit OnUITouchEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnUITouchEventNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h
index f56d01a5cc..66cf26856d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h
@@ -49,7 +49,7 @@ class OnUpdateDeviceList : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnUpdateDeviceList(const MessageSharedPtr& message);
+  explicit OnUpdateDeviceList(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnUpdateDeviceList class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
index d591ab2be6..44a5b2df57 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIAccPedalPositionNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIAccPedalPositionNotification(const MessageSharedPtr& message);
+  explicit OnVIAccPedalPositionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIAccPedalPositionNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
index f901462fdf..e09bfb36d1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIBeltStatusNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIBeltStatusNotification(const MessageSharedPtr& message);
+  explicit OnVIBeltStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIBeltStatusNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h
index a0bc31778a..67076fc02c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIBodyInformationNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIBodyInformationNotification(const MessageSharedPtr& message);
+  explicit OnVIBodyInformationNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIBodyInformationNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h
index 0e24616f3e..dfcfc7e9e7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIDeviceStatusNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIDeviceStatusNotification(const MessageSharedPtr& message);
+  explicit OnVIDeviceStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIDeviceStatusNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
index 0290388756..003cffb7ab 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIDriverBrakingNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIDriverBrakingNotification(const MessageSharedPtr& message);
+  explicit OnVIDriverBrakingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIDriverBrakingNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
index 8307e5359e..490d9258ec 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIEngineTorqueNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIEngineTorqueNotification(const MessageSharedPtr& message);
+  explicit OnVIEngineTorqueNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIEngineTorqueNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
index be5b086853..317fe2fde5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIExternalTemperatureNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIExternalTemperatureNotification(const MessageSharedPtr& message);
+  explicit OnVIExternalTemperatureNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIExternalTemperatureNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
index 83e6f845e0..1df9903180 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIFuelLevelNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIFuelLevelNotification(const MessageSharedPtr& message);
+  explicit OnVIFuelLevelNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIFuelLevelNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
index 42a6b8e0d9..29715de867 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIFuelLevelStateNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIFuelLevelStateNotification(const MessageSharedPtr& message);
+  explicit OnVIFuelLevelStateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIFuelLevelStateNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
index 01c2cf60b6..a36a4a5f6f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIGpsDataNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIGpsDataNotification(const MessageSharedPtr& message);
+  explicit OnVIGpsDataNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIGpsDataNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
index dc80b33ddd..ab34a2c44d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIHeadLampStatusNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIHeadLampStatusNotification(const MessageSharedPtr& message);
+  explicit OnVIHeadLampStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIHeadLampStatusNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
index c4e5accead..f144db5785 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIInstantFuelConsumptionNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIInstantFuelConsumptionNotification(const MessageSharedPtr& message);
+  explicit OnVIInstantFuelConsumptionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIInstantFuelConsumptionNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h
index e2d9d91ae1..cc24c0d46a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIMyKeyNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIMyKeyNotification(const MessageSharedPtr& message);
+  explicit OnVIMyKeyNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIMyKeyNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h
index 7c1c691ac5..a3b8eed784 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIOdometerNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIOdometerNotification(const MessageSharedPtr& message);
+  explicit OnVIOdometerNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIOdometerNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h
index bf2ca83f8f..6f126783ec 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIPrndlNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIPrndlNotification(const MessageSharedPtr& message);
+  explicit OnVIPrndlNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIPrndlNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h
index ebcfe3a86c..355e00e8b1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIRpmNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIRpmNotification(const MessageSharedPtr& message);
+  explicit OnVIRpmNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIRpmNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h
index 37bf66e4d0..36373f93c9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVISpeedNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVISpeedNotification(const MessageSharedPtr& message);
+  explicit OnVISpeedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVISpeedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
index bf01b2bf76..1d8a63dd0e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVISteeringWheelAngleNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVISteeringWheelAngleNotification(const MessageSharedPtr& message);
+  explicit OnVISteeringWheelAngleNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVISteeringWheelAngleNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
index 1c1e00d893..43ef0fb25c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVITirePressureNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVITirePressureNotification(const MessageSharedPtr& message);
+  explicit OnVITirePressureNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVITirePressureNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
index 59da271a04..758d30c632 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -51,7 +51,7 @@ class OnVIVehicleDataNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIVehicleDataNotification(const MessageSharedPtr& message);
+  explicit OnVIVehicleDataNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIVehicleDataNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h
index 06b73c508d..22ac173110 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIVinNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIVinNotification(const MessageSharedPtr& message);
+  explicit OnVIVinNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIVinNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
index 399b38112e..b512155240 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -50,7 +50,7 @@ class OnVIWiperStatusNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVIWiperStatusNotification(const MessageSharedPtr& message);
+  explicit OnVIWiperStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVIWiperStatusNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h
index 38749ba8f8..3529c89c71 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h
@@ -49,7 +49,7 @@ class OnVideoDataStreamingNotification : public NotificationToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit OnVideoDataStreamingNotification(const MessageSharedPtr& message);
+    explicit OnVideoDataStreamingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief OnVideoDataStreamingNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h
index 37bc2556f8..ef3d11e375 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h
@@ -50,7 +50,7 @@ class OnVRCommandNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVRCommandNotification(const MessageSharedPtr& message);
+  explicit OnVRCommandNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVRCommandNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h
index be408f0aa0..ce95e9928c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h
@@ -49,7 +49,7 @@ class OnVRLanguageChangeNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVRLanguageChangeNotification(const MessageSharedPtr& message);
+  explicit OnVRLanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVRLanguageChangeNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h
index 5ae5ace27b..12bbe48860 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h
@@ -49,7 +49,7 @@ class OnVRStartedNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVRStartedNotification(const MessageSharedPtr& message);
+  explicit OnVRStartedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVRStartedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h
index 311ee8acde..c815a74beb 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h
@@ -49,7 +49,7 @@ class OnVRStoppedNotification : public NotificationFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit OnVRStoppedNotification(const MessageSharedPtr& message);
+  explicit OnVRStoppedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief OnVRStoppedNotification class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h
index 9cb5a9f99d..c7a0d8ab3f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h
@@ -50,7 +50,8 @@
 
   class RequestFromHMI : public CommandImpl, public event_engine::EventObserver {
    public:
-    explicit RequestFromHMI(const MessageSharedPtr& message);
+    explicit RequestFromHMI(const MessageSharedPtr& message,
+                            ApplicationManager& application_manager);
     virtual ~RequestFromHMI();
     virtual bool Init();
     virtual bool CleanUp();
@@ -62,10 +63,15 @@
      * @param function_id the function id for which response will be sent
      * @param result_code the result code.
      */
-    void SendResponse(uint32_t correlation_id,
-                      hmi_apis::FunctionID::eType function_id,
-                      hmi_apis::Common_Result::eType result_code);
-   private:
+    void SendResponse(const bool success,
+                      const uint32_t correlation_id,
+                      const hmi_apis::FunctionID::eType function_id,
+                      const hmi_apis::Common_Result::eType result_code);
+
+    void FillCommonParametersOfSO(smart_objects::SmartObject* message,
+                                  uint32_t correlation_id,
+                                  hmi_apis::FunctionID::eType function_id);
+    private:
     DISALLOW_COPY_AND_ASSIGN(RequestFromHMI);
   };
 
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h
index fe359182dd..4c36d7d01a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_TO_HMI_H_
 
 #include "application_manager/commands/command_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -42,7 +43,8 @@ namespace commands {
 
 class RequestToHMI : public CommandImpl {
  public:
-  explicit RequestToHMI(const MessageSharedPtr& message);
+  explicit RequestToHMI(const MessageSharedPtr& message,
+                        ApplicationManager& application_manager);
   virtual ~RequestToHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h
index 7769caa0a7..f644f9bb4a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_FROM_HMI_H_
 
 #include "application_manager/commands/command_impl.h"
+#include "application_manager/application_manager.h"
 #include "interfaces/HMI_API.h"
 
 namespace NsSmartDeviceLink {
@@ -50,12 +51,13 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 
 class ResponseFromHMI : public CommandImpl {
  public:
-  explicit ResponseFromHMI(const MessageSharedPtr& message);
+  explicit ResponseFromHMI(const MessageSharedPtr& message,
+                           ApplicationManager& application_manager);
   virtual ~ResponseFromHMI();
   virtual bool Init();
   virtual bool CleanUp();
   virtual void Run();
-  void SendResponseToMobile(const MessageSharedPtr& message);
+  void SendResponseToMobile(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /*
    * @brief Creates HMI request
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h
index ce9e9469d0..4ca2813cae 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h
@@ -51,7 +51,8 @@ namespace NsSmart = NsSmartDeviceLink::NsSmartObjects;
 
 class ResponseToHMI : public CommandImpl {
  public:
-  explicit ResponseToHMI(const MessageSharedPtr& message);
+  explicit ResponseToHMI(const MessageSharedPtr& message,
+                         ApplicationManager& application_manager);
   virtual ~ResponseToHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h
index 58a7e9ecda..4222dd78b2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_
 
 #include "application_manager/commands/hmi/request_from_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -51,7 +51,7 @@ class SDLActivateAppRequest : public RequestFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLActivateAppRequest(const MessageSharedPtr& message);
+    explicit SDLActivateAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLActivateAppRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h
index bf0789e60e..d7b82aa023 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h
@@ -49,7 +49,7 @@ class SDLActivateAppResponse : public ResponseToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLActivateAppResponse(const MessageSharedPtr& message);
+    explicit SDLActivateAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLActivateAppResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
index 7c8f10529b..8fa2c1f2f6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h
@@ -49,7 +49,7 @@ class SDLGetListOfPermissionsRequest : public RequestFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLGetListOfPermissionsRequest(const MessageSharedPtr& message);
+    explicit SDLGetListOfPermissionsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLGetListOfPermissionsRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
index 452784d92c..d4fadd3099 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h
@@ -49,7 +49,7 @@ class SDLGetListOfPermissionsResponse : public ResponseToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLGetListOfPermissionsResponse(const MessageSharedPtr& message);
+    explicit SDLGetListOfPermissionsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLGetListOfPermissionsResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h
index cb7d37d336..6778fb7be2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h
@@ -49,7 +49,7 @@ class SDLGetStatusUpdateRequest : public RequestFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLGetStatusUpdateRequest(const MessageSharedPtr& message);
+    explicit SDLGetStatusUpdateRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLGetStatusUpdateRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h
index a3fc0862b5..ebb84cbf9e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h
@@ -49,7 +49,7 @@ class SDLGetStatusUpdateResponse : public ResponseToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLGetStatusUpdateResponse(const MessageSharedPtr& message);
+    explicit SDLGetStatusUpdateResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLGetStatusUpdateResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
index 96f46cfa3d..2998c6e395 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_
 
 #include "application_manager/commands/hmi/request_from_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -49,7 +50,7 @@ class SDLGetUserFriendlyMessageRequest : public RequestFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLGetUserFriendlyMessageRequest(const MessageSharedPtr& message);
+    explicit SDLGetUserFriendlyMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLGetUserFriendlyMessageRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
index 4cf7be56c9..047d31406d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h
@@ -49,7 +49,7 @@ class SDLGetUserFriendlyMessageResponse : public ResponseToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLGetUserFriendlyMessageResponse(const MessageSharedPtr& message);
+    explicit SDLGetUserFriendlyMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLGetUserFriendlyMessageResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h
index 481f37a257..581387373b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h
@@ -46,7 +46,7 @@ class SDLPolicyUpdate : public RequestToHMI {
        *
        * @param message Incoming SmartObject message
        **/
-    explicit SDLPolicyUpdate(const MessageSharedPtr& message);
+    explicit SDLPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager);
     virtual ~SDLPolicyUpdate();
     /**
      * @brief Execute command
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h
index d3f7105523..a9e1542a78 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h
@@ -46,7 +46,7 @@ class SDLPolicyUpdateResponse : public ResponseFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit SDLPolicyUpdateResponse(const MessageSharedPtr& message);
+    explicit SDLPolicyUpdateResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief SDLPolicyUpdateResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h
index a25309e5d5..52233c5931 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h
@@ -49,7 +49,7 @@ class TTSChangeRegistrationRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSChangeRegistrationRequest(const MessageSharedPtr& message);
+  explicit TTSChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSChangeRegistrationRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h
index 73ad180286..44140d1486 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h
@@ -49,7 +49,7 @@ class TTSChangeRegistratioResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSChangeRegistratioResponse(const MessageSharedPtr& message);
+  explicit TTSChangeRegistratioResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSChangeRegistratioResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h
index 543945e8ef..b066e46766 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h
@@ -49,7 +49,7 @@ class TTSGetCapabilitiesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSGetCapabilitiesRequest(const MessageSharedPtr& message);
+  explicit TTSGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSGetCapabilitiesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h
index 2fc16d1a40..6b7761b0da 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h
@@ -49,7 +49,7 @@ class TTSGetCapabilitiesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSGetCapabilitiesResponse(const MessageSharedPtr& message);
+  explicit TTSGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSGetCapabilitiesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h
index e0ae0da0c4..8c34d63d6e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h
@@ -49,7 +49,7 @@ class TTSGetLanguageRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSGetLanguageRequest(const MessageSharedPtr& message);
+  explicit TTSGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSGetLanguageRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h
index 0d9df07ae6..59da36b5d0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h
@@ -49,7 +49,7 @@ class TTSGetLanguageResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSGetLanguageResponse(const MessageSharedPtr& message);
+  explicit TTSGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSGetLanguageResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
index 136edbb5f4..6c4a39715d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h
@@ -49,7 +49,7 @@ class TTSGetSupportedLanguagesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSGetSupportedLanguagesRequest(const MessageSharedPtr& message);
+  explicit TTSGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSGetSupportedLanguagesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
index 38e3c673bb..1d6c8d3af9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h
@@ -49,7 +49,7 @@ class TTSGetSupportedLanguagesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSGetSupportedLanguagesResponse(const MessageSharedPtr& message);
+  explicit TTSGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSGetSupportedLanguagesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h
index 676faabc01..fe45333741 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h
@@ -49,7 +49,7 @@ class TTSIsReadyRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSIsReadyRequest(const MessageSharedPtr& message);
+  explicit TTSIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSIsReadyRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h
index 12bb3bb870..6547f4704a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h
@@ -49,7 +49,7 @@ class TTSIsReadyResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSIsReadyResponse(const MessageSharedPtr& message);
+  explicit TTSIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSIsReadyResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h
index 92a260d77f..563fb1d5b4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h
@@ -49,7 +49,7 @@ class TTSSetGlobalPropertiesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSSetGlobalPropertiesRequest(const MessageSharedPtr& message);
+  explicit TTSSetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSSetGlobalPropertiesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h
index 0766decf9f..5bb666fea2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h
@@ -49,7 +49,7 @@ class TTSSetGlobalPropertiesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSSetGlobalPropertiesResponse(const MessageSharedPtr& message);
+  explicit TTSSetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSSetGlobalPropertiesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h
index f5555f6495..6464ea1bf9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h
@@ -50,7 +50,7 @@ class TTSSpeakRequest
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSSpeakRequest(const MessageSharedPtr& message);
+  explicit TTSSpeakRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSSpeakRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h
index 541ea0d2ab..8f8e12b046 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h
@@ -50,7 +50,7 @@ class TTSSpeakResponse
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSSpeakResponse(const MessageSharedPtr& message);
+  explicit TTSSpeakResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSSpeakResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h
index 46c464425d..8b4261f05d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h
@@ -49,7 +49,7 @@ class TTSStopSpeakingRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSStopSpeakingRequest(const MessageSharedPtr& message);
+  explicit TTSStopSpeakingRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSStopSpeakingRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h
index aab8ca8c5b..2e703903e1 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h
@@ -49,7 +49,7 @@ class TTSStopSpeakingResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit TTSStopSpeakingResponse(const MessageSharedPtr& message);
+  explicit TTSStopSpeakingResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSStopSpeakingResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h
index 6b857818e7..9bd59721ab 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h
@@ -49,7 +49,7 @@ class UIAddCommandRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIAddCommandRequest(const MessageSharedPtr& message);
+  explicit UIAddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIAddCommandRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h
index c6a02fdd03..596df9dcb8 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h
@@ -49,7 +49,7 @@ class UIAddCommandResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIAddCommandResponse(const MessageSharedPtr& message);
+  explicit UIAddCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIAddCommandResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h
index bba9a4c47e..9aba1075aa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h
@@ -49,7 +49,7 @@ class UIAddSubmenuRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIAddSubmenuRequest(const MessageSharedPtr& message);
+  explicit UIAddSubmenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIAddSubmenuRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h
index 0c4afc2fa3..5b432e1db3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h
@@ -49,7 +49,7 @@ class UIAddSubmenuResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIAddSubmenuResponse(const MessageSharedPtr& message);
+  explicit UIAddSubmenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIAddSubmenuResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h
index 72cd733eb5..65852b948c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h
@@ -49,7 +49,7 @@ class UIAlertRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIAlertRequest(const MessageSharedPtr& message);
+  explicit UIAlertRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIAlertRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h
index 97eb2ba94b..92f31c0508 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h
@@ -49,7 +49,7 @@ class UIAlertResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIAlertResponse(const MessageSharedPtr& message);
+  explicit UIAlertResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIAlertResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h
index 8e68dee2ec..b781e68d74 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h
@@ -49,7 +49,7 @@ class UIChangeRegistrationRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIChangeRegistrationRequest(const MessageSharedPtr& message);
+  explicit UIChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIChangeRegistrationRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h
index 50b092639b..5b36eb678b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h
@@ -49,7 +49,7 @@ class UIChangeRegistratioResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIChangeRegistratioResponse(const MessageSharedPtr& message);
+  explicit UIChangeRegistratioResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIChangeRegistratioResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h
index 9eceb2eb6f..42a61af6a3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h
@@ -49,7 +49,7 @@ class UIDeleteCommandRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIDeleteCommandRequest(const MessageSharedPtr& message);
+  explicit UIDeleteCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIDeleteCommandRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h
index c4d7ab6cac..a3948341de 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h
@@ -49,7 +49,7 @@ class UIDeleteCommandResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIDeleteCommandResponse(const MessageSharedPtr& message);
+  explicit UIDeleteCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIDeleteCommandResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h
index 24bf5878ff..66a73e3074 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h
@@ -49,7 +49,7 @@ class UIDeleteSubmenuRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIDeleteSubmenuRequest(const MessageSharedPtr& message);
+  explicit UIDeleteSubmenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIDeleteSubmenuRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h
index 05d77c82d7..85225d32bd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h
@@ -49,7 +49,7 @@ class UIDeleteSubmenuResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIDeleteSubmenuResponse(const MessageSharedPtr& message);
+  explicit UIDeleteSubmenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIDeleteSubmenuResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
index 06637fc8d4..e60e12be4f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h
@@ -50,7 +50,7 @@ class UIEndAudioPassThruRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIEndAudioPassThruRequest(const MessageSharedPtr& message);
+  explicit UIEndAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIEndAudioPassThruRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
index 6d5594f69f..fa0732f738 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h
@@ -49,7 +49,7 @@ class UIEndAudioPassThruResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIEndAudioPassThruResponse(const MessageSharedPtr& message);
+  explicit UIEndAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIEndAudioPassThruResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h
index ad9a566078..b2053585a3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h
@@ -49,7 +49,7 @@ class UIGetCapabilitiesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIGetCapabilitiesRequest(const MessageSharedPtr& message);
+  explicit UIGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIGetCapabilitiesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h
index ce6ad6f7ef..2a28f9492b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h
@@ -49,7 +49,7 @@ class UIGetCapabilitiesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIGetCapabilitiesResponse(const MessageSharedPtr& message);
+  explicit UIGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIGetCapabilitiesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h
index 7371cd1031..713e560465 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h
@@ -49,7 +49,7 @@ class UIGetLanguageRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIGetLanguageRequest(const MessageSharedPtr& message);
+  explicit UIGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIGetLanguageRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h
index f6536452ce..2d85478750 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h
@@ -49,7 +49,7 @@ class UIGetLanguageResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIGetLanguageResponse(const MessageSharedPtr& message);
+  explicit UIGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIGetLanguageResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
index d0975e68da..e370a2f719 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h
@@ -49,7 +49,7 @@ class UIGetSupportedLanguagesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIGetSupportedLanguagesRequest(const MessageSharedPtr& message);
+  explicit UIGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIGetSupportedLanguagesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
index c888c7b208..6244a23066 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h
@@ -49,7 +49,7 @@ class UIGetSupportedLanguagesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIGetSupportedLanguagesResponse(const MessageSharedPtr& message);
+  explicit UIGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIGetSupportedLanguagesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h
index 7cb4287244..9fe5c0f1b7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h
@@ -49,7 +49,7 @@ class UIIsReadyRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIIsReadyRequest(const MessageSharedPtr& message);
+  explicit UIIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIIsReadyRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h
index 64106654e9..c9ffb4a7c4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h
@@ -49,7 +49,7 @@ class UIIsReadyResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIIsReadyResponse(const MessageSharedPtr& message);
+  explicit UIIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIIsReadyResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
index 69566324f2..7031cd2e2c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h
@@ -49,7 +49,7 @@ class UIPerformAudioPassThruRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIPerformAudioPassThruRequest(const MessageSharedPtr& message);
+  explicit UIPerformAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIPerformAudioPassThruRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
index c3283101f9..6210108789 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h
@@ -49,7 +49,7 @@ class UIPerformAudioPassThruResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIPerformAudioPassThruResponse(const MessageSharedPtr& message);
+  explicit UIPerformAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIPerformAudioPassThruResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h
index d8e2f6c682..ad1e7e2215 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h
@@ -49,7 +49,7 @@ class UIPerformInteractionRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIPerformInteractionRequest(const MessageSharedPtr& message);
+  explicit UIPerformInteractionRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIPerformInteractionRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h
index 04286897a3..375ec79337 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h
@@ -49,7 +49,7 @@ class UIPerformInteractionResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIPerformInteractionResponse(const MessageSharedPtr& message);
+  explicit UIPerformInteractionResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIPerformInteractionResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h
index 06bfadbae7..f13899b3bb 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h
@@ -49,7 +49,7 @@ class UIScrollableMessageRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIScrollableMessageRequest(const MessageSharedPtr& message);
+  explicit UIScrollableMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIScrollableMessageRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h
index 6d6d09c313..b1f8b31a3b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h
@@ -49,7 +49,7 @@ class UIScrollableMessageResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIScrollableMessageResponse(const MessageSharedPtr& message);
+  explicit UIScrollableMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIScrollableMessageResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h
index 96f91d0f82..32e6d71baa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h
@@ -49,7 +49,7 @@ class UISetAppIconRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISetAppIconRequest(const MessageSharedPtr& message);
+  explicit UISetAppIconRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UISetIconRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h
index b323a91c36..748ffa4774 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h
@@ -49,7 +49,7 @@ class UISetAppIconResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISetAppIconResponse(const MessageSharedPtr& message);
+  explicit UISetAppIconResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UISetIconResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h
index 7e67912f53..87cd13aa83 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h
@@ -48,7 +48,7 @@ class UiSetDisplayLayoutRequest : public RequestToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit UiSetDisplayLayoutRequest(const MessageSharedPtr& message);
+    explicit UiSetDisplayLayoutRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief UiSetDisplayLayoutRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h
index 3e7a898af0..f8c9ccfbe4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h
@@ -49,7 +49,7 @@ class UiSetDisplayLayoutResponse : public ResponseFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit UiSetDisplayLayoutResponse(const MessageSharedPtr& message);
+    explicit UiSetDisplayLayoutResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief UiSetDisplayLayoutResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h
index 8b54e85332..5495df36f6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h
@@ -49,7 +49,7 @@ class UISetGlobalPropertiesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISetGlobalPropertiesRequest(const MessageSharedPtr& message);
+  explicit UISetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIShowRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h
index b3cb38d49f..943f577ad9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h
@@ -49,7 +49,7 @@ class UISetGlobalPropertiesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISetGlobalPropertiesResponse(const MessageSharedPtr& message);
+  explicit UISetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UISetGlobalPropertiesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h
index 1541aada6b..779f74a506 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
+/*
+ * Copyright (c) 2016, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h
index f125f64282..7011915135 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
+/*
+ * Copyright (c) 2016, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
index 443fc8d1a7..9ec6513dc9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h
@@ -49,7 +49,7 @@ class UISetMediaClockTimerRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISetMediaClockTimerRequest(const MessageSharedPtr& message);
+  explicit UISetMediaClockTimerRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UISetMediaClockTimerRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
index 9358707117..f8679cc089 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h
@@ -49,7 +49,7 @@ class UISetMediaClockTimerResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISetMediaClockTimerResponse(const MessageSharedPtr& message);
+  explicit UISetMediaClockTimerResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UISetMediaClockTimerResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h
index 136a99622b..d0a50a7b0c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h
@@ -49,7 +49,7 @@ class UIShowRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIShowRequest(const MessageSharedPtr& message);
+  explicit UIShowRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIShowRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h
index 4a9b49253e..07ae7e6efb 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h
@@ -49,7 +49,7 @@ class UIShowResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UIShowResponse(const MessageSharedPtr& message);
+  explicit UIShowResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UIShowResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h
index 8a3b37bfef..0683a019fa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h
@@ -49,7 +49,7 @@ class UISliderRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISliderRequest(const MessageSharedPtr& message);
+  explicit UISliderRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UISliderRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h
index 2384f248aa..0bc5deabf7 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h
@@ -49,7 +49,7 @@ class UISliderResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UISliderResponse(const MessageSharedPtr& message);
+  explicit UISliderResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UISliderResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h
index b606134409..567441004b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h
@@ -49,7 +49,7 @@ class UpdateAppListRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UpdateAppListRequest(const MessageSharedPtr& message);
+  explicit UpdateAppListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UpdateAppListRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h
index 135481cb0b..b0b57a7d1c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h
@@ -49,7 +49,7 @@ class UpdateAppListResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UpdateAppListResponse(const MessageSharedPtr& message);
+  explicit UpdateAppListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UpdateAppListResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h
index f645d312c5..4f8e82a0ab 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h
@@ -53,7 +53,7 @@ class UpdateDeviceListRequest : public RequestToHMI,
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UpdateDeviceListRequest(const MessageSharedPtr& message);
+  explicit UpdateDeviceListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UpdateDeviceListRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h
index 6ea2c1e528..e9aec76355 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h
@@ -49,7 +49,7 @@ class UpdateDeviceListResponse : public ResponseFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit UpdateDeviceListResponse(const MessageSharedPtr& message);
+    explicit UpdateDeviceListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief UpdateDeviceListResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h
index f84f93f2ed..a415c51fcc 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_
 
 #include "application_manager/commands/hmi/request_to_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -49,7 +50,7 @@ class UpdateSDLRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UpdateSDLRequest(const MessageSharedPtr& message);
+  explicit UpdateSDLRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UpdateSDLRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h
index b0d370ecfd..cce0c7f681 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h
@@ -49,7 +49,7 @@ class UpdateSDLResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit UpdateSDLResponse(const MessageSharedPtr& message);
+  explicit UpdateSDLResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief UpdateSDLResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
index c60533d2ea..8b8a2172ad 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h
@@ -49,7 +49,7 @@ class VIDiagnosticMessageRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIDiagnosticMessageRequest(const MessageSharedPtr& message);
+  explicit VIDiagnosticMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIDiagnosticMessageRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
index 027e007e42..9c192054f3 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h
@@ -49,7 +49,7 @@ class VIDiagnosticMessageResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIDiagnosticMessageResponse(const MessageSharedPtr& message);
+  explicit VIDiagnosticMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIDiagnosticMessageResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h
index 170eb895fd..06faa2bc7f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h
@@ -49,7 +49,7 @@ class VIGetDTCsRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetDTCsRequest(const MessageSharedPtr& message);
+  explicit VIGetDTCsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIGetDTCsRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h
index 3ba4656d5b..a77984ea1a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h
@@ -49,7 +49,7 @@ class VIGetDTCsResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetDTCsResponse(const MessageSharedPtr& message);
+  explicit VIGetDTCsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIGetDTCsResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
index 7413b6bf3b..a4e6525baf 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h
@@ -49,7 +49,7 @@ class VIGetVehicleDataRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetVehicleDataRequest(const MessageSharedPtr& message);
+  explicit VIGetVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIGetVehicleDataRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
index 5a39891839..ff69152a16 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h
@@ -52,8 +52,8 @@ class VIGetVehicleDataRequestTemplate : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetVehicleDataRequestTemplate(const MessageSharedPtr& message)
-      : RequestToHMI(message) {
+  explicit VIGetVehicleDataRequestTemplate(const MessageSharedPtr& message, ApplicationManager& application_manager)
+      : RequestToHMI(message, application_manager) {
   }
 
   /**
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
index 1f9736b56a..488f1e50ec 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_
 
 #include "application_manager/commands/hmi/response_from_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -49,7 +50,7 @@ class VIGetVehicleDataResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetVehicleDataResponse(const MessageSharedPtr& message);
+  explicit VIGetVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIGetVehicleDataResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
index 9942110ca8..25581efa01 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h
@@ -35,6 +35,7 @@
 
 #include "application_manager/event_engine/event.h"
 #include "application_manager/commands/hmi/response_from_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 namespace commands {
@@ -50,8 +51,8 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetVehicleDataResponseTemplate(const MessageSharedPtr& message)
-      : ResponseFromHMI(message) {
+  explicit VIGetVehicleDataResponseTemplate(const MessageSharedPtr& message, ApplicationManager& application_manager)
+      : ResponseFromHMI(message, application_manager) {
   }
 
   /**
@@ -61,7 +62,7 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI {
     LOG4CXX_AUTO_TRACE(logger_);
     event_engine::Event event(eventID);
     event.set_smart_object(*message_);
-    event.raise();
+    event.raise(application_manager_.event_dispatcher());
   }
 
  private:
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
index 67d8ae046c..14b2f27c42 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h
@@ -49,7 +49,7 @@ class VIGetVehicleTypeRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetVehicleTypeRequest(const MessageSharedPtr& message);
+  explicit VIGetVehicleTypeRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIGetVehicleTypeRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
index b36b193418..83b108418e 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h
@@ -49,7 +49,7 @@ class VIGetVehicleTypeResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIGetVehicleTypeResponse(const MessageSharedPtr& message);
+  explicit VIGetVehicleTypeResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIGetVehicleTypeResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h
index 061681029a..6c24332002 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h
@@ -49,7 +49,7 @@ class VIIsReadyRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIIsReadyRequest(const MessageSharedPtr& message);
+  explicit VIIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIIsReadyRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h
index 52e00f85da..4abbf1466c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_
 
 #include "application_manager/commands/hmi/response_from_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
@@ -49,7 +50,7 @@ class VIIsReadyResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIIsReadyResponse(const MessageSharedPtr& message);
+  explicit VIIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIIsReadyResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h
index 6520db5e7d..c2911e9bd5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h
@@ -49,7 +49,7 @@ class VIReadDIDRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIReadDIDRequest(const MessageSharedPtr& message);
+  explicit VIReadDIDRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIReadDIDRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h
index 0855be454b..893fb69e71 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h
@@ -49,7 +49,7 @@ class VIReadDIDResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIReadDIDResponse(const MessageSharedPtr& message);
+  explicit VIReadDIDResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIReadDIDResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
index 1eb06c6217..8cef8ea6f6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h
@@ -49,7 +49,7 @@ class VISubscribeVehicleDataRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VISubscribeVehicleDataRequest(const MessageSharedPtr& message);
+  explicit VISubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VISubscribeVehicleDataRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
index 5cf16c3610..7514819f81 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h
@@ -53,8 +53,8 @@ class VISubscribeVehicleDataRequestTemplate : public RequestToHMI {
    * @param message Incoming SmartObject message
    **/
   explicit VISubscribeVehicleDataRequestTemplate(
-      const MessageSharedPtr& message)
-      : RequestToHMI(message) {
+      const MessageSharedPtr& message, ApplicationManager& application_manager)
+      : RequestToHMI(message, application_manager) {
   }
 
   /**
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
index b5e2788f32..f79faa6de2 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h
@@ -49,7 +49,7 @@ class VISubscribeVehicleDataResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VISubscribeVehicleDataResponse(const MessageSharedPtr& message);
+  explicit VISubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VISubscribeVehicleDataResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
index be67ab0106..b49c6628a5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h
@@ -35,6 +35,7 @@
 
 #include "application_manager/event_engine/event.h"
 #include "application_manager/commands/hmi/response_from_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 namespace commands {
@@ -50,8 +51,8 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI {
    * @param message Incoming SmartObject message
    **/
   explicit VISubscribeVehicleDataResponseTemplate(
-      const MessageSharedPtr& message)
-      : ResponseFromHMI(message) {
+      const MessageSharedPtr& message, ApplicationManager& application_manager)
+      : ResponseFromHMI(message, application_manager) {
   }
 
   /**
@@ -61,7 +62,7 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI {
     LOG4CXX_AUTO_TRACE(logger_);
     event_engine::Event event(eventID);
     event.set_smart_object(*message_);
-    event.raise();
+    event.raise(application_manager_.event_dispatcher());
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(VISubscribeVehicleDataResponseTemplate<eventID>);
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
index 1320ae477a..e99473d0e0 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h
@@ -49,7 +49,7 @@ class VIUnsubscribeVehicleDataRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIUnsubscribeVehicleDataRequest(const MessageSharedPtr& message);
+  explicit VIUnsubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIUnsubscribeVehicleDataRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
index 6014078ce3..ebe00194a9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
@@ -53,8 +53,8 @@ class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI {
    * @param message Incoming SmartObject message
    **/
   explicit VIUnsubscribeVehicleDataRequestTemplate(
-      const MessageSharedPtr& message)
-      : RequestToHMI(message) {
+      const MessageSharedPtr& message, ApplicationManager& application_manager)
+      : RequestToHMI(message, application_manager) {
   }
 
   /**
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
index 8818709afe..a1389758f5 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h
@@ -49,7 +49,7 @@ class VIUnsubscribeVehicleDataResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VIUnsubscribeVehicleDataResponse(const MessageSharedPtr& message);
+  explicit VIUnsubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VIUnsubscribeVehicleDataResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
index a74f71fdf2..aecd562aaa 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
@@ -35,6 +35,7 @@
 
 #include "application_manager/event_engine/event.h"
 #include "application_manager/commands/hmi/response_from_hmi.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 namespace commands {
@@ -51,8 +52,8 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI {
    * @param message Incoming SmartObject message
    **/
   explicit VIUnsubscribeVehicleDataResponseTemplate(
-      const MessageSharedPtr& message)
-      : ResponseFromHMI(message) {
+      const MessageSharedPtr& message, ApplicationManager& application_manager)
+      : ResponseFromHMI(message, application_manager) {
   }
 
   /**
@@ -62,7 +63,7 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI {
     LOG4CXX_AUTO_TRACE(logger_);
     event_engine::Event event(eventID);
     event.set_smart_object(*message_);
-    event.raise();
+    event.raise(application_manager_.event_dispatcher());
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(VIUnsubscribeVehicleDataResponseTemplate<eventID>);
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h
index 9fdc3f776f..1abea1b25a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h
@@ -49,7 +49,7 @@ class VRAddCommandRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRAddCommandRequest(const MessageSharedPtr& message);
+  explicit VRAddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRAddCommandRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h
index 7418ed5865..77bc593a3a 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h
@@ -49,7 +49,7 @@ class VRAddCommandResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRAddCommandResponse(const MessageSharedPtr& message);
+  explicit VRAddCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRAddCommandResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h
index 53584ee970..43a05cf3b9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h
@@ -49,7 +49,7 @@ class VRChangeRegistrationRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRChangeRegistrationRequest(const MessageSharedPtr& message);
+  explicit VRChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRChangeRegistrationRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h
index d71a14da34..61993b93c4 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h
@@ -49,7 +49,7 @@ class VRChangeRegistrationResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRChangeRegistrationResponse(const MessageSharedPtr& message);
+  explicit VRChangeRegistrationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRChangeRegistrationResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h
index 91a5dc7d99..e6eb3d4005 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h
@@ -49,7 +49,7 @@ class VRDeleteCommandRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRDeleteCommandRequest(const MessageSharedPtr& message);
+  explicit VRDeleteCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRDeleteCommandRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h
index ad8c82e38c..0f91738ddd 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h
@@ -49,7 +49,7 @@ class VRDeleteCommandResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRDeleteCommandResponse(const MessageSharedPtr& message);
+  explicit VRDeleteCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRDeleteCommandResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h
index 676967083f..c4c361643c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h
@@ -49,7 +49,7 @@ class VRGetCapabilitiesRequest : public RequestToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit VRGetCapabilitiesRequest(const MessageSharedPtr& message);
+    explicit VRGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief VRGetCapabilitiesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h
index 8b88eb4e3b..d9ce78b251 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h
@@ -49,7 +49,7 @@ class VRGetCapabilitiesResponse : public ResponseFromHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit VRGetCapabilitiesResponse(const MessageSharedPtr& message);
+    explicit VRGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief VRGetCapabilitiesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h
index 9dd9133ffd..1ef46f6c08 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h
@@ -49,7 +49,7 @@ class VRGetLanguageRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRGetLanguageRequest(const MessageSharedPtr& message);
+  explicit VRGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRGetLanguageRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h
index d9c4fc2126..28776f1259 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h
@@ -49,7 +49,7 @@ class VRGetLanguageResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRGetLanguageResponse(const MessageSharedPtr& message);
+  explicit VRGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRGetLanguageResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
index 0a010cdfec..6f0803c2f9 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h
@@ -49,7 +49,7 @@ class VRGetSupportedLanguagesRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRGetSupportedLanguagesRequest(const MessageSharedPtr& message);
+  explicit VRGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRGetSupportedLanguagesRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
index dbbe57ba36..85b9a1a3ad 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h
@@ -49,7 +49,7 @@ class VRGetSupportedLanguagesResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRGetSupportedLanguagesResponse(const MessageSharedPtr& message);
+  explicit VRGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRGetSupportedLanguagesResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h
index e66c9c36a5..2877aef65f 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h
@@ -49,7 +49,7 @@ class VRIsReadyRequest : public RequestToHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRIsReadyRequest(const MessageSharedPtr& message);
+  explicit VRIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRIsReadyRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h
index a9b1a68455..08fc099c39 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h
@@ -49,7 +49,7 @@ class VRIsReadyResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRIsReadyResponse(const MessageSharedPtr& message);
+  explicit VRIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief VRIsReadyResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h
index b819fdb927..50616ef0bf 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h
@@ -49,7 +49,7 @@ class VRPerformInteractionRequest : public RequestToHMI {
      *
      * @param message Incoming SmartObject message
      **/
-    explicit VRPerformInteractionRequest(const MessageSharedPtr& message);
+    explicit VRPerformInteractionRequest(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
     /**
      * @brief VRPerformInteractionRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h
index ffbbd613e2..6cd3bd7b73 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h
@@ -49,7 +49,7 @@ class VRPerformInteractionResponse : public ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  explicit VRPerformInteractionResponse(const MessageSharedPtr& message);
+  explicit VRPerformInteractionResponse(const MessageSharedPtr& message, ApplicationManager& application_manager);
 
   /**
    * @brief TTSPerformInteractionResponse class destructor
author	Kozoriz <kozorizandriy@gmail.com>	2016-04-11 16:22:10 +0300
committer	Kozoriz <kozorizandriy@gmail.com>	2016-04-25 12:05:00 +0300
commit	65350ac57da63f3c267d3a27dce05a3752ddbba7 (patch)
tree	197f249f8bd3108c7fbb154d4c67a14bcb38318e /src/components/application_manager/include/application_manager/commands
parent	2c7dc612ce41461bebc3416917d2607f24002285 (diff)
download	sdl_core-65350ac57da63f3c267d3a27dce05a3752ddbba7.tar.gz