diff --git a/fsfw_hal b/fsfw_hal
index 4f825a10..c0287eb4 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit 4f825a10cd886dd3b1814bbb952f657da45fd961
+Subproject commit c0287eb4a64ec92a3f068a88c7090d3eae0f5e99
diff --git a/mission/devices/GPSHandler.cpp b/mission/devices/GPSHandler.cpp
index 2264a833..da8f4ff3 100644
--- a/mission/devices/GPSHandler.cpp
+++ b/mission/devices/GPSHandler.cpp
@@ -1,4 +1,5 @@
 #include "GPSHandler.h"
+#include "devicedefinitions/GPSDefinitions.h"
 
 GPSHandler::GPSHandler(object_id_t objectId, object_id_t deviceCommunication,
 		CookieIF *comCookie):
@@ -62,9 +63,10 @@ ReturnValue_t GPSHandler::initializeLocalDataPool(
 }
 
 void GPSHandler::fillCommandAndReplyMap() {
-
+    // Reply length does not matter, packets should always arrive periodically
+    insertInReplyMap(GpsHyperion::GPS_REPLY, 4, nullptr, 0, true);
 }
 
 void GPSHandler::modeChanged() {
-
+    internalState = InternalStates::NONE;
 }
diff --git a/mission/devices/devicedefinitions/GPSDefinitions.h b/mission/devices/devicedefinitions/GPSDefinitions.h
new file mode 100644
index 00000000..cb3cfd1a
--- /dev/null
+++ b/mission/devices/devicedefinitions/GPSDefinitions.h
@@ -0,0 +1,21 @@
+#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
+#define MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
+
+#include <fsfw/devicehandlers/DeviceHandlerIF.h>
+
+namespace GpsHyperion {
+
+static constexpr DeviceCommandId_t GPS_REPLY = 0;
+
+enum GpsPoolIds: lp_id_t {
+
+};
+
+}
+
+class GpsPrimaryDataset: public StaticLocalDataSet<5> {
+public:
+private:
+};
+
+#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ */