diff --git a/daemon/nfd.cpp b/daemon/nfd.cpp
index 5d6bec7..b3369db 100644
--- a/daemon/nfd.cpp
+++ b/daemon/nfd.cpp
@@ -155,12 +155,7 @@
   ConfigFile config(&ignoreRibAndLogSections);
   general::setConfigFile(config);
 
-  TablesConfigSection tablesConfig(m_forwarder->getCs(),
-                                   m_forwarder->getPit(),
-                                   m_forwarder->getFib(),
-                                   m_forwarder->getStrategyChoice(),
-                                   m_forwarder->getMeasurements(),
-                                   m_forwarder->getNetworkRegionTable());
+  TablesConfigSection tablesConfig(*m_forwarder);
   tablesConfig.setConfigFile(config);
 
   m_authenticator->setConfigFile(config);
@@ -176,7 +171,7 @@
     config.parse(m_configSection, false, INTERNAL_CONFIG);
   }
 
-  tablesConfig.ensureTablesAreConfigured();
+  tablesConfig.ensureConfigured();
 
   // add FIB entry for NFD Management Protocol
   Name topPrefix("/localhost/nfd");
@@ -196,12 +191,7 @@
 
   general::setConfigFile(config);
 
-  TablesConfigSection tablesConfig(m_forwarder->getCs(),
-                                   m_forwarder->getPit(),
-                                   m_forwarder->getFib(),
-                                   m_forwarder->getStrategyChoice(),
-                                   m_forwarder->getMeasurements(),
-                                   m_forwarder->getNetworkRegionTable());
+  TablesConfigSection tablesConfig(*m_forwarder);
   tablesConfig.setConfigFile(config);
 
   m_authenticator->setConfigFile(config);