diff --git a/satrs-core/Cargo.toml b/satrs-core/Cargo.toml
index 64483e1..29d4122 100644
--- a/satrs-core/Cargo.toml
+++ b/satrs-core/Cargo.toml
@@ -64,7 +64,7 @@ optional = true
 # version = "0.6"
 # path = "../spacepackets"
 git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
-rev = "3c8f9f9f07cf"
+rev = "62df510147b"
 default-features = false
 
 [dev-dependencies]
diff --git a/satrs-core/src/pus/mod.rs b/satrs-core/src/pus/mod.rs
index f44a12a..bb0cd17 100644
--- a/satrs-core/src/pus/mod.rs
+++ b/satrs-core/src/pus/mod.rs
@@ -658,7 +658,7 @@ pub(crate) mod tests {
     impl CommonTmInfo {
         pub fn new_from_tm(tm: &PusTmCreator) -> Self {
             let mut time_stamp = [0; 7];
-            time_stamp.clone_from_slice(&tm.timestamp().unwrap()[0..7]);
+            time_stamp.clone_from_slice(&tm.timestamp()[0..7]);
             Self {
                 subservice: tm.subservice(),
                 apid: tm.apid(),
diff --git a/satrs-core/src/pus/verification.rs b/satrs-core/src/pus/verification.rs
index 0e81849..6d7cd18 100644
--- a/satrs-core/src/pus/verification.rs
+++ b/satrs-core/src/pus/verification.rs
@@ -1327,7 +1327,7 @@ mod tests {
     use alloc::boxed::Box;
     use alloc::format;
     use spacepackets::ecss::tc::{PusTcCreator, PusTcSecondaryHeader};
-    use spacepackets::ecss::tm::PusTm;
+    use spacepackets::ecss::tm::PusTmReader;
     use spacepackets::ecss::{EcssEnumU16, EcssEnumU32, EcssEnumU8, PusError, PusPacket};
     use spacepackets::util::UnsignedEnum;
     use spacepackets::{ByteConversionError, CcsdsPacket, SpHeader};
@@ -1376,7 +1376,7 @@ mod tests {
                     assert_eq!(PusPacket::service(&tm), 1);
                     assert!(!tm.source_data().is_empty());
                     let mut time_stamp = [0; 7];
-                    time_stamp.clone_from_slice(&tm.timestamp().unwrap()[0..7]);
+                    time_stamp.clone_from_slice(&tm.timestamp()[0..7]);
                     let src_data = tm.source_data();
                     assert!(src_data.len() >= 4);
                     let req_id =
@@ -2181,7 +2181,7 @@ mod tests {
                 tm_buf[0..tm_len].copy_from_slice(slice);
             }
             let (pus_tm, _) =
-                PusTm::from_bytes(&tm_buf[0..tm_len], 7).expect("Error reading verification TM");
+                PusTmReader::new(&tm_buf[0..tm_len], 7).expect("Error reading verification TM");
             if packet_idx == 0 {
                 assert_eq!(pus_tm.subservice(), 1);
                 assert_eq!(pus_tm.sp_header.seq_count(), 0);
diff --git a/satrs-core/tests/pus_events.rs b/satrs-core/tests/pus_events.rs
index d3c32f8..743d275 100644
--- a/satrs-core/tests/pus_events.rs
+++ b/satrs-core/tests/pus_events.rs
@@ -8,7 +8,7 @@ use satrs_core::pus::event_man::{
     DefaultPusMgmtBackendProvider, EventReporter, PusEventDispatcher,
 };
 use satrs_core::pus::MpscTmAsVecSender;
-use spacepackets::ecss::tm::PusTm;
+use spacepackets::ecss::tm::PusTmReader;
 use spacepackets::ecss::{PusError, PusPacket};
 use std::sync::mpsc::{channel, SendError, TryRecvError};
 use std::thread;
@@ -103,7 +103,7 @@ fn test_threaded_usage() {
                 // Event TM received successfully
                 Ok(event_tm) => {
                     let tm =
-                        PusTm::from_bytes(event_tm.as_slice(), 7).expect("Deserializing TM failed");
+                        PusTmReader::new(event_tm.as_slice(), 7).expect("Deserializing TM failed");
                     assert_eq!(tm.0.service(), 5);
                     assert_eq!(tm.0.subservice(), 1);
                     let src_data = tm.0.source_data();
@@ -132,7 +132,7 @@ fn test_threaded_usage() {
                 // Event TM received successfully
                 Ok(event_tm) => {
                     let tm =
-                        PusTm::from_bytes(event_tm.as_slice(), 7).expect("Deserializing TM failed");
+                        PusTmReader::new(event_tm.as_slice(), 7).expect("Deserializing TM failed");
                     assert_eq!(tm.0.service(), 5);
                     assert_eq!(tm.0.subservice(), 2);
                     let src_data = tm.0.source_data();
diff --git a/satrs-core/tests/pus_verification.rs b/satrs-core/tests/pus_verification.rs
index 16b6b01..443ba89 100644
--- a/satrs-core/tests/pus_verification.rs
+++ b/satrs-core/tests/pus_verification.rs
@@ -9,8 +9,8 @@ pub mod crossbeam_test {
     };
     use satrs_core::pus::MpscTmInStoreSender;
     use satrs_core::tmtc::tm_helper::SharedTmStore;
-    use spacepackets::ecss::tc::{PusTc, PusTcCreator, PusTcSecondaryHeader};
-    use spacepackets::ecss::tm::PusTm;
+    use spacepackets::ecss::tc::{PusTcCreator, PusTcReader, PusTcSecondaryHeader};
+    use spacepackets::ecss::tm::PusTmReader;
     use spacepackets::ecss::{EcssEnumU16, EcssEnumU8, PusPacket, SerializablePusPacket};
     use spacepackets::SpHeader;
     use std::sync::{mpsc, Arc, RwLock};
@@ -82,7 +82,7 @@ pub mod crossbeam_test {
                 tc_len = buf.len();
                 tc_buf[0..tc_len].copy_from_slice(buf);
             }
-            let (_tc, _) = PusTc::from_bytes(&tc_buf[0..tc_len]).unwrap();
+            let (_tc, _) = PusTcReader::new(&tc_buf[0..tc_len]).unwrap();
             let accepted_token;
 
             let token = reporter_with_sender_0.add_tc_with_req_id(req_id_0);
@@ -122,7 +122,7 @@ pub mod crossbeam_test {
                 tc_len = buf.len();
                 tc_buf[0..tc_len].copy_from_slice(buf);
             }
-            let (tc, _) = PusTc::from_bytes(&tc_buf[0..tc_len]).unwrap();
+            let (tc, _) = PusTcReader::new(&tc_buf[0..tc_len]).unwrap();
             let token = reporter_with_sender_1.add_tc(&tc);
             let accepted_token = reporter_with_sender_1
                 .acceptance_success(token, Some(&FIXED_STAMP))
@@ -154,8 +154,8 @@ pub mod crossbeam_test {
                     tm_len = slice.len();
                     tm_buf[0..tm_len].copy_from_slice(slice);
                 }
-                let (pus_tm, _) = PusTm::from_bytes(&tm_buf[0..tm_len], 7)
-                    .expect("Error reading verification TM");
+                let (pus_tm, _) =
+                    PusTmReader::new(&tm_buf[0..tm_len], 7).expect("Error reading verification TM");
                 let req_id =
                     RequestId::from_bytes(&pus_tm.source_data()[0..RequestId::SIZE_AS_BYTES])
                         .expect("reading request ID from PUS TM source data failed");