diff --git a/deps/spacepackets b/deps/spacepackets
index ac1d14e..da28596 160000
--- a/deps/spacepackets
+++ b/deps/spacepackets
@@ -1 +1 @@
-Subproject commit ac1d14ebf64fb6479e7c6cf26907bbf9e56d239e
+Subproject commit da2859688bc36ac258f0d75edbc2768761f34f31
diff --git a/deps/tmtccmd b/deps/tmtccmd
index e3343ef..87a430e 160000
--- a/deps/tmtccmd
+++ b/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit e3343ef96a75974239608ae9246804ff9273e3d9
+Subproject commit 87a430eb5cfea01d8265c3b327269799954c64ee
diff --git a/tmtcc.py b/tmtcc.py
index 16b122a..4144e1d 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import argparse
 import logging
 import sys
 import time
@@ -50,7 +51,8 @@ from tmtccmd.tc import (
 from tmtccmd.config import default_json_path, SetupWrapper
 from tmtccmd.config.args import (
     SetupParams,
-    ArgParserWrapper,
+    ArgParserWrapper, create_default_args_parser, add_default_com_if_arguments,
+    add_default_mode_arguments, add_generic_arguments, add_ethernet_arguments,
 )
 from config import __version__
 from config.definitions import PUS_APID
@@ -152,6 +154,9 @@ def setup_params() -> SetupWrapper:
     hook_obj = EiveHookObject(default_json_path())
     params = SetupParams()
     parser_wrapper = ArgParserWrapper(hook_obj)
+    parser_wrapper.create_default_parent_parser()
+    parser_wrapper.create_default_parser()
+    parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
     parser_wrapper.parse()
     tmtccmd.init_printout(parser_wrapper.use_gui)
     parser_wrapper.set_params(params)