diff --git a/inc/Services/TimeBasedSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp
index 77baac0e9a4f8096d01472f6eb4e0d14d4a16b13..8b18663c96c344f826d65efbaed5eadf367eb0d8 100644
--- a/inc/Services/TimeBasedSchedulingService.hpp
+++ b/inc/Services/TimeBasedSchedulingService.hpp
@@ -4,8 +4,10 @@
 #include <iostream>
 #include "etl/vector.h"
 #include "Service.hpp"
-#include "Helpers/CRCHelper.hpp"
 #include "ErrorHandler.hpp"
+#include "MessageParser.hpp"
+#include "Helpers/CRCHelper.hpp"
+#include "Helpers/TimeHelper.hpp"
 
 // Define whether groups and/or sub-schedules are in use
 #define GROUPS_ENABLED          0
@@ -25,12 +27,12 @@ private:
 
 	// Hold the data for the scheduled activity definition
 	struct ScheduledActivity {
-		//Message request; // Hold the received command request
+		Message request; // Hold the received command request
 		uint32_t requestReleaseTime = 0; // Keep the command release time
 		// todo: If we decide to use sub-schedules, the ID of that has to be defined
 		// todo: If groups are used, then the group ID has to be defined here
 	};
-	std::vector<ScheduledActivity> scheduledActivities; // Scheduled activity definitions
+	etl::vector<ScheduledActivity, MAX_NUMBER_OF_ACTIVITIES> scheduledActivities; // Scheduled activity definitions
 
 
 public: