diff --git a/config/commonObjects.h b/config/commonObjects.h
index dc76bac..76b3483 100644
--- a/config/commonObjects.h
+++ b/config/commonObjects.h
@@ -25,6 +25,8 @@ enum commonObjects : object_id_t {
   CCSDS_DISTRIBUTOR = 0x63000000,
   PUS_DISTRIBUTOR = 0x63000001,
   TM_FUNNEL = 0x63000002,
+  CFDP_DISTRIBUTOR = 0x63000003,
+  CFDP_HANDLER = 0x63000004,
 
   /* 0x74 ('t') for test and example objects  */
   TEST_TASK = 0x7400CAFE,
diff --git a/config/commonPollingSequenceFactory.cpp b/config/commonPollingSequenceFactory.cpp
index 632df0d..a699302 100644
--- a/config/commonPollingSequenceFactory.cpp
+++ b/config/commonPollingSequenceFactory.cpp
@@ -1,5 +1,4 @@
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 
 #include "example/test/FsfwExampleTask.h"
diff --git a/example/core/GenericFactory.cpp b/example/core/GenericFactory.cpp
index 3d85cc4..e671799 100644
--- a/example/core/GenericFactory.cpp
+++ b/example/core/GenericFactory.cpp
@@ -34,7 +34,7 @@
 #include "objects/systemObjectList.h"
 #include "tmtc/apid.h"
 
-void ObjectFactory::produceGenericObjects() {
+void ObjectFactory::produceGenericObjects(TmFunnel **tmFunnel) {
 #if OBSW_ADD_CORE_COMPONENTS == 1
   /* Framework objects */
   new EventManager(objects::EVENT_MANAGER);
@@ -44,7 +44,7 @@ void ObjectFactory::produceGenericObjects() {
   new VerificationReporter();
   auto *ccsdsDistrib = new CcsdsDistributor(apid::APID, objects::CCSDS_DISTRIBUTOR);
   new PusDistributor(apid::APID, objects::PUS_DISTRIBUTOR, ccsdsDistrib);
-  new TmFunnel(*stamperAndReader, objects::TM_FUNNEL);
+  *tmFunnel = new TmFunnel(*stamperAndReader, objects::TM_FUNNEL);
 #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
 
   /* PUS stack */
diff --git a/example/core/GenericFactory.h b/example/core/GenericFactory.h
index 3cf5d41..dfbfbf0 100644
--- a/example/core/GenericFactory.h
+++ b/example/core/GenericFactory.h
@@ -3,13 +3,15 @@
 
 #include <fsfw/objectmanager/SystemObjectIF.h>
 
+class TmFunnel;
+
 namespace ObjectFactory {
 
 /**
  * @brief   Produce hardware independant objects. Called by bsp specific
  *          object factory.
  */
-void produceGenericObjects();
+void produceGenericObjects(TmFunnel** funnel);
 
 }  // namespace ObjectFactory