diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 5e4c4fb5..3a4af81f 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -174,10 +174,13 @@ void ObjectFactory::produce(void* args) {
 #endif
 
 #if OBSW_ADD_PLOC_MPSOC == 1
-  UartCookie* plocMpsocCookie =
-      new UartCookie(objects::PLOC_MPSOC_HANDLER, q7s::UART_PLOC_MPSOC_DEV,
-                     UartModes::NON_CANONICAL, uart::PLOC_MPSOC_BAUD, mpsoc::MAX_REPLY_SIZE);
-  new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, plocMpsocCookie);
+	UartCookie* plocMpsocCookie = new UartCookie(objects::PLOC_MPSOC_HANDLER,
+			q7s::UART_PLOC_MPSOC_DEV, UartModes::NON_CANONICAL, uart::PLOC_MPSOC_BAUD,
+			mpsoc::MAX_REPLY_SIZE);
+	PlocMPSoCHelper* plocMpsocHelper = new PlocMPSoCHelper(objects::PLOC_MPSOC_HELPER);
+	PlocMPSoCHandler* plocMPSoCHandler = new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER,
+			objects::UART_COM_IF, plocMpsocCookie, plocMpsocHelper);
+	plocMPSoCHandler->setStartUpImmediately();
 #endif /* OBSW_ADD_PLOC_MPSOC == 1 */
 
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
diff --git a/generators/.run/events.run.xml b/generators/.run/events.run.xml
index 18f71033..766dc10a 100644
--- a/generators/.run/events.run.xml
+++ b/generators/.run/events.run.xml
@@ -6,9 +6,9 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="" />
+    <option name="SDK_HOME" value="C:\Users\EIVE_Reinraumrechner\AppData\Local\Programs\Python\Python39\python.exe" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
+    <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/generators/.run/objects.run.xml b/generators/.run/objects.run.xml
index 961b8ed9..f9f22e9a 100644
--- a/generators/.run/objects.run.xml
+++ b/generators/.run/objects.run.xml
@@ -6,9 +6,9 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="" />
+    <option name="SDK_HOME" value="C:\Users\EIVE_Reinraumrechner\AppData\Local\Programs\Python\Python39\python.exe" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
+    <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/generators/.run/returnvalues.run.xml b/generators/.run/returnvalues.run.xml
index 51b16449..b6c52356 100644
--- a/generators/.run/returnvalues.run.xml
+++ b/generators/.run/returnvalues.run.xml
@@ -6,9 +6,9 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="" />
+    <option name="SDK_HOME" value="C:\Users\EIVE_Reinraumrechner\AppData\Local\Programs\Python\Python39\python.exe" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
+    <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv
index 7101fd1c..c9dc36e4 100644
--- a/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
@@ -444,36 +444,6 @@
 0x1f07; CSB_InvalidReply;;7;fsfw\src\fsfw\tmtcservices\CommandingServiceBase.h;COMMAND_SERVICE_BASE
 0x4a00; SPPA_NoPacketFound;;0x00;fsfw\src\fsfw\tmtcservices\SpacePacketParser.h;SPACE_PACKET_PARSER
 0x4a01; SPPA_SplitPacket;;0x01;fsfw\src\fsfw\tmtcservices\SpacePacketParser.h;SPACE_PACKET_PARSER
