diff --git a/rfcMgr/rfc_manager.cpp b/rfcMgr/rfc_manager.cpp
index 0430f63..3b12487 100644
--- a/rfcMgr/rfc_manager.cpp
+++ b/rfcMgr/rfc_manager.cpp
@@ -21,6 +21,9 @@
 #include "rfc_common.h"
 #include "rfc_mgr_iarm.h"
 #include "rfc_xconf_handler.h"
+#if defined(RDK_LOGGER)
+#include "rdk_logger.h"
+#endif
 #include <fstream>
 #include <unistd.h>
 #include <sys/types.h>
@@ -39,9 +42,21 @@ namespace rfc {
     }
 #endif
     RFCManager ::RFCManager() {
+#if defined(RDK_LOGGER)		
         /* Initialize RDK Logger */
-        rdk_logger_init(0 == access(OVERIDE_DEBUG_INI_FILE, R_OK) ? OVERIDE_DEBUG_INI_FILE : DEBUG_INI_FILE);	    
-
+        static char RFCMGRLOG[] = "LOG.RDK.RFCMGR";
+		rdk_logger_ext_config_t config = {
+            .pModuleName = RFCMGRLOG,                 /* Module name */
+            .loglevel = RDK_LOG_INFO,                 /* Default log level */
+            .output = RDKLOG_OUTPUT_CONSOLE,          /* Output to console (stdout/stderr) */
+            .format = RDKLOG_FORMAT_WITH_TS,          /* Timestamped format */
+            .pFilePolicy = NULL                       /* Not using file output, so NULL */
+        };
+    
+        if (rdk_logger_ext_init(&config) != RDK_SUCCESS) {
+            printf("RFC : ERROR - Extended logger init failed\n");
+        }
+#endif		
         /* Initialize IARM Bus */
         InitializeIARM();
     }
diff --git a/rfcMgr/rfc_xconf_handler.cpp b/rfcMgr/rfc_xconf_handler.cpp
index d70fb8c..a2c6863 100644
--- a/rfcMgr/rfc_xconf_handler.cpp
+++ b/rfcMgr/rfc_xconf_handler.cpp
@@ -2413,11 +2413,13 @@ void RuntimeFeatureControlProcessor::processXconfResponseConfigDataPart(JSON *fe
         }
         else
         {
+#if !defined(RDKB_SUPPORT)
             if (newValue.empty())
             {
                 RDK_LOG(RDK_LOG_INFO, LOG_RFCMGR, "[%s][%d] EMPTY value for %s is rejected\n", __FUNCTION__, __LINE__, newKey.c_str());
                 continue;
             }
+#endif
 	    
  	    if(newKey == BOOTSTRAP_XCONF_URL_KEY_STR)
     	    {
@@ -2555,6 +2557,7 @@ bool RuntimeFeatureControlProcessor::isConfigValueChange(std ::string name, std
     }
     else
     {
+#if !defined(RDKB_SUPPORT)
         std::string account_key_str = RFC_ACCOUNT_ID_KEY_STR;
         std::string unknown_str = "Unknown";
         bool isAccountKey = (key.find(account_key_str) != std::string::npos) ? true : false;
@@ -2576,6 +2579,7 @@ bool RuntimeFeatureControlProcessor::isConfigValueChange(std ::string name, std
  	        RDK_LOG(RDK_LOG_INFO, LOG_RFCMGR, "[%s][%d] AccountId is Valid %s, Updating the device Database\n", __FUNCTION__, __LINE__,value.c_str());
 	    }
         }
+#endif
 
 	return true;
     }