diff --git a/inc/Services/EventActionService.hpp b/inc/Services/EventActionService.hpp
index c8052e0e29df10312356c7595a53b2547ef56afa..3ff36eb5fd3f3711bd9d2cd689701b976c2e3989 100644
--- a/inc/Services/EventActionService.hpp
+++ b/inc/Services/EventActionService.hpp
@@ -124,7 +124,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param message Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(const Message& message);
+	void execute(Message& message);
 };
 
 #endif // ECSS_SERVICES_EVENTACTIONSERVICE_HPP
diff --git a/inc/Services/EventReportService.hpp b/inc/Services/EventReportService.hpp
index 6aea19a538b69373f5a15e5322efa86188b55d9e..d1eac70f4c3f2e77feb895ea1c91e9cc71e13ea3 100644
--- a/inc/Services/EventReportService.hpp
+++ b/inc/Services/EventReportService.hpp
@@ -183,7 +183,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param param Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(const Message& message);
+	void execute(Message& message);
 };
 
 #endif // ECSS_SERVICES_EVENTREPORTSERVICE_HPP
diff --git a/inc/Services/MemoryManagementService.hpp b/inc/Services/MemoryManagementService.hpp
index 82b6454c0553cd57a384f3ec5d2eb62c3d825ad6..f61ebad717ed06dd868233268cb5516306f3b795 100644
--- a/inc/Services/MemoryManagementService.hpp
+++ b/inc/Services/MemoryManagementService.hpp
@@ -70,17 +70,17 @@ public:
 		 * @todo Only allow aligned memory address to be start addresses
 		 */
 		void checkRawData(Message &request);
-
-		/**
-		 * It is responsible to call the suitable function that executes a telecommand packet. The source of that packet
-		 * is the ground station.
-		 *
-		 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
-		 * @param param Contains the necessary parameters to call the suitable subservice
-		 */
-		void execute(Message& message);
 	} rawDataMemorySubservice;
 
+	/**
+	 * It is responsible to call the suitable function that executes a telecommand packet. The source of that packet
+	 * is the ground station.
+	 *
+	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
+	 * @param param Contains the necessary parameters to call the suitable subservice
+	 */
+	void execute(Message& message);
+
 private:
 	/**
 	 * Check whether the provided address is valid or not, based on the defined limit values
diff --git a/src/MessageParser.cpp b/src/MessageParser.cpp
index f0cbe00f9f804a762c6eda04f9fcf25b5f32ebdf..29300cdbf7c0b761f443c7ee189f6f59bfb4589b 100644
--- a/src/MessageParser.cpp
+++ b/src/MessageParser.cpp
@@ -12,7 +12,7 @@ void MessageParser::execute(Message& message) {
 			Services.eventReport.execute(message); // ST[05]
 			break;
 		case 6:
-			Services.memoryManagement.rawDataMemorySubservice.execute(message); // ST[06]
+			Services.memoryManagement.execute(message); // ST[06]
 			break;
 		case 8:
 			Services.functionManagement.execute(message); // ST[08]
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 8844e69581f3f4a59513723d6f98a6d9fb7ccc16..3d34d2982e79c4745158409a127d71343b5771d5 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -190,7 +190,7 @@ void EventActionService::executeAction(uint16_t eventID) {
 	}
 }
 
-void EventActionService::execute(const Message& message) {
+void EventActionService::execute(Message& message) {
 	switch (message.messageType) {
 		case 1:
 			addEventActionDefinitions(message); // TC[19,1]
diff --git a/src/Services/EventReportService.cpp b/src/Services/EventReportService.cpp
index 3e3a24fee74cee32028ab21391c53cbb63d5391e..cbf8ee72ae08d669e65537d6cd6d08314ef28c41 100644
--- a/src/Services/EventReportService.cpp
+++ b/src/Services/EventReportService.cpp
@@ -129,7 +129,7 @@ void EventReportService::listOfDisabledEventsReport() {
 	storeMessage(report);
 }
 
-void EventReportService::execute(const Message& message) {
+void EventReportService::execute(Message& message) {
 	switch (message.messageType) {
 		case 5: enableReportGeneration(message); // TC[5,5]
 			break;
diff --git a/src/Services/MemoryManagementService.cpp b/src/Services/MemoryManagementService.cpp
index 4afae414952f178986328df2fbf857bf2d0400f7..d592da573bbc7de0b99d86abcc02241b228afb84 100644
--- a/src/Services/MemoryManagementService.cpp
+++ b/src/Services/MemoryManagementService.cpp
@@ -221,16 +221,16 @@ inline bool MemoryManagementService::dataValidator(const uint8_t* data, uint16_t
 	return (checksum == CRCHelper::calculateCRC(data, length));
 }
 
-void MemoryManagementService::RawDataMemoryManagement::execute(Message& message) {
+void MemoryManagementService::execute(Message& message) {
 	switch (message.messageType) {
 		case 2:
-			loadRawData(message); // TC[6,2]
+			rawDataMemorySubservice.loadRawData(message); // TC[6,2]
 			break;
 		case 5:
-			dumpRawData(message); // TC[6,5]
+			rawDataMemorySubservice.dumpRawData(message); // TC[6,5]
 			break;
 		case 9:
-			checkRawData(message); // TC[6,9]
+			rawDataMemorySubservice.checkRawData(message); // TC[6,9]
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);