diff --git a/mission/system/tree/comModeTree.cpp b/mission/system/tree/comModeTree.cpp
index ae407da5..2436bfa6 100644
--- a/mission/system/tree/comModeTree.cpp
+++ b/mission/system/tree/comModeTree.cpp
@@ -17,28 +17,31 @@ static const auto OFF = HasModesIF::MODE_OFF;
 static const auto ON = HasModesIF::MODE_ON;
 static const auto NML = DeviceHandlerIF::MODE_NORMAL;
 
-auto COM_SEQUENCE_RX_ONLY = std::make_pair(NML, FixedArrayList<ModeListEntry, 2>());
+auto COM_SEQUENCE_RX_ONLY =
+    std::make_pair(::com::Submode::RX_ONLY, FixedArrayList<ModeListEntry, 2>());
 auto COM_TABLE_RX_ONLY_TGT = std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 3>());
 auto COM_TABLE_RX_ONLY_TRANS_0 =
     std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
 auto COM_TABLE_RX_ONLY_TRANS_1 =
     std::make_pair((NML << 24) | 3, FixedArrayList<ModeListEntry, 3>());
 
-auto COM_SEQUENCE_RX_AND_TX_LOW_RATE = std::make_pair(NML, FixedArrayList<ModeListEntry, 2>());
+auto COM_SEQUENCE_RX_AND_TX_LOW_RATE =
+    std::make_pair(::com::Submode::RX_AND_TX_LOW_DATARATE, FixedArrayList<ModeListEntry, 2>());
 auto COM_TABLE_RX_AND_TX_LOW_RATE_TGT =
-    std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 1>());
+    std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 3>());
 auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_0 =
-    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
+    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
 auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_1 =
-    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
+    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
 
-auto COM_SEQUENCE_RX_AND_TX_HIGH_RATE = std::make_pair(NML, FixedArrayList<ModeListEntry, 2>());
+auto COM_SEQUENCE_RX_AND_TX_HIGH_RATE =
+    std::make_pair(::com::Submode::RX_AND_TX_HIGH_DATARATE, FixedArrayList<ModeListEntry, 2>());
 auto COM_TABLE_RX_AND_TX_HIGH_RATE_TGT =
-    std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 1>());
+    std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 3>());
 auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_0 =
-    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
+    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
 auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_1 =
-    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
+    std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
 
 namespace {
 void buildRxOnlySequence(Subsystem& ss, ModeListEntry& eh);
diff --git a/tmtc b/tmtc
index 8b6039e1..b7e6a797 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 8b6039e15d6e1653fd9128b7d2c7991e5bee9588
+Subproject commit b7e6a79704f2c2f91f046fc5fd69096f9d59cae5