diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7158096d821c0a7cba9a41f2b64f825d9d9e9fd1..4eb801d7f13dc608f975d87d05ecd87389f2656d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -102,6 +102,7 @@
         "Alain",
         "Alessandro",
         "Axisf",
+        "baro",
         "Baro",
         "Benedetti",
         "Benini",
@@ -161,6 +162,7 @@
         "Kalman",
         "KBPS",
         "leds",
+        "logdecoder",
         "LSBFIRST",
         "Luca",
         "magbx",
@@ -174,6 +176,7 @@
         "miosix",
         "MODER",
         "mosi",
+        "MOSI",
         "Mozzarelli",
         "MPXH",
         "MPXHZ",
@@ -189,6 +192,7 @@
         "PCLK",
         "Piazzolla",
         "pinhandler",
+        "pinouts",
         "PITOT",
         "prescaler",
         "PUPDR",
@@ -236,6 +240,7 @@
         "TRAS",
         "trasfer",
         "TRCD",
+        "tscpp",
         "TSCPP",
         "tsens",
         "Tweakable",
@@ -255,38 +260,12 @@
         "VREF",
         "vsupply",
         "Waddress",
+        "wingalgo",
+        "wingctrl",
         "withcorrection",
         "Wmaybe",
         "Xbee",
-        "XRAM",
-        "Aeroutils",
-        "baro",
-        "Boardcore",
-        "Eigen",
-        "Erbetta",
-        "Gpio",
-        "GPIOA",
-        "GPIOB",
-        "GPIOC",
-        "GPIOD",
-        "GPIOF",
-        "GPIOG",
-        "leds",
-        "Luca",
-        "Matteo",
-        "Mavlink",
-        "miosix",
-        "MOSI",
-        "Nidasio",
-        "pinouts",
-        "Terraneo",
-        "tmrepo",
-        "tscpp",
-        "Ublox",
-        "UBXGPS",
-        "usart",
-        "wingalgo",
-        "wingctrl"
+        "XRAM"
     ],
     "C_Cpp.errorSquiggles": "Enabled"
-}
\ No newline at end of file
+}
diff --git a/scripts/logdecoder/logdecoder.cpp b/scripts/logdecoder/logdecoder.cpp
index 1edf5fe55bad313be086f6ecbcd3ff1204b8c084..3739860392b73c625bd0c7a06d374d2d7d824a65 100644
--- a/scripts/logdecoder/logdecoder.cpp
+++ b/scripts/logdecoder/logdecoder.cpp
@@ -20,7 +20,12 @@
  * THE SOFTWARE.
  */
 
-#include <Main/Sensors/Pitot/PitotData.h>
+#include <Main/StateMachines/ADAController/ADAControllerData.h>
+#include <Main/StateMachines/AirBrakesController/AirBrakesControllerData.h>
+#include <Main/StateMachines/Deployment/DeploymentData.h>
+#include <Main/StateMachines/FlightModeManager/FlightModeManagerData.h>
+#include <Main/StateMachines/FlightStatsRecorder/FlightStatsRecorderData.h>
+#include <Main/StateMachines/NASController/NASControllerData.h>
 #include <logger/Deserializer.h>
 #include <logger/LogTypes.h>
 #include <tscpp/stream.h>
@@ -42,6 +47,7 @@
 
 using namespace tscpp;
 using namespace Boardcore;
+using namespace Main;
 
 void registerTypes(Deserializer& ds)
 {
@@ -49,7 +55,14 @@ void registerTypes(Deserializer& ds)
     LogTypes::registerTypes(ds);
 
     // Custom types
-    ds.registerType<PitotData>();
+    ds.registerType<ADAControllerStatus>();
+    ds.registerType<ApogeeEvent>();
+    ds.registerType<DeploymentEvent>();
+    ds.registerType<AirBrakesControllerStatus>();
+    ds.registerType<DeploymentStatus>();
+    ds.registerType<FlightModeManagerStatus>();
+    ds.registerType<FlightStatsRecorderStatus>();
+    ds.registerType<NASControllerStatus>();
 }
 
 void showUsage(const string& cmdName)
diff --git a/skyward-boardcore b/skyward-boardcore
index 742c33a82257e5732115d5c3b9b35fb326fcc2af..35aa033c7459c19c5cde4a0bd02a6130c924d446 160000
--- a/skyward-boardcore
+++ b/skyward-boardcore
@@ -1 +1 @@
-Subproject commit 742c33a82257e5732115d5c3b9b35fb326fcc2af
+Subproject commit 35aa033c7459c19c5cde4a0bd02a6130c924d446
diff --git a/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp b/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp
index 60523af3f0c0213bb944af998aed00043339315b..8e02fb85a5271fe62f468247a638caef8205a2de 100644
--- a/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp
+++ b/src/boards/Main/StateMachines/AirBrakesController/AirBrakesController.cpp
@@ -183,7 +183,7 @@ void AirBrakesController::logStatus(AirBrakesControllerState state)
     status.timestamp = TimestampTimer::getTimestamp();
     status.state     = state;
 
-    Logger::getInstance().log(state);
+    Logger::getInstance().log(status);
 }
 
 void AirBrakesController::wiggleServo()
diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp b/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
index 95d3f1ad1c5b1ab0dcc949a552a71acc39e73dcc..0930276b529408c528e0221b84da4a574ff2833f 100644
--- a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
+++ b/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
@@ -387,7 +387,7 @@ void FlightModeManager::logStatus(FlightModeManagerState state)
     status.timestamp = TimestampTimer::getTimestamp();
     status.state     = state;
 
-    Logger::getInstance().log(state);
+    Logger::getInstance().log(status);
 }
 
 }  // namespace Main
diff --git a/src/boards/Main/StateMachines/NASController/NASController.cpp b/src/boards/Main/StateMachines/NASController/NASController.cpp
index 2fab4b3dc5474ed7962f5e64eaa01a6f128e3a60..c77273ccd46caaef0463ff7aa98e2b9ceee1ec2f 100644
--- a/src/boards/Main/StateMachines/NASController/NASController.cpp
+++ b/src/boards/Main/StateMachines/NASController/NASController.cpp
@@ -159,7 +159,7 @@ void NASController::logStatus(NASControllerState state)
     status.timestamp = TimestampTimer::getTimestamp();
     status.state     = state;
 
-    Logger::getInstance().log(state);
+    Logger::getInstance().log(status);
 }
 
 NASController::NASController()
diff --git a/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp b/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp
index 4805fd38ee9cf1c612e836e98afac4cdcbb91eeb..8cb1511a4492dcacd6060f93eda33abed53b417d 100644
--- a/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp
+++ b/src/boards/Parafoil/FlightModeManager/FlightModeManager.cpp
@@ -94,7 +94,7 @@ void FlightModeManager::logStatus(FlightModeManagerState state)
     status.timestamp = TimestampTimer::getTimestamp();
     status.state     = state;
 
-    Logger::getInstance().log(state);
+    Logger::getInstance().log(status);
 }
 
 }  // namespace Parafoil