diff --git a/pus_tc/acs.py b/pus_tc/acs.py
index 66f5ad6..4edd3bd 100644
--- a/pus_tc/acs.py
+++ b/pus_tc/acs.py
@@ -1,6 +1,7 @@
 import enum
 from tmtccmd.tc.definitions import TcQueueT
-from tmtccmd.pus.service_list import PusServices
+from spacepackets.ecss.definitions import PusServices
+
 from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
 from tmtccmd.tc.packer import PusTelecommand
 from config.object_ids import MGM_0_HANDLER_ID, MGM_1_HANDLER_ID, MGM_2_HANDLER_ID, MGM_3_HANDLER_ID
diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index 4eef894..3c11be7 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -8,7 +8,7 @@ from tmtccmd.config.definitions import CoreServiceList
 from tmtccmd.utility.logger import get_console_logger
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.tc.service_5_event import pack_generic_service5_test_into
-from tmtccmd.tc.service_17_test import pack_service17_ping_command
+from tmtccmd.pus.service_17_test import pack_service_17_ping_command
 
 from pus_tc.service_200_mode import pack_service200_test_into
 from pus_tc.p60dock import pack_p60dock_test_into
@@ -42,7 +42,7 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
     if service == CoreServiceList.SERVICE_5.value:
         return pack_generic_service5_test_into(tc_queue=service_queue)
     if service == CoreServiceList.SERVICE_17.value:
-        return service_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple())
+        return service_queue.appendleft(pack_service_17_ping_command(ssc=1700).pack_command_tuple())
     if service == CoreServiceList.SERVICE_200.value:
         return pack_service200_test_into(tc_queue=service_queue)
     if service == CustomServiceList.P60DOCK.value:
@@ -125,5 +125,5 @@ def create_total_tc_queue_user() -> TcQueueT:
         os.mkdir("log")
     tc_queue = deque()
     pack_generic_service5_test_into(tc_queue)
-    tc_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple())
+    tc_queue.appendleft(pack_service_17_ping_command(ssc=1700).pack_command_tuple())
     return tc_queue
diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 3e80940..646744f 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -7,10 +7,10 @@ from tmtccmd.tm.service_8_functional_cmd import Service8TM
 from spacepackets.ecss.tm import PusTelemetry
 from tmtccmd.utility.logger import get_console_logger
 
-from tmtccmd.tm.service_1_verification import Service1TM
+from tmtccmd.pus.service_1_verification import Service1TMExtended
+from tmtccmd.pus.service_17_test import Service17TMExtended
 from tmtccmd.tm.service_3_housekeeping import Service3TM
 from tmtccmd.tm.service_5_event import Service5TM
-from tmtccmd.tm.service_17_test import Service17TM
 from tmtccmd.utility.tmtc_printer import TmTcPrinter
 
 from config.definitions import PUS_APID
@@ -27,7 +27,7 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
     service_type = raw_tm_packet[7]
     tm_packet = None
     if service_type == 1:
-        tm_packet = Service1TM.unpack(raw_telemetry=raw_tm_packet)
+        tm_packet = Service1TMExtended.unpack(raw_telemetry=raw_tm_packet)
     if service_type == 3:
         tm_packet = Service3TM.unpack(raw_telemetry=raw_tm_packet, custom_hk_handling=False)
     if service_type == 5:
@@ -35,7 +35,7 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
     if service_type == 8:
         tm_packet = Service8TM.unpack(raw_telemetry=raw_tm_packet)
     if service_type == 17:
-        tm_packet = Service17TM.unpack(raw_telemetry=raw_tm_packet)
+        tm_packet = Service17TMExtended.unpack(raw_telemetry=raw_tm_packet)
     if tm_packet is None:
         LOGGER.info(f'The service {service_type} is not implemented in Telemetry Factory')
         tm_packet = PusTelemetry.unpack(raw_telemetry=raw_tm_packet)
diff --git a/spacepackets b/spacepackets
index 9d4752f..309f841 160000
--- a/spacepackets
+++ b/spacepackets
@@ -1 +1 @@
-Subproject commit 9d4752f238ddac5e0ef28b7c93e9f9b114fc17ec
+Subproject commit 309f841ce3e6f86ccbc799e6bf392ae1974e25e3
diff --git a/tmtccmd b/tmtccmd
index e1de131..b4316ce 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit e1de13164db171a10e4744e85bf798502a250a0d
+Subproject commit b4316ce352d77ba4f969f8c3350bd3b7b5d03260