-0x58c0;MPCMD_InvalidLength;Received command with invalid length;0xC0;bsp_q7s\devices\devicedefinitions\PlocMPSoCDefinitions.h;MPSOC_CMD
-0x58a0;MPCMD_CrcFailure;CRC check of received packet failed;0xA0;bsp_q7s\devices\devicedefinitions\PlocMPSoCDefinitions.h;MPSOC_CMD
-0x61a0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;0xA0;bsp_q7s\devices\ploc\PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
-0x61a1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;0xA1;bsp_q7s\devices\ploc\PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
-0x57a0;PLMP_CrcFailure;Space Packet received from PLOC has invalid CRC;0xA0;bsp_q7s\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a1;PLMP_ReceivedAckFailure;Received ACK failure reply from PLOC;0xA1;bsp_q7s\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a2;PLMP_ReceivedExeFailure;Received execution failure reply from PLOC;0xA2;bsp_q7s\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a3;PLMP_InvalidApid;Received space packet with invalid APID from PLOC;0xA3;bsp_q7s\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a4;PLMP_InvalidLength;Received command with invalid length;0xA4;bsp_q7s\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a5;PLMP_FilenameTooLong;Received command with invalid filename;0xA5;bsp_q7s\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a6;PLMP_MpsocHelperExecuting;MPSoC helper is currently executing a command;0xA6;bsp_q7s\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x5aa0;PLSV_CrcFailure;Space Packet received from PLOC supervisor has invalid CRC;0xA0;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa1;PLSV_ReceivedAckFailure;Received ACK failure reply from PLOC supervisor;0xA1;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa2;PLSV_ReceivedExeFailure;Received execution failure reply from PLOC supervisor;0xA2;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa3;PLSV_InvalidApid;Received space packet with invalid APID from PLOC supervisor;0xA3;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa4;PLSV_GetTimeFailure;Failed to read current system time;0xA4;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa5;PLSV_InvalidWatchdog;Received command with invalid watchdog parameter. Valid watchdogs are 0 for PS, 1 for PL and 2 for INT;0xA5;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa6;PLSV_InvalidWatchdogTimeout;Received watchdog timeout config command with invalid timeout. Valid timeouts must be in the range between 1000 and 360000 ms.;0xA6;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa7;PLSV_InvalidLatchupId;Received latchup config command with invalid latchup ID;0xA7;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa8;PLSV_SweepPeriodTooSmall;Received set adc sweep period command with invalid sweep period. Must be larger than 21.;0xA8;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aa9;PLSV_InvalidTestParam;Receive auto EM test command with invalid test param. Valid params are 1 and 2.;0xA9;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aaa;PLSV_MramPacketParsingFailure;Returned when scanning for MRAM dump packets failed.;0xAA;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aab;PLSV_InvalidMramAddresses;Returned when the start and stop addresses of the MRAM dump or MRAM  wipe commands are invalid (e.g. start address bigger than stop address);0xAB;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aac;PLSV_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;0xAC;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aad;PLSV_PathDoesNotExist;Path to PLOC directory on SD card does not exist;0xAD;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5aae;PLSV_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;0xAE;bsp_q7s\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5ea0;PLUD_UpdaterBusy;Updater is already performing an update;0xA0;bsp_q7s\devices\ploc\PlocUpdater.h;PLOC_UPDATER
-0x5ea1;PLUD_NameTooLong;Received update command with invalid path string (too long).;0xA1;bsp_q7s\devices\ploc\PlocUpdater.h;PLOC_UPDATER
-0x5ea2;PLUD_SdNotMounted;Received command to initiate update but SD card with update image not mounted.;0xA2;bsp_q7s\devices\ploc\PlocUpdater.h;PLOC_UPDATER
-0x5ea3;PLUD_FileNotExists;Update file received with update command does not exist.;0xA3;bsp_q7s\devices\ploc\PlocUpdater.h;PLOC_UPDATER
 0x67a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;0xA0;bsp_q7s\memory\FilesystemHelper.h;FILE_SYSTEM_HELPER
 0x67a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;bsp_q7s\memory\FilesystemHelper.h;FILE_SYSTEM_HELPER
 0x7100; SCBU_KeyNotFound;;0;bsp_q7s\memory\scratchApi.h;SCRATCH_BUFFER
@@ -487,6 +457,36 @@
 0x700d; SDMA_UnmountError;;13;bsp_q7s\memory\SdCardManager.h;SD_CARD_MANAGER
 0x700e; SDMA_SystemCallError;;14;bsp_q7s\memory\SdCardManager.h;SD_CARD_MANAGER
 0x700f; SDMA_PopenCallError;;15;bsp_q7s\memory\SdCardManager.h;SD_CARD_MANAGER
+0x58c0;MPCMD_InvalidLength;Received command with invalid length;0xC0;linux\devices\devicedefinitions\PlocMPSoCDefinitions.h;MPSOC_CMD
+0x58a0;MPCMD_CrcFailure;CRC check of received packet failed;0xA0;linux\devices\devicedefinitions\PlocMPSoCDefinitions.h;MPSOC_CMD
+0x61a0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;0xA0;linux\devices\ploc\PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
+0x61a1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;0xA1;linux\devices\ploc\PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
+0x57a0;PLMP_CrcFailure;Space Packet received from PLOC has invalid CRC;0xA0;linux\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
+0x57a1;PLMP_ReceivedAckFailure;Received ACK failure reply from PLOC;0xA1;linux\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
+0x57a2;PLMP_ReceivedExeFailure;Received execution failure reply from PLOC;0xA2;linux\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
+0x57a3;PLMP_InvalidApid;Received space packet with invalid APID from PLOC;0xA3;linux\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
+0x57a4;PLMP_InvalidLength;Received command with invalid length;0xA4;linux\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
+0x57a5;PLMP_FilenameTooLong;Received command with invalid filename;0xA5;linux\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
+0x57a6;PLMP_MpsocHelperExecuting;MPSoC helper is currently executing a command;0xA6;linux\devices\ploc\PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
+0x5aa0;PLSV_CrcFailure;Space Packet received from PLOC supervisor has invalid CRC;0xA0;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa1;PLSV_ReceivedAckFailure;Received ACK failure reply from PLOC supervisor;0xA1;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa2;PLSV_ReceivedExeFailure;Received execution failure reply from PLOC supervisor;0xA2;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa3;PLSV_InvalidApid;Received space packet with invalid APID from PLOC supervisor;0xA3;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa4;PLSV_GetTimeFailure;Failed to read current system time;0xA4;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa5;PLSV_InvalidWatchdog;Received command with invalid watchdog parameter. Valid watchdogs are 0 for PS, 1 for PL and 2 for INT;0xA5;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa6;PLSV_InvalidWatchdogTimeout;Received watchdog timeout config command with invalid timeout. Valid timeouts must be in the range between 1000 and 360000 ms.;0xA6;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa7;PLSV_InvalidLatchupId;Received latchup config command with invalid latchup ID;0xA7;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa8;PLSV_SweepPeriodTooSmall;Received set adc sweep period command with invalid sweep period. Must be larger than 21.;0xA8;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aa9;PLSV_InvalidTestParam;Receive auto EM test command with invalid test param. Valid params are 1 and 2.;0xA9;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aaa;PLSV_MramPacketParsingFailure;Returned when scanning for MRAM dump packets failed.;0xAA;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aab;PLSV_InvalidMramAddresses;Returned when the start and stop addresses of the MRAM dump or MRAM  wipe commands are invalid (e.g. start address bigger than stop address);0xAB;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aac;PLSV_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;0xAC;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aad;PLSV_PathDoesNotExist;Path to PLOC directory on SD card does not exist;0xAD;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5aae;PLSV_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;0xAE;linux\devices\ploc\PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x5ea0;PLUD_UpdaterBusy;Updater is already performing an update;0xA0;linux\devices\ploc\PlocUpdater.h;PLOC_UPDATER
+0x5ea1;PLUD_NameTooLong;Received update command with invalid path string (too long).;0xA1;linux\devices\ploc\PlocUpdater.h;PLOC_UPDATER
+0x5ea2;PLUD_SdNotMounted;Received command to initiate update but SD card with update image not mounted.;0xA2;linux\devices\ploc\PlocUpdater.h;PLOC_UPDATER
+0x5ea3;PLUD_FileNotExists;Update file received with update command does not exist.;0xA3;linux\devices\ploc\PlocUpdater.h;PLOC_UPDATER
 0x56a0;STRH_TemperatureReqFailed;Status in temperature reply signals error;0xA0;linux\devices\startracker\StarTrackerHandler.h;STR_HANDLER
 0x56a1;STRH_PingFailed;Ping command failed;0xA1;linux\devices\startracker\StarTrackerHandler.h;STR_HANDLER
 0x56a2;STRH_VersionReqFailed;Status in version reply signals error;0xA2;linux\devices\startracker\StarTrackerHandler.h;STR_HANDLER
diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp
index df3cafe1..a61c1e84 100644
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 114 translations.
- * Generated on: 2022-03-17 14:31:48
+ * Generated on: 2022-03-18 09:02:11
  */
 #include "translateObjects.h"
 
diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
index df3cafe1..a61c1e84 100644
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 114 translations.
- * Generated on: 2022-03-17 14:31:48
+ * Generated on: 2022-03-18 09:02:11
  */
 #include "translateObjects.h"