diff --git a/config/commonConfig.h.in b/config/commonConfig.h.in
index 2ab821a..ccdee65 100644
--- a/config/commonConfig.h.in
+++ b/config/commonConfig.h.in
@@ -44,8 +44,11 @@ static const uint16_t COMMON_APID = 0xEF;
 
 #ifdef __cplusplus
 
-#include <fsfw/events/fwSubsystemIdRanges.h>
-#include <fsfw/returnvalues/FwClassIds.h>
+namespace cfg {
+
+static constexpr uint32_t OBSW_MAX_SCHEDULED_TCS = @OBSW_MAX_SCHEDULED_TCS@;
+
+}
 
 #endif /* __cplusplus */
 
diff --git a/example/core/GenericFactory.cpp b/example/core/GenericFactory.cpp
index d48a254..e2f6ed3 100644
--- a/example/core/GenericFactory.cpp
+++ b/example/core/GenericFactory.cpp
@@ -60,7 +60,7 @@ void ObjectFactory::produceGenericObjects() {
   new Service17Test(objects::PUS_SERVICE_17_TEST, apid::APID, pus::PUS_SERVICE_17);
   new Service20ParameterManagement(objects::PUS_SERVICE_20_PARAMETERS, apid::APID,
                                    pus::PUS_SERVICE_20);
-  new Service11TelecommandScheduling<100>(objects::PUS_SERVICE_11_TC_SCHEDULER, apid::APID,
+  new Service11TelecommandScheduling<cfg::OBSW_MAX_SCHEDULED_TCS>(objects::PUS_SERVICE_11_TC_SCHEDULER, apid::APID,
                                           pus::PUS_SERVICE_11, ccsdsDistrib);
   new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, apid::APID,
                                 pus::PUS_SERVICE_200);