diff --git a/include/appfwk/ConfigurationManager.hpp b/include/appfwk/ConfigurationManager.hpp
index 8e4264b..eae6d7e 100644
--- a/include/appfwk/ConfigurationManager.hpp
+++ b/include/appfwk/ConfigurationManager.hpp
@@ -11,6 +11,7 @@
 #ifndef APPFWK_INCLUDE_CONFIGURATIONMANAGER_HPP_
 #define APPFWK_INCLUDE_CONFIGURATIONMANAGER_HPP_
 
+#include "appmodel/ConfigurationHelper.hpp"
 #include "conffwk/Configuration.hpp"
 #include "confmodel/ActionPlan.hpp"
 #include "confmodel/DaqModule.hpp"
@@ -43,6 +44,7 @@ namespace appfwk {
 class ConfigurationManager
 {
   std::shared_ptr<conffwk::Configuration> m_confdb;
+  std::shared_ptr<appmodel::ConfigurationHelper> m_helper;
   std::string m_app_name;
   std::string m_session_name;
   std::string m_oks_config_spec;
diff --git a/src/ConfigurationManager.cpp b/src/ConfigurationManager.cpp
index 523c80c..bda3c90 100644
--- a/src/ConfigurationManager.cpp
+++ b/src/ConfigurationManager.cpp
@@ -39,6 +39,7 @@ ConfigurationManager::ConfigurationManager(std::string& config_spec, std::string
     TLOG() << "Failed to get session";
     throw MissingComponent(ERS_HERE, "Session " + session_name);
   }
+  m_helper = std::make_shared<appmodel::ConfigurationHelper>(m_session);
 }
 
 void
@@ -59,7 +60,7 @@ ConfigurationManager::initialize()
   if (smartDaqApp) {
     auto cpos = m_oks_config_spec.find(":") + 1;
     std::string oksFile = m_oks_config_spec.substr(cpos); // Strip off "oksconflibs:"
-    m_modules = smartDaqApp->generate_modules(m_confdb.get(), oksFile, m_session);
+    m_modules = smartDaqApp->generate_modules(m_confdb.get(), oksFile, m_helper);
 
     for (auto& plan : smartDaqApp->get_action_plans()) {
       auto cmd = plan->get_command()->get_cmd();