diff --git a/message_definitions/pyxis.xml b/message_definitions/pyxis.xml
index a2b0c9507599f0203f240a6eb6a93480dbd11e27..a76b0de3296b6ffd6dd16908905a1de27a3629fa 100644
--- a/message_definitions/pyxis.xml
+++ b/message_definitions/pyxis.xml
@@ -280,20 +280,23 @@
         <message id="200" name="SYS_TM">
             <description>System status telemetry</description>
             <field name="timestamp" type="uint64_t" units="ms">Timestamp</field>
-            <field name="death_stack" type="uint8_t"></field>
-            <field name="logger" type="uint8_t"></field>
-            <field name="ev_broker" type="uint8_t"></field>
-            <field name="pin_obs" type="uint8_t"></field>
-            <field name="radio" type="uint8_t"></field>
-            <field name="state_machines" type="uint8_t"></field>
-            <field name="sensors" type="uint8_t"></field>
+            <field name="logger" type="uint8_t">True if the logger started correctly</field>
+            <field name="event_broker" type="uint8_t">True if the event broker started correctly</field>
+            <field name="radio" type="uint8_t">True if the radio started correctly</field>
+            <field name="pin_observer" type="uint8_t">True if the pin observer started correctly</field>
+            <field name="sensors" type="uint8_t">True if the sensors started correctly</field>
+            <field name="board_scheduler" type="uint8_t">True if the board scheduler is running</field>
         </message>
         <message id="201" name="FSM_TM">
-            <!-- SAME FOR ROCKET AND PAYLOAD BUT ONE SET SHOULD CONTAIN THE OTHER-->
-            <!-- TODO: ADD ALL FSM STATES -->
+            <!-- SAME FOR ROCKET AND PAYLOAD BUT ONE SET SHOULD CONTAIN THE OTHER -->
             <description>Flight State Machine status telemetry</description>
             <field name="timestamp" type="uint64_t" units="ms">Timestamp</field>
-            <field name="fmm_state" type="uint8_t">FMM State</field>
+            <field name="ada_state" type="uint8_t">Apogee Detection Algorithm state</field>
+            <field name="abk_state" type="uint8_t">AirBrakes state</field>
+            <field name="dpl_state" type="uint8_t">Deployment state</field>
+            <field name="fmm_state" type="uint8_t">Flight Mode Manager state</field>
+            <field name="fsr_state" type="uint8_t">Flight Stats Recorder state</field>
+            <field name="nas_state" type="uint8_t">Navigation and Attitude State state</field>
         </message>
         <message id="202" name="PIN_OBS_TM">
             <!-- PAYLOAD USES ONE PIN ONLY -->
@@ -319,7 +322,7 @@
             <field name="buffers_filled" type="int32_t">Number of buffers filled</field>
             <field name="buffers_written" type="int32_t">Number of buffers written to disk</field>
             <field name="writes_failed" type="int32_t">Number of fwrite() that failed</field>
-            <field name="writesfailed" type="int32_t">Error of the last fwrite() that failed</field>
+            <field name="last_write_error" type="int32_t">Error of the last fwrite() that failed</field>
             <field name="average_write_time" type="int32_t">Average time to perform an fwrite() of a buffer</field>
             <field name="max_write_time" type="int32_t">Max time to perform an fwrite() of a buffer</field>
         </message>