diff --git a/HdcpProfile/HdcpProfile.cpp b/HdcpProfile/HdcpProfile.cpp
index 4179ba00..65bae97b 100644
--- a/HdcpProfile/HdcpProfile.cpp
+++ b/HdcpProfile/HdcpProfile.cpp
@@ -117,6 +117,8 @@ namespace WPEFramework
         {
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetryIntervalMS(200)
+                                    .withRetryCount(25)
                                     .createInterface();
         }
 
diff --git a/HdmiCecSink/HdmiCecSink.cpp b/HdmiCecSink/HdmiCecSink.cpp
index b2cf119f..7c50d696 100644
--- a/HdmiCecSink/HdmiCecSink.cpp
+++ b/HdmiCecSink/HdmiCecSink.cpp
@@ -23,7 +23,6 @@
 #include "ccec/CECFrame.hpp"
 #include "ccec/MessageEncoder.hpp"
 #include "host.hpp"
-#include "ccec/host/RDK.hpp"
 #include "UtilsgetRFCConfig.h"
 
 #include "dsMgr.h"
@@ -901,6 +900,8 @@ namespace WPEFramework
         {
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetryIntervalMS(200)
+                                    .withRetryCount(25)
                                     .createInterface();
             registerEventHandlers();
         }
@@ -910,7 +911,7 @@ namespace WPEFramework
 
            if(!_registeredEventHandlers && _powerManagerPlugin) {
                _registeredEventHandlers = true;
-               _powerManagerPlugin->Register(&_pwrMgrNotification);
+               _powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
            }
        }
 
diff --git a/HdmiCecSink/HdmiCecSink.h b/HdmiCecSink/HdmiCecSink.h
index e3443ad0..d41b16ab 100644
--- a/HdmiCecSink/HdmiCecSink.h
+++ b/HdmiCecSink/HdmiCecSink.h
@@ -585,33 +585,35 @@ namespace WPEFramework {
             END_INTERFACE_MAP
 
         private:
-            class PowerManagerNotification : public Exchange::IPowerManager::INotification {
+            class PowerManagerNotification : public Exchange::IPowerManager::IModeChangedNotification {
             private:
                 PowerManagerNotification(const PowerManagerNotification&) = delete;
                 PowerManagerNotification& operator=(const PowerManagerNotification&) = delete;
-            
+
             public:
                 explicit PowerManagerNotification(HdmiCecSink& parent)
                     : _parent(parent)
                 {
                 }
                 ~PowerManagerNotification() override = default;
-            
+
             public:
                 void OnPowerModeChanged(const PowerState &currentState, const PowerState &newState) override
                 {
                     _parent.onPowerModeChanged(currentState, newState);
                 }
-                void OnPowerModePreChange(const PowerState &currentState, const PowerState &newState) override {}
-                void OnDeepSleepTimeout(const int &wakeupTimeout) override {}
-                void OnNetworkStandbyModeChanged(const bool &enabled) override {}
-                void OnThermalModeChanged(const ThermalTemperature &currentThermalLevel, const ThermalTemperature &newThermalLevel, const float &currentTemperature) override {}
-                void OnRebootBegin(const string &rebootReasonCustom, const string &rebootReasonOther, const string &rebootRequestor) override {}
+
+                template <typename T>
+                T* baseInterface()
+                {
+                    static_assert(std::is_base_of<T, PowerManagerNotification>(), "base type mismatch");
+                    return static_cast<T*>(this);
+                }
             
                 BEGIN_INTERFACE_MAP(PowerManagerNotification)
-                INTERFACE_ENTRY(Exchange::IPowerManager::INotification)
+                INTERFACE_ENTRY(Exchange::IPowerManager::IModeChangedNotification)
                 END_INTERFACE_MAP
-            
+
             private:
                 HdmiCecSink& _parent;
             };
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.cpp b/HdmiCecSource/HdmiCecSourceImplementation.cpp
index bc944221..b12894dd 100644
--- a/HdmiCecSource/HdmiCecSourceImplementation.cpp
+++ b/HdmiCecSource/HdmiCecSourceImplementation.cpp
@@ -474,7 +474,7 @@ namespace WPEFramework
     
         if(!_registeredEventHandlers && _powerManagerPlugin) {
             _registeredEventHandlers = true;
-            _powerManagerPlugin->Register(&_pwrMgrNotification);
+            _powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
         }
 
 
@@ -725,6 +725,8 @@ namespace WPEFramework
             LOGINFO("Connect the COM-RPC socket\n");
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetryIntervalMS(200)
+                                    .withRetryCount(25)
                                     .createInterface();
             registerEventHandlers();
         }
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.h b/HdmiCecSource/HdmiCecSourceImplementation.h
index 7a8bf445..c4832014 100644
--- a/HdmiCecSource/HdmiCecSourceImplementation.h
+++ b/HdmiCecSource/HdmiCecSourceImplementation.h
@@ -226,7 +226,7 @@ namespace WPEFramework {
 
 
         private:
-            class PowerManagerNotification : public Exchange::IPowerManager::INotification {
+            class PowerManagerNotification : public Exchange::IPowerManager::IModeChangedNotification {
             private:
                 PowerManagerNotification(const PowerManagerNotification&) = delete;
                 PowerManagerNotification& operator=(const PowerManagerNotification&) = delete;
@@ -243,14 +243,16 @@ namespace WPEFramework {
                 {
                     _parent.onPowerModeChanged(currentState, newState);
                 }
-                void OnPowerModePreChange(const PowerState &currentState, const PowerState &newState) override {}
-                void OnDeepSleepTimeout(const int &wakeupTimeout) override {}
-                void OnNetworkStandbyModeChanged(const bool &enabled) override {}
-                void OnThermalModeChanged(const ThermalTemperature &currentThermalLevel, const ThermalTemperature &newThermalLevel, const float &currentTemperature) override {}
-                void OnRebootBegin(const string &rebootReasonCustom, const string &rebootReasonOther, const string &rebootRequestor) override {}
-            
+
+                template <typename T>
+                T* baseInterface()
+                {
+                    static_assert(std::is_base_of<T, PowerManagerNotification>(), "base type mismatch");
+                    return static_cast<T*>(this);
+                }
+
                 BEGIN_INTERFACE_MAP(PowerManagerNotification)
-                INTERFACE_ENTRY(Exchange::IPowerManager::INotification)
+                INTERFACE_ENTRY(Exchange::IPowerManager::IModeChangedNotification)
                 END_INTERFACE_MAP
 
             private:
diff --git a/cmake/FindCEC.cmake b/cmake/FindCEC.cmake
index 71d263a4..442174f9 100644
--- a/cmake/FindCEC.cmake
+++ b/cmake/FindCEC.cmake
@@ -31,13 +31,12 @@ find_library(OSAL_LIBRARIES NAMES RCECOSHal)
 
 find_path(CEC_INCLUDE_DIRS NAMES ccec/Connection.hpp PATH_SUFFIXES ccec/include)
 find_path(OSAL_INCLUDE_DIRS NAMES osal/Mutex.hpp PATH_SUFFIXES osal/include)
-find_path(CEC_HOST_INCLUDE_DIRS NAMES ccec/host/RDK.hpp PATH_SUFFIXES host/include)
 
 set(CEC_LIBRARIES "-Wl,--no-as-needed" ${CEC_LIBRARIES} ${CEC_HAL_LIBRARIES} ${OSAL_LIBRARIES} "-Wl,--as-needed")
 
 set(CEC_LIBRARIES ${CEC_LIBRARIES} CACHE PATH "Path to CEC library")
 
-set(CEC_INCLUDE_DIRS ${CEC_INCLUDE_DIRS} ${OSAL_INCLUDE_DIRS} ${CEC_HOST_INCLUDE_DIRS})
+set(CEC_INCLUDE_DIRS ${CEC_INCLUDE_DIRS} ${OSAL_INCLUDE_DIRS})
 set(CEC_INCLUDE_DIRS ${CEC_INCLUDE_DIRS} CACHE PATH "Path to CEC include")
 
 include(FindPackageHandleStandardArgs)
diff --git a/helpers/PluginInterfaceBuilder.h b/helpers/PluginInterfaceBuilder.h
old mode 100644
new mode 100755
index d10a7f2b..a10ad6a6
--- a/helpers/PluginInterfaceBuilder.h
+++ b/helpers/PluginInterfaceBuilder.h
@@ -100,18 +100,32 @@ namespace Plugin {
     {
         WPEFramework::PluginHost::IShell* controller = builder.controller();
         const std::string& callsign = builder.callSign();
+        const int retry_count = builder.retryCount();
+        const uint32_t retry_interval = builder.retryInterval();
+        int count = 0;
+
         if (!controller) {
             LOGERR("Invalid controller");
             return nullptr;
         }
 
-        auto pluginInterface = controller->QueryInterfaceByCallsign<INTERFACE>(callsign.c_str());
+        do {
+            auto pluginInterface = controller->QueryInterfaceByCallsign<INTERFACE>(callsign.c_str());
 
-        if (pluginInterface) {
-            pluginInterface->AddRef();
-        }
+            if (pluginInterface) {
+                pluginInterface->AddRef();
+                LOGINFO("plugin interface succeed and retry count: %d",count);
+                return pluginInterface;
+            }
+            else
+            {
+                count++;
+                LOGERR("plugin interface failed and retry: %d",count);
+                usleep(retry_interval*1000);
+            }
+        }while(count < retry_count);
 
-        return pluginInterface;
+        return nullptr;
     }
 
     template <typename T, typename... Args>
@@ -127,6 +141,8 @@ namespace Plugin {
         PluginHost::IShell* _service;
         uint32_t _version;
         uint32_t _timeout;
+        int _retry_count;
+        uint32_t _retry_interval;
 
     public:
         PluginInterfaceBuilder(const char* callsign)
@@ -134,6 +150,8 @@ namespace Plugin {
             , _service(nullptr)
             , _version(static_cast<uint32_t>(~0))
             , _timeout(3000)
+            ,_retry_count(0)
+            ,_retry_interval(0)
         {
         }
 
@@ -158,6 +176,18 @@ namespace Plugin {
             return *this;
         }
 
+        inline PluginInterfaceBuilder& withRetryIntervalMS(int retryInterval)
+        {
+            _retry_interval = retryInterval;
+            return *this;
+        }
+
+        inline PluginInterfaceBuilder& withRetryCount(int retryCount)
+        {
+            _retry_count = retryCount;
+            return *this;
+        }
+
         PluginInterfaceRef<INTERFACE> createInterface()
         {
             auto* interface = ::WPEFramework::Plugin::createInterface<INTERFACE>(*this);
@@ -170,6 +200,16 @@ namespace Plugin {
             return std::move(PluginInterfaceRef<INTERFACE>(interface, _service));
         }
 
+        const uint32_t retryInterval() const
+        {
+            return _retry_interval;
+        }
+
+        const int retryCount() const
+        {
+            return _retry_count;
+        }
+
         const std::string& callSign() const
         {
             return _callsign;
diff --git a/helpers/frontpanel.cpp b/helpers/frontpanel.cpp
index cd8674a2..699bc340 100644
--- a/helpers/frontpanel.cpp
+++ b/helpers/frontpanel.cpp
@@ -135,6 +135,8 @@ namespace WPEFramework
                 {
                     _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                       .withIShell(service)
+                                      .withRetryIntervalMS(200)
+                                      .withRetryCount(25)
                                       .createInterface();
                 }
                 if (!s_instance)