move semantics

2023-03-13 13:29:16 +01:00
193 changed files with 1304 additions and 3735 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
 # PyCharm and CLion
-.idea/*
+/.idea/*
 !/.idea/runConfigurations
 !/.idea/cmake.xml
 !/.idea/codeStyles
--- a/.idea/cmake.xml
+++ b/.idea/cmake.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeSharedSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug Test" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_OSAL=host -DFSFW_BUILD_TESTS=ON" NO_GENERATOR="true" />
-    </configurations>
-  </component>
-</project>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,55 +8,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

 # [unreleased]

-## Fixes
-
- The `PusTmCreator` API only accepted 255 bytes of source data. It can now accept source
-  data with a size limited only by the size of `size_t`.
- Important bugfix in CFDP PDU header format: The entity length field and the transaction sequence
-  number fields stored the actual length of the field instead of the length minus 1 like specified
-  in the CFDP standard.
- PUS Health Service: Size check for set health command.
-  Perform operation completion for announce health command.
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/746
- Linux OSAL `getUptime` fix: Check validity of `/proc/uptime` file before reading uptime.
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/745
- Small tweak for version getter
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/744
-
-## Added
-
- add CFDP subsystem ID
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/742
- `PusTmZcWriter` now exposes API to set message counter field.
- Relative timeshift in the PUS time service.
-
-## Changed
-
- The PUS time service now dumps the time before setting a new time and after having set the
-  time.
- HK generation is now countdown based.
- Bump ETL version to 20.35.14
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/748
- Renamed `PCDU_2` subsystem ID to `POWER_SWITCH_IF`.
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/743
- Add new `PowerSwitchIF::SWITCH_UNKNOWN` returnvalue.
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/743
- Assert that `FixedArrayList` is larger than 0 at compile time.
-  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/740
- Health functions are virtual now.
- PUS Service Base request queue depth and maximum number of handled packets per cycle is now
-  configurable.
-
-# [v6.0.0] 2023-02-10
+# [v6.0.0]

 ## Fixes

- Mode Service: Add allowed subservice
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/739
+- Add monotonic watchdog Clock API and use it in `Countdown` and `Stopwatch` class.
+- Bugfix in `Service11TelecommandScheduling` which allowed commands
+  time tagged in the past to be inserted.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/738
 - `CService200ModeManagement`: Various bugfixes which lead to now execution complete being generated
  on mode announcements, duplicate mode reply generated on announce commands, and the mode read
  subservice not working properly.
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/736
 - Memory leak fixes for the TCP/IP TMTC bridge.
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/737
 - `Service9TimeManagement`: Fix the time dump at the `SET_TIME` subservice: Include clock timeval
@ -65,20 +27,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - HAL MGM3100 Handler: Use axis specific gain/scaling factors. Previously,
  only the X scaling factor was used.
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/724
- HAL MGM3100 Handler: Z value was previously calculated with bytes of the X value.
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/733
+- Bugfix for RM3100 MGM sensors. Z value was previously calculated
+  with bytes of the X value.
 - DHB `setNormalDatapoolEntriesInvalid`: The default implementation did not set the validity
  to false correctly because the `read` and `write` calls were missing.
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/728
 - PUS TMTC creator module: Sequence flags were set to continuation segment (0b00) instead
  of the correct unsegmented flags (0b11) as specified in the standard.
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/727
 - TC Scheduler Service 11: Add size and CRC check for contained TC.
-  Bug: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/issues/719
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/720
 - Only delete health table entry in `HealthHelper` destructor if
  health table was set.
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/710
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/710/files
 - I2C Bugfixes: Do not keep iterator as member and fix some incorrect handling with the iterator.
  Also properly reset the reply size for successfull transfers and erroneous transfers.
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/700
@ -88,36 +46,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `TcpTmTcServer.cpp`: The server was actually not able to handle
  CCSDS packets which were clumped together. This has been fixed now.
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/673
- `CServiceHealthCommanding`: Add announce all health info implementation
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/725
- various fixes related to linux Unittests and memory leaks
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/715
- small fix to allow teardown handling
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/713
- fix compiler warning for fixed array list copy ctor
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/704
- missing include
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/703
- defaultconfig did not build anymore
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/702
- hotfix
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/699
- small fix for helper
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/698
- missing retval conv
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/697
- DHB Countdown Bug
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/693
- doc corrections
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/687
- better error printout
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/686
- include correction
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/683
- better warning for missing include paths
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/676
- Service 11 regression
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/670

 ## Added

@ -136,36 +64,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/709
 - Add new `UnsignedByteField` class
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/660
- publish documentation for development and master branch
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/681
- Add Linux HAL options
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/663
- Expand SerializeIF
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/656
- PUS Service 11: Additional Safety Check
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/666
- improvements for auto-formatter script
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/665
- provide a weak print char impl
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/674
-
-## Removed
-
- now that doc server is up, remove markdown files
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/688
- remove bsp specific code
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/679

 ## Changes

 - `CService201HealthCommanding` renamed to `CServiceHealthCommanding`,
  service ID customizable now. `CServiceHealthCommanding` expects configuration struct
  `HealthServiceCfg` now
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/725
+  PR: https://egit.irs.uni-stuttgart.de/eive/fsfw/pulls/122
 - `AcceptsTelemetryIF`: `getReportReceptionQueue` is const now
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/712
 - Moved some container returnvalues to dedicated header and namespace
-  so they can be used without template specification.
+  to they can be used without template specification.
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/707
 - Remove default secondary header argument for
  `uint16_t getTcSpacePacketIdFromApid(uint16_t apid, bool secondaryHeaderFlag)` and
@ -195,41 +104,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `DeviceHandlerBase`: New signature of `handleDeviceTm` which expects
  a `const SerializeIF&` and additional helper variant which expects `const uint8_t*`
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/671
+- Move some generic `StorageManagerIF` implementations from `LocalPool` to
+  interface itself so it can be re-used more easily. Also add new
+  abstract function `bool hasDataAtId(store_address_t storeId) const`.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/685
 - Improvements for `AcceptsTelemetryIF` and `AcceptsTelecommandsIF`:
  - Make functions `const` where it makes sense
  - Add `const char* getName const` abstract function
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/684
- Generic TMTC Bridge Update
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/734
- comment tweak to event parser can read everything
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/732
- CMakeLists file updates
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/731
- improve srv20 error messages
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/723
- I2C Linux: remove duplicate printout
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/718
- printout handling improvements
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/717
- vec getter, reset for content
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/716
- updates for source sequence counter
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/714
- SP reader getPacketData is const now
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/708
- refactoring of serial drivers for linux
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/705
- Local Pool Update Remove Add Data Ignore Fault Argument
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/701
- Switch to new documentation server
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/694
- Windows Tweaks
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/691
- Refactor Local Pool API
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/667
- group MGM data in local pool vectors
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/664
-
+- Move some generic `StorageManagerIF` implementations from `LocalPool` to
+  interface itself so it can be re-used more easily. Also add new
+  abstract function `bool hasDataAtId(store_address_t storeId) const`.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/685

 ## CFDP

@ -249,7 +135,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     implementation without an extra component
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/682

-# [v5.0.0] 2022-07-25
+## HAL
+
+- SPI: Cache the SPI device in the communication interface. Architecturally, this makes a
+  lot more sense because each ComIF should be responsible for one SPI bus.
+- SPI: Move the empty transfer to update the line polarity to separate function. This means
+  it is not automatically called when calling the setter function for SPI speed and mode.
+  The user should call this function after locking the CS mutex if multiple SPI devices with
+  differing speeds and modes are attached to one bus.
+- SPI: Getter functions for SPI speed and mode.
+
+# [v5.0.0] 25.07.2022

 ## Changes

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH
 # Version file handling  #
 # ##############################################################################

-set(FSFW_VERSION_IF_GIT_FAILS 6)
+set(FSFW_VERSION_IF_GIT_FAILS 5)
 set(FSFW_SUBVERSION_IF_GIT_FAILS 0)
 set(FSFW_REVISION_IF_GIT_FAILS 0)

@ -72,7 +72,7 @@ set(FSFW_ETL_LIB_MAJOR_VERSION
    20
    CACHE STRING "ETL library major version requirement")
 set(FSFW_ETL_LIB_VERSION
-    ${FSFW_ETL_LIB_MAJOR_VERSION}.35.14
+    ${FSFW_ETL_LIB_MAJOR_VERSION}.28.0
    CACHE STRING "ETL library exact version requirement")
 set(FSFW_ETL_LINK_TARGET etl::etl)

--- a/scripts/check_release.py
+++ b/scripts/check_release.py
@ -1,110 +0,0 @@
-#! /bin/python
-
-
-import argparse
-import json
-import urllib.request
-import re
-from pathlib import Path
-
-def main() -> None:
-    parser = argparse.ArgumentParser(
-        description="List undocumented PRs"
-    )
-    parser.add_argument("-v", "--version", type=str, required=True)
-    args = parser.parse_args()
-    
-    match = re.search("([0-9]+\.[0-9]+\.[0-9]+)", args.version)
-    
-    if not match:
-        print("invalid version")
-        exit(1)
-    
-    version = "v" + match.group(1)
-    
-    print("looking for milestone for " + version + " ...")
-    
-    
-    with urllib.request.urlopen("https://egit.irs.uni-stuttgart.de/api/v1/repos/fsfw/fsfw/milestones?name=" + version) as milestone_json:
-        milestones = json.load(milestone_json)
-        if (len(milestones) == 0):
-            print("did not find any milestone")
-            exit(1)
-        if (len(milestones) > 1):
-            print("found multiple milestons")
-        milestone_title = milestones[0]['title']
-        milestone = str(milestones[0]['id'])
-        print("Using Milestone \""+ milestone_title + "\" with id " + milestone)
-    
-    milestone_prs = []
-    
-    page = 1
-    last_count = 1;
-    while last_count != 0:
-        with urllib.request.urlopen("https://egit.irs.uni-stuttgart.de/api/v1/repos/fsfw/fsfw/pulls?state=closed&milestone=" + str(milestone) + "&limit=100&page=" + str(page)) as pull_requests_json:
-            pull_requests = json.load(pull_requests_json)
-            for pr in pull_requests:
-                milestone_prs.append({'number': str(pr['number']), 'title' : pr['title']})
-            page += 1
-            last_count = len(pull_requests)
-    
-    print("Found " + str(len(milestone_prs)) + " closed PRs in Milestone")
-    
-    print("looking for CHANGELOG.md ...")
-    
-    path = Path(".")
-    
-    files = list(path.glob("CHANGELOG.md"))
-    
-    if (len(files) != 1):
-        files = list(path.glob("../CHANGELOG.md"))
-        
-    if (len(files) != 1):
-        print("did not find CHANGELOG.md. Run script in either root directory or scripts subfolder.")
-        exit(1)
-        
-    print("Scanning CHANGELOG.md ...")
-    
-    changelog_prs = []
-    
-    with open(files[0]) as changelog:
-        line = changelog.readline()
-        while (line):
-            #print("line: " + line)
-            match = re.search("\#.+(v[0-9]+\.[0-9]+\.[0-9]+)", line)
-            if (match):
-                if match.group(1) == version:
-                    #print("found version")
-                    line = changelog.readline()
-                    continue
-                else:
-                    #print("done with " + match.group(1))
-                    break
-            
-            match = re.search("PR: https://egit\.irs\.uni-stuttgart\.de/fsfw/fsfw/pulls/([0-9]+)", line)
-            if match:
-                changelog_prs.append(match.group(1))
-                
-            line = changelog.readline()
-    
-    print("Found " + str(len(changelog_prs)) + " PRs in CHANGELOG.md")
-    
-    print("")
-    
-    copy_array = changelog_prs.copy()
-    print("PRs in CHANGELOG.md that are not in Milestone:")
-    for pr in milestone_prs:
-        if pr['number'] in copy_array:
-            copy_array.remove(pr['number'])
-    for pr in copy_array:
-        print("https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/" + pr)
-
-    print("")
-
-    print("PRs in milestone that are not in CHANGELOG.md:")
-    
-    for pr in milestone_prs:
-        if pr['number'] not in changelog_prs:
-            print("- " + pr['title'] + "\n  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/" + pr['number'])
-
-main()
--- a/src/fsfw/CMakeLists.txt
+++ b/src/fsfw/CMakeLists.txt
@ -32,7 +32,6 @@ add_subdirectory(timemanager)
 add_subdirectory(tmtcpacket)
 add_subdirectory(tmtcservices)
 add_subdirectory(filesystem)
-add_subdirectory(util)

 # Optional

--- a/src/fsfw/action/ActionHelper.cpp
+++ b/src/fsfw/action/ActionHelper.cpp
@ -59,24 +59,17 @@ void ActionHelper::setQueueToUse(MessageQueueIF* queue) { queueToUse = queue; }

 void ActionHelper::prepareExecution(MessageQueueId_t commandedBy, ActionId_t actionId,
                                    store_address_t dataAddress) {
-  bool hasAdditionalData = false;
  const uint8_t* dataPtr = nullptr;
  size_t size = 0;
-  ReturnValue_t result;
-  if (dataAddress != store_address_t::invalid()) {
-    hasAdditionalData = true;
-    ReturnValue_t result = ipcStore->getData(dataAddress, &dataPtr, &size);
-    if (result != returnvalue::OK) {
-      CommandMessage reply;
-      ActionMessage::setStepReply(&reply, actionId, 0, result);
-      queueToUse->sendMessage(commandedBy, &reply);
-      return;
-    }
+  ReturnValue_t result = ipcStore->getData(dataAddress, &dataPtr, &size);
+  if (result != returnvalue::OK) {
+    CommandMessage reply;
+    ActionMessage::setStepReply(&reply, actionId, 0, result);
+    queueToUse->sendMessage(commandedBy, &reply);
+    return;
  }
  result = owner->executeAction(actionId, commandedBy, dataPtr, size);
-  if (hasAdditionalData) {
-    ipcStore->deleteData(dataAddress);
-  }
+  ipcStore->deleteData(dataAddress);
  if (result == HasActionsIF::EXECUTION_FINISHED) {
    CommandMessage reply;
    ActionMessage::setCompletionReply(&reply, actionId, true, result);
--- a/src/fsfw/cfdp.h
+++ b/src/fsfw/cfdp.h
@ -2,6 +2,7 @@
 #define FSFW_CFDP_H

 #include "cfdp/definitions.h"
+#include "cfdp/handler/CfdpHandler.h"
 #include "cfdp/handler/DestHandler.h"
 #include "cfdp/handler/FaultHandlerBase.h"
 #include "cfdp/helpers.h"
--- a/src/fsfw/cfdp/CfdpMessage.cpp
+++ b/src/fsfw/cfdp/CfdpMessage.cpp
@ -4,9 +4,8 @@ CfdpMessage::CfdpMessage() = default;

 CfdpMessage::~CfdpMessage() = default;

-void CfdpMessage::setPutRequest(CommandMessage *message, store_address_t putRequest) {
-  message->setCommand(PUT_REQUEST);
-  message->setParameter(putRequest.raw);
+void CfdpMessage::setCommand(CommandMessage *message, store_address_t cfdpPacket) {
+  message->setParameter(cfdpPacket.raw);
 }

 store_address_t CfdpMessage::getStoreId(const CommandMessage *message) {
--- a/src/fsfw/cfdp/CfdpMessage.h
+++ b/src/fsfw/cfdp/CfdpMessage.h
@ -11,11 +11,9 @@ class CfdpMessage {

 public:
  static const uint8_t MESSAGE_ID = messagetypes::CFDP;
-  static const Command_t PUT_REQUEST = MAKE_COMMAND_ID(1);
-  static const Command_t CANCEL_REQUEST = MAKE_COMMAND_ID(1);

  virtual ~CfdpMessage();
-  static void setPutRequest(CommandMessage* message, store_address_t putRequest);
+  static void setCommand(CommandMessage* message, store_address_t cfdpPacket);

  static store_address_t getStoreId(const CommandMessage* message);

--- a/src/fsfw/cfdp/FileSize.h
+++ b/src/fsfw/cfdp/FileSize.h
@ -8,14 +8,11 @@

 namespace cfdp {

-/**
- * Helper type for the CFDP File Size Sensitive (FSS) fields.
- */
-struct Fss : public SerializeIF {
+struct FileSize : public SerializeIF {
 public:
-  Fss() = default;
+  FileSize() = default;

-  explicit Fss(uint64_t fileSize, bool isLarge = false) { setFileSize(fileSize, isLarge); };
+  explicit FileSize(uint64_t fileSize, bool isLarge = false) { setFileSize(fileSize, isLarge); };

  [[nodiscard]] uint64_t value() const { return fileSize; }

--- a/src/fsfw/cfdp/VarLenFields.cpp
+++ b/src/fsfw/cfdp/VarLenFields.cpp
@ -3,8 +3,8 @@
 #include "fsfw/serialize/SerializeAdapter.h"
 #include "fsfw/serviceinterface.h"

-cfdp::VarLenField::VarLenField(cfdp::WidthInBytes width, uint64_t value) : VarLenField() {
-  ReturnValue_t result = this->setValueAndWidth(width, value);
+cfdp::VarLenField::VarLenField(cfdp::WidthInBytes width, size_t value) : VarLenField() {
+  ReturnValue_t result = this->setValue(width, value);
  if (result != returnvalue::OK) {
 #if FSFW_DISABLE_PRINTOUT == 0
 #if FSFW_CPP_OSTREAM_ENABLED == 1
@ -20,8 +20,8 @@ cfdp::VarLenField::VarLenField() : width(cfdp::WidthInBytes::ONE_BYTE) { value.o

 cfdp::WidthInBytes cfdp::VarLenField::getWidth() const { return width; }

-ReturnValue_t cfdp::VarLenField::setValueAndWidth(cfdp::WidthInBytes width_, uint64_t value_) {
-  switch (width_) {
+ReturnValue_t cfdp::VarLenField::setValue(cfdp::WidthInBytes widthInBytes, size_t value_) {
+  switch (widthInBytes) {
    case (cfdp::WidthInBytes::ONE_BYTE): {
      if (value_ > UINT8_MAX) {
        return returnvalue::FAILED;
@ -43,18 +43,15 @@ ReturnValue_t cfdp::VarLenField::setValueAndWidth(cfdp::WidthInBytes width_, uin
      this->value.fourBytes = value_;
      break;
    }
-    case (cfdp::WidthInBytes::EIGHT_BYTES): {
-      this->value.eightBytes = value_;
-    }
    default: {
      break;
    }
  }
-  this->width = width_;
+  this->width = widthInBytes;
  return returnvalue::OK;
 }

-uint64_t cfdp::VarLenField::getValue() const {
+size_t cfdp::VarLenField::getValue() const {
  switch (width) {
    case (cfdp::WidthInBytes::ONE_BYTE): {
      return value.oneByte;
@ -65,9 +62,6 @@ uint64_t cfdp::VarLenField::getValue() const {
    case (cfdp::WidthInBytes::FOUR_BYTES): {
      return value.fourBytes;
    }
-    case (cfdp::WidthInBytes::EIGHT_BYTES): {
-      return value.eightBytes;
-    }
  }
  return 0;
 }
@ -90,10 +84,6 @@ ReturnValue_t cfdp::VarLenField::serialize(uint8_t **buffer, size_t *size, size_
    case (cfdp::WidthInBytes::FOUR_BYTES): {
      return SerializeAdapter::serialize(&value.fourBytes, buffer, size, maxSize, streamEndianness);
    }
-    case (cfdp::WidthInBytes::EIGHT_BYTES): {
-      return SerializeAdapter::serialize(&value.eightBytes, buffer, size, maxSize,
-                                         streamEndianness);
-    }
    default: {
      return returnvalue::FAILED;
    }
@ -108,16 +98,11 @@ ReturnValue_t cfdp::VarLenField::deSerialize(cfdp::WidthInBytes width_, const ui
  return deSerialize(buffer, size, streamEndianness);
 }

-ReturnValue_t cfdp::VarLenField::setValue(uint64_t value_) {
-  return setValueAndWidth(getWidth(), value_);
-}
-
 ReturnValue_t cfdp::VarLenField::deSerialize(const uint8_t **buffer, size_t *size,
                                             Endianness streamEndianness) {
  switch (width) {
    case (cfdp::WidthInBytes::ONE_BYTE): {
      value.oneByte = **buffer;
-      *buffer += 1;
      *size += 1;
      return returnvalue::OK;
    }
@ -127,9 +112,6 @@ ReturnValue_t cfdp::VarLenField::deSerialize(const uint8_t **buffer, size_t *siz
    case (cfdp::WidthInBytes::FOUR_BYTES): {
      return SerializeAdapter::deSerialize(&value.fourBytes, buffer, size, streamEndianness);
    }
-    case (cfdp::WidthInBytes::EIGHT_BYTES): {
-      return SerializeAdapter::deSerialize(&value.eightBytes, buffer, size, streamEndianness);
-    }
    default: {
      return returnvalue::FAILED;
    }
@ -153,5 +135,3 @@ bool cfdp::VarLenField::operator==(const cfdp::VarLenField &other) const {
 bool cfdp::VarLenField::operator!=(const cfdp::VarLenField &other) const {
  return not(*this == other);
 }
-
-void cfdp::VarLenField::setWidth(cfdp::WidthInBytes width_) { this->width = width_; }
--- a/src/fsfw/cfdp/VarLenFields.h
+++ b/src/fsfw/cfdp/VarLenFields.h
@ -25,15 +25,13 @@ class VarLenField : public SerializeIF {
  template <typename T>
  explicit VarLenField(UnsignedByteField<T> byteField);

-  VarLenField(cfdp::WidthInBytes width, uint64_t value);
+  VarLenField(cfdp::WidthInBytes width, size_t value);

  bool operator==(const VarLenField &other) const;
  bool operator!=(const VarLenField &other) const;
  bool operator<(const VarLenField &other) const;

-  ReturnValue_t setValueAndWidth(cfdp::WidthInBytes width, uint64_t value);
-  void setWidth(cfdp::WidthInBytes width);
-  ReturnValue_t setValue(uint64_t value);
+  ReturnValue_t setValue(cfdp::WidthInBytes, size_t value);

  ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
                          Endianness streamEndianness) const override;
@ -44,7 +42,7 @@ class VarLenField : public SerializeIF {
                            Endianness streamEndianness);

  [[nodiscard]] cfdp::WidthInBytes getWidth() const;
-  [[nodiscard]] uint64_t getValue() const;
+  [[nodiscard]] size_t getValue() const;

 #if FSFW_CPP_OSTREAM_ENABLED == 1
  friend std::ostream &operator<<(std::ostream &os, const VarLenField &id) {
@ -66,7 +64,7 @@ template <typename T>
 cfdp::VarLenField::VarLenField(UnsignedByteField<T> byteField)
    : width(static_cast<cfdp::WidthInBytes>(sizeof(T))) {
  static_assert((sizeof(T) % 2) == 0);
-  setValueAndWidth(width, byteField.getValue());
+  setValue(width, byteField.getValue());
 }

 struct EntityId : public VarLenField {
@ -75,32 +73,6 @@ struct EntityId : public VarLenField {
  template <typename T>
  explicit EntityId(UnsignedByteField<T> byteField) : VarLenField(byteField) {}
  EntityId(cfdp::WidthInBytes width, size_t entityId) : VarLenField(width, entityId) {}
-
-  ReturnValue_t serializeAsLv(uint8_t **buffer, size_t *size, size_t maxSize) const {
-    if (buffer == nullptr or size == nullptr) {
-      return returnvalue::FAILED;
-    }
-    if (*size + 1 + getWidth() > maxSize) {
-      return SerializeIF::BUFFER_TOO_SHORT;
-    }
-    **buffer = getWidth();
-    *buffer += 1;
-    *size += 1;
-    return serialize(buffer, size, maxSize, SerializeIF::Endianness::NETWORK);
-  }
-
-  ReturnValue_t deSerializeFromLv(const uint8_t **buffer, size_t *deserLen) {
-    if (buffer == nullptr or deserLen == nullptr) {
-      return returnvalue::FAILED;
-    }
-    if (*deserLen < 2) {
-      return SerializeIF::STREAM_TOO_SHORT;
-    }
-    auto width = static_cast<WidthInBytes>(**buffer);
-    *buffer += 1;
-    *deserLen -= 1;
-    return VarLenField::deSerialize(width, buffer, deserLen, SerializeIF::Endianness::NETWORK);
-  }
 };

 struct TransactionSeqNum : public VarLenField {
--- a/src/fsfw/cfdp/definitions.h
+++ b/src/fsfw/cfdp/definitions.h
@ -17,7 +17,7 @@ static constexpr char CFDP_VERSION_2_NAME[] = "CCSDS 727.0-B-5";
 static constexpr uint8_t CFDP_VERSION_2 = 0b001;
 static constexpr uint8_t VERSION_BITS = CFDP_VERSION_2 << 5;

-static constexpr uint8_t CFDP_CLASS_ID = CLASS_ID::CFDP_BASE;
+static constexpr uint8_t CFDP_CLASS_ID = CLASS_ID::CFDP;

 static constexpr ReturnValue_t INVALID_TLV_TYPE = returnvalue::makeCode(CFDP_CLASS_ID, 1);
 static constexpr ReturnValue_t INVALID_DIRECTIVE_FIELD = returnvalue::makeCode(CFDP_CLASS_ID, 2);
@ -68,7 +68,6 @@ enum WidthInBytes : uint8_t {
  ONE_BYTE = 1,
  TWO_BYTES = 2,
  FOUR_BYTES = 4,
-  EIGHT_BYTES = 8
 };

 enum FileDirective : uint8_t {
@ -143,20 +142,6 @@ enum RecordContinuationState {
  CONTAINS_START_AND_END = 0b11
 };

-enum class ProxyOpMessageType : uint8_t {
-  PUT_REQUEST = 0x00,
-  MSG_TO_USR = 0x01,
-  FS_REQUEST = 0x02,
-  FAULT_HANDLER_OVERRIDE = 0x03,
-  TRANSMISSION_MODE = 0x04,
-  FLOW_LABEL = 0x05,
-  SEG_CTRL = 0x06,
-  PUT_RESPONSE = 0x07,
-  FS_RESPONSE = 0x08,
-  PUT_CANCEL = 0x09,
-  CLOSURE = 0x0b
-};
-
 }  // namespace cfdp

 #endif /* FSFW_SRC_FSFW_CFDP_PDU_DEFINITIONS_H_ */
--- a/src/fsfw/cfdp/handler/CMakeLists.txt
+++ b/src/fsfw/cfdp/handler/CMakeLists.txt
@ -1,4 +1,3 @@
 target_sources(
-  ${LIB_FSFW_NAME}
-  PRIVATE SourceHandler.cpp DestHandler.cpp PutRequest.cpp
-          ReservedMessageParser.cpp FaultHandlerBase.cpp UserBase.cpp)
+  ${LIB_FSFW_NAME} PRIVATE SourceHandler.cpp DestHandler.cpp
+                           FaultHandlerBase.cpp UserBase.cpp CfdpHandler.cpp)
--- a/src/fsfw/cfdp/handler/CfdpHandler.cpp
+++ b/src/fsfw/cfdp/handler/CfdpHandler.cpp
@ -0,0 +1,134 @@
+#include "CfdpHandler.h"
+
+#include "fsfw/cfdp/pdu/AckPduReader.h"
+#include "fsfw/cfdp/pdu/PduHeaderReader.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
+
+using namespace returnvalue;
+using namespace cfdp;
+
+CfdpHandler::CfdpHandler(const FsfwHandlerParams& fsfwParams, const CfdpHandlerCfg& cfdpCfg)
+    : SystemObject(fsfwParams.objectId),
+      msgQueue(fsfwParams.msgQueue),
+      destHandler(
+          DestHandlerParams(LocalEntityCfg(cfdpCfg.id, cfdpCfg.indicCfg, cfdpCfg.faultHandler),
+                            cfdpCfg.userHandler, cfdpCfg.remoteCfgProvider, cfdpCfg.packetInfoList,
+                            cfdpCfg.lostSegmentsList),
+          FsfwParams(fsfwParams.packetDest, nullptr, this, fsfwParams.tcStore,
+                     fsfwParams.tmStore)) {
+  destHandler.setMsgQueue(msgQueue);
+}
+
+[[nodiscard]] const char* CfdpHandler::getName() const { return "CFDP Handler"; }
+
+[[nodiscard]] uint32_t CfdpHandler::getIdentifier() const {
+  return destHandler.getDestHandlerParams().cfg.localId.getValue();
+}
+
+[[nodiscard]] MessageQueueId_t CfdpHandler::getRequestQueue() const { return msgQueue.getId(); }
+
+ReturnValue_t CfdpHandler::initialize() {
+  ReturnValue_t result = destHandler.initialize();
+  if (result != OK) {
+    return result;
+  }
+  tcStore = destHandler.getTcStore();
+  tmStore = destHandler.getTmStore();
+
+  return SystemObject::initialize();
+}
+
+ReturnValue_t CfdpHandler::performOperation(uint8_t operationCode) {
+  // TODO: Receive TC packets and route them to source and dest handler, depending on which is
+  //       correct or more appropriate
+  ReturnValue_t status;
+  ReturnValue_t result = OK;
+  TmTcMessage tmtcMsg;
+  for (status = msgQueue.receiveMessage(&tmtcMsg); status == returnvalue::OK;
+       status = msgQueue.receiveMessage(&tmtcMsg)) {
+    result = handleCfdpPacket(tmtcMsg);
+    if (result != OK) {
+      status = result;
+    }
+  }
+  auto& fsmRes = destHandler.performStateMachine();
+  // TODO: Error handling?
+  while (fsmRes.callStatus == CallStatus::CALL_AGAIN) {
+    destHandler.performStateMachine();
+    // TODO: Error handling?
+  }
+  return status;
+}
+
+ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) {
+  auto accessorPair = tcStore->getData(msg.getStorageId());
+  if (accessorPair.first != OK) {
+    return accessorPair.first;
+  }
+  PduHeaderReader reader(accessorPair.second.data(), accessorPair.second.size());
+  ReturnValue_t result = reader.parseData();
+  if (result != returnvalue::OK) {
+    return INVALID_PDU_FORMAT;
+  }
+  // The CFDP distributor should have taken care of ensuring the destination ID is correct
+  PduType type = reader.getPduType();
+  // Only the destination handler can process these PDUs
+  if (type == PduType::FILE_DATA) {
+    // Disable auto-deletion of packet
+    accessorPair.second.release();
+    PacketInfo info(type, msg.getStorageId());
+    result = destHandler.passPacket(info);
+  } else {
+    // Route depending on PDU type and directive type if applicable. It retrieves directive type
+    // from the raw stream for better performance (with sanity and directive code check).
+    // The routing is based on section 4.5 of the CFDP standard which specifies the PDU forwarding
+    // procedure.
+
+    // PDU header only. Invalid supplied data. A directive packet should have a valid data field
+    // with at least one byte being the directive code
+    const uint8_t* pduDataField = reader.getPduDataField();
+    if (pduDataField == nullptr) {
+      return INVALID_PDU_FORMAT;
+    }
+    if (not FileDirectiveReader::checkFileDirective(pduDataField[0])) {
+      return INVALID_DIRECTIVE_FIELD;
+    }
+    auto directive = static_cast<FileDirective>(pduDataField[0]);
+
+    auto passToDestHandler = [&]() {
+      accessorPair.second.release();
+      PacketInfo info(type, msg.getStorageId(), directive);
+      result = destHandler.passPacket(info);
+    };
+    auto passToSourceHandler = [&]() {
+
+    };
+    if (directive == FileDirective::METADATA or directive == FileDirective::EOF_DIRECTIVE or
+        directive == FileDirective::PROMPT) {
+      // Section b) of 4.5.3: These PDUs should always be targeted towards the file receiver a.k.a.
+      // the destination handler
+      passToDestHandler();
+    } else if (directive == FileDirective::FINISH or directive == FileDirective::NAK or
+               directive == FileDirective::KEEP_ALIVE) {
+      // Section c) of 4.5.3: These PDUs should always be targeted towards the file sender a.k.a.
+      // the source handler
+      passToSourceHandler();
+    } else if (directive == FileDirective::ACK) {
+      // Section a): Recipient depends of the type of PDU that is being acknowledged. We can simply
+      // extract the PDU type from the raw stream. If it is an EOF PDU, this packet is passed to
+      // the source handler, for a Finished PDU, it is passed to the destination handler.
+      FileDirective ackedDirective;
+      if (not AckPduReader::checkAckedDirectiveField(pduDataField[1], ackedDirective)) {
+        return INVALID_ACK_DIRECTIVE_FIELDS;
+      }
+      if (ackedDirective == FileDirective::EOF_DIRECTIVE) {
+        passToSourceHandler();
+      } else if (ackedDirective == FileDirective::FINISH) {
+        passToDestHandler();
+      }
+    }
+  }
+  return result;
+}
--- a/src/fsfw/cfdp/handler/CfdpHandler.h
+++ b/src/fsfw/cfdp/handler/CfdpHandler.h
@ -0,0 +1,71 @@
+#ifndef FSFW_EXAMPLE_HOSTED_CFDPHANDLER_H
+#define FSFW_EXAMPLE_HOSTED_CFDPHANDLER_H
+
+#include <utility>
+
+#include "fsfw/cfdp/handler/DestHandler.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
+
+struct FsfwHandlerParams {
+  FsfwHandlerParams(object_id_t objectId, HasFileSystemIF& vfs, AcceptsTelemetryIF& packetDest,
+                    StorageManagerIF& tcStore, StorageManagerIF& tmStore, MessageQueueIF& msgQueue)
+      : objectId(objectId),
+        vfs(vfs),
+        packetDest(packetDest),
+        tcStore(tcStore),
+        tmStore(tmStore),
+        msgQueue(msgQueue) {}
+  object_id_t objectId{};
+  HasFileSystemIF& vfs;
+  AcceptsTelemetryIF& packetDest;
+  StorageManagerIF& tcStore;
+  StorageManagerIF& tmStore;
+  MessageQueueIF& msgQueue;
+};
+
+struct CfdpHandlerCfg {
+  CfdpHandlerCfg(cfdp::EntityId localId, cfdp::IndicationCfg indicationCfg,
+                 cfdp::UserBase& userHandler, cfdp::FaultHandlerBase& userFaultHandler,
+                 cfdp::PacketInfoListBase& packetInfo, cfdp::LostSegmentsListBase& lostSegmentsList,
+                 cfdp::RemoteConfigTableIF& remoteCfgProvider)
+      : id(std::move(localId)),
+        indicCfg(indicationCfg),
+        packetInfoList(packetInfo),
+        lostSegmentsList(lostSegmentsList),
+        remoteCfgProvider(remoteCfgProvider),
+        userHandler(userHandler),
+        faultHandler(userFaultHandler) {}
+
+  cfdp::EntityId id;
+  cfdp::IndicationCfg indicCfg;
+  cfdp::PacketInfoListBase& packetInfoList;
+  cfdp::LostSegmentsListBase& lostSegmentsList;
+  cfdp::RemoteConfigTableIF& remoteCfgProvider;
+  cfdp::UserBase& userHandler;
+  cfdp::FaultHandlerBase& faultHandler;
+};
+
+class CfdpHandler : public SystemObject, public ExecutableObjectIF, public AcceptsTelecommandsIF {
+ public:
+  explicit CfdpHandler(const FsfwHandlerParams& fsfwParams, const CfdpHandlerCfg& cfdpCfg);
+
+  [[nodiscard]] const char* getName() const override;
+  [[nodiscard]] uint32_t getIdentifier() const override;
+  [[nodiscard]] MessageQueueId_t getRequestQueue() const override;
+
+  ReturnValue_t initialize() override;
+  ReturnValue_t performOperation(uint8_t operationCode) override;
+
+ private:
+  MessageQueueIF& msgQueue;
+  cfdp::DestHandler destHandler;
+  StorageManagerIF* tcStore = nullptr;
+  StorageManagerIF* tmStore = nullptr;
+
+  ReturnValue_t handleCfdpPacket(TmTcMessage& msg);
+};
+
+#endif  // FSFW_EXAMPLE_HOSTED_CFDPHANDLER_H
--- a/src/fsfw/cfdp/handler/DestHandler.cpp
+++ b/src/fsfw/cfdp/handler/DestHandler.cpp
@ -16,26 +16,25 @@ using namespace returnvalue;

 cfdp::DestHandler::DestHandler(DestHandlerParams params, FsfwParams fsfwParams)
    : tlvVec(params.maxTlvsInOnePdu),
-      msgToUserVec(params.maxTlvsInOnePdu),
-      transactionParams(params.maxFilenameLen),
-      destParams(std::move(params)),
-      fsfwParams(fsfwParams) {
-  transactionParams.pduConf.direction = cfdp::Direction::TOWARDS_SENDER;
+      userTlvVec(params.maxTlvsInOnePdu),
+      dp(std::move(params)),
+      fp(fsfwParams),
+      tp(params.maxFilenameLen) {
+  tp.pduConf.direction = cfdp::Direction::TOWARDS_SENDER;
 }

-const cfdp::DestHandler::FsmResult& cfdp::DestHandler::stateMachine() {
+const cfdp::DestHandler::FsmResult& cfdp::DestHandler::performStateMachine() {
  ReturnValue_t result;
  uint8_t errorIdx = 0;
  fsmRes.resetOfIteration();
  if (fsmRes.step == TransactionStep::IDLE) {
-    for (auto infoIter = destParams.packetListRef.begin();
-         infoIter != destParams.packetListRef.end();) {
+    for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
      if (infoIter->pduType == PduType::FILE_DIRECTIVE and
          infoIter->directiveType == FileDirective::METADATA) {
        result = handleMetadataPdu(*infoIter);
        checkAndHandleError(result, errorIdx);
        // Store data was deleted in PDU handler because a store guard is used
-        destParams.packetListRef.erase(infoIter++);
+        dp.packetListRef.erase(infoIter++);
      } else {
        infoIter++;
      }
@ -43,12 +42,11 @@ const cfdp::DestHandler::FsmResult& cfdp::DestHandler::stateMachine() {
    if (fsmRes.step == TransactionStep::IDLE) {
      // To decrease the already high complexity of the software, all packets arriving before
      // a metadata PDU are deleted.
-      for (auto infoIter = destParams.packetListRef.begin();
-           infoIter != destParams.packetListRef.end();) {
-        fsfwParams.tcStore->deleteData(infoIter->storeId);
+      for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
+        fp.tcStore->deleteData(infoIter->storeId);
        infoIter++;
      }
-      destParams.packetListRef.clear();
+      dp.packetListRef.clear();
    }

    if (fsmRes.step != TransactionStep::IDLE) {
@ -56,22 +54,21 @@ const cfdp::DestHandler::FsmResult& cfdp::DestHandler::stateMachine() {
    }
    return updateFsmRes(errorIdx);
  }
-  if (fsmRes.state == CfdpState::BUSY_CLASS_1_NACKED) {
+  if (fsmRes.state == CfdpStates::BUSY_CLASS_1_NACKED) {
    if (fsmRes.step == TransactionStep::RECEIVING_FILE_DATA_PDUS) {
-      for (auto infoIter = destParams.packetListRef.begin();
-           infoIter != destParams.packetListRef.end();) {
+      for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
        if (infoIter->pduType == PduType::FILE_DATA) {
          result = handleFileDataPdu(*infoIter);
          checkAndHandleError(result, errorIdx);
          // Store data was deleted in PDU handler because a store guard is used
-          destParams.packetListRef.erase(infoIter++);
+          dp.packetListRef.erase(infoIter++);
        } else if (infoIter->pduType == PduType::FILE_DIRECTIVE and
                   infoIter->directiveType == FileDirective::EOF_DIRECTIVE) {
          // TODO: Support for check timer missing
          result = handleEofPdu(*infoIter);
          checkAndHandleError(result, errorIdx);
          // Store data was deleted in PDU handler because a store guard is used
-          destParams.packetListRef.erase(infoIter++);
+          dp.packetListRef.erase(infoIter++);
        } else {
          infoIter++;
        }
@ -88,7 +85,7 @@ const cfdp::DestHandler::FsmResult& cfdp::DestHandler::stateMachine() {
    }
    return updateFsmRes(errorIdx);
  }
-  if (fsmRes.state == CfdpState::BUSY_CLASS_2_ACKED) {
+  if (fsmRes.state == CfdpStates::BUSY_CLASS_2_ACKED) {
    // TODO: Will be implemented at a later stage
 #if FSFW_CPP_OSTREAM_ENABLED == 1
    sif::warning << "CFDP state machine for acknowledged mode not implemented yet" << std::endl;
@ -98,29 +95,29 @@ const cfdp::DestHandler::FsmResult& cfdp::DestHandler::stateMachine() {
 }

 ReturnValue_t cfdp::DestHandler::passPacket(PacketInfo packet) {
-  if (destParams.packetListRef.full()) {
+  if (dp.packetListRef.full()) {
    return FAILED;
  }
-  destParams.packetListRef.push_back(packet);
+  dp.packetListRef.push_back(packet);
  return OK;
 }

 ReturnValue_t cfdp::DestHandler::initialize() {
-  if (fsfwParams.tmStore == nullptr) {
-    fsfwParams.tmStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TM_STORE);
-    if (fsfwParams.tmStore == nullptr) {
+  if (fp.tmStore == nullptr) {
+    fp.tmStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TM_STORE);
+    if (fp.tmStore == nullptr) {
      return FAILED;
    }
  }

-  if (fsfwParams.tcStore == nullptr) {
-    fsfwParams.tcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
-    if (fsfwParams.tcStore == nullptr) {
+  if (fp.tcStore == nullptr) {
+    fp.tcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
+    if (fp.tcStore == nullptr) {
      return FAILED;
    }
  }

-  if (fsfwParams.msgQueue == nullptr) {
+  if (fp.msgQueue == nullptr) {
    return FAILED;
  }
  return OK;
@ -128,16 +125,18 @@ ReturnValue_t cfdp::DestHandler::initialize() {

 ReturnValue_t cfdp::DestHandler::handleMetadataPdu(const PacketInfo& info) {
  // Process metadata PDU
-  auto constAccessorPair = fsfwParams.tcStore->getData(info.storeId);
+  auto constAccessorPair = fp.tcStore->getData(info.storeId);
  if (constAccessorPair.first != OK) {
    // TODO: This is not a CFDP error. Event and/or warning?
    return constAccessorPair.first;
  }
  cfdp::StringLv sourceFileName;
  cfdp::StringLv destFileName;
-  MetadataGenericInfo metadataInfo(transactionParams.fileSize);
+  MetadataInfo metadataInfo(tp.fileSize, sourceFileName, destFileName);
+  cfdp::Tlv* tlvArrayAsPtr = tlvVec.data();
+  metadataInfo.setOptionsArray(&tlvArrayAsPtr, std::nullopt, tlvVec.size());
  MetadataPduReader reader(constAccessorPair.second.data(), constAccessorPair.second.size(),
-                           metadataInfo, tlvVec.data(), tlvVec.size());
+                           metadataInfo);
  ReturnValue_t result = reader.parseData();
  // TODO: The standard does not really specify what happens if this kind of error happens
  //       I think it might be a good idea to cache some sort of error code, which
@ -146,17 +145,18 @@ ReturnValue_t cfdp::DestHandler::handleMetadataPdu(const PacketInfo& info) {
    return handleMetadataParseError(result, constAccessorPair.second.data(),
                                    constAccessorPair.second.size());
  }
-  return startTransaction(reader);
+  return startTransaction(reader, metadataInfo);
 }

 ReturnValue_t cfdp::DestHandler::handleFileDataPdu(const cfdp::PacketInfo& info) {
  // Process file data PDU
-  auto constAccessorPair = fsfwParams.tcStore->getData(info.storeId);
+  auto constAccessorPair = fp.tcStore->getData(info.storeId);
  if (constAccessorPair.first != OK) {
    // TODO: This is not a CFDP error. Event and/or warning?
    return constAccessorPair.first;
  }
-  FileDataInfo fdInfo;
+  cfdp::FileSize offset;
+  FileDataInfo fdInfo(offset);
  FileDataReader reader(constAccessorPair.second.data(), constAccessorPair.second.size(), fdInfo);
  ReturnValue_t result = reader.parseData();
  if (result != OK) {
@ -164,46 +164,46 @@ ReturnValue_t cfdp::DestHandler::handleFileDataPdu(const cfdp::PacketInfo& info)
  }
  size_t fileSegmentLen = 0;
  const uint8_t* fileData = fdInfo.getFileData(&fileSegmentLen);
-  FileOpParams fileOpParams(transactionParams.destName.data(), fileSegmentLen);
-  fileOpParams.offset = fdInfo.getOffset().value();
-  if (destParams.cfg.indicCfg.fileSegmentRecvIndicRequired) {
+  FileOpParams fileOpParams(tp.destName.data(), fileSegmentLen);
+  fileOpParams.offset = offset.value();
+  if (dp.cfg.indicCfg.fileSegmentRecvIndicRequired) {
    FileSegmentRecvdParams segParams;
-    segParams.offset = fdInfo.getOffset().value();
-    segParams.id = transactionParams.transactionId;
+    segParams.offset = offset.value();
+    segParams.id = tp.transactionId;
    segParams.length = fileSegmentLen;
    segParams.recContState = fdInfo.getRecordContinuationState();
    size_t segmentMetadatLen = 0;
    auto* segMetadata = fdInfo.getSegmentMetadata(&segmentMetadatLen);
    segParams.segmentMetadata = {segMetadata, segmentMetadatLen};
-    destParams.user.fileSegmentRecvdIndication(segParams);
+    dp.user.fileSegmentRecvdIndication(segParams);
  }
-  result = destParams.user.vfs.writeToFile(fileOpParams, fileData);
+  result = dp.user.vfs.writeToFile(fileOpParams, fileData);
  if (result != returnvalue::OK) {
    // TODO: Proper Error handling
 #if FSFW_CPP_OSTREAM_ENABLED == 1
    sif::error << "cfdp::DestHandler: VFS file write error with code 0x" << std::hex << std::setw(2)
               << result << std::endl;
 #endif
-    transactionParams.vfsErrorCount++;
-    if (transactionParams.vfsErrorCount < 3) {
+    tp.vfsErrorCount++;
+    if (tp.vfsErrorCount < 3) {
      // TODO: Provide execution step as parameter
-      fsfwParams.eventReporter->forwardEvent(events::FILESTORE_ERROR,
-                                             static_cast<uint8_t>(fsmRes.step), result);
+      fp.eventReporter->forwardEvent(events::FILESTORE_ERROR, static_cast<uint8_t>(fsmRes.step),
+                                     result);
    }
    return result;
  } else {
-    transactionParams.deliveryStatus = FileDeliveryStatus::RETAINED_IN_FILESTORE;
-    transactionParams.vfsErrorCount = 0;
+    tp.deliveryStatus = FileDeliveryStatus::RETAINED_IN_FILESTORE;
+    tp.vfsErrorCount = 0;
  }
-  if (fdInfo.getOffset().value() + fileSegmentLen > transactionParams.progress) {
-    transactionParams.progress = fdInfo.getOffset().value() + fileSegmentLen;
+  if (offset.value() + fileSegmentLen > tp.progress) {
+    tp.progress = offset.value() + fileSegmentLen;
  }
  return result;
 }

 ReturnValue_t cfdp::DestHandler::handleEofPdu(const cfdp::PacketInfo& info) {
  // Process EOF PDU
-  auto constAccessorPair = fsfwParams.tcStore->getData(info.storeId);
+  auto constAccessorPair = fp.tcStore->getData(info.storeId);
  if (constAccessorPair.first != OK) {
    // TODO: This is not a CFDP error. Event and/or warning?
    return constAccessorPair.first;
@ -216,21 +216,21 @@ ReturnValue_t cfdp::DestHandler::handleEofPdu(const cfdp::PacketInfo& info) {
  }
  // TODO: Error handling
  if (eofInfo.getConditionCode() == ConditionCode::NO_ERROR) {
-    transactionParams.crc = eofInfo.getChecksum();
+    tp.crc = eofInfo.getChecksum();
    uint64_t fileSizeFromEof = eofInfo.getFileSize().value();
    // CFDP 4.6.1.2.9: Declare file size error if progress exceeds file size
-    if (fileSizeFromEof > transactionParams.progress) {
+    if (fileSizeFromEof > tp.progress) {
      // TODO: File size error
    }
-    transactionParams.fileSize.setFileSize(fileSizeFromEof, std::nullopt);
+    tp.fileSize.setFileSize(fileSizeFromEof, std::nullopt);
  }
-  if (destParams.cfg.indicCfg.eofRecvIndicRequired) {
-    destParams.user.eofRecvIndication(getTransactionId());
+  if (dp.cfg.indicCfg.eofRecvIndicRequired) {
+    dp.user.eofRecvIndication(getTransactionId());
  }
  if (fsmRes.step == TransactionStep::RECEIVING_FILE_DATA_PDUS) {
-    if (fsmRes.state == CfdpState::BUSY_CLASS_1_NACKED) {
+    if (fsmRes.state == CfdpStates::BUSY_CLASS_1_NACKED) {
      fsmRes.step = TransactionStep::TRANSFER_COMPLETION;
-    } else if (fsmRes.state == CfdpState::BUSY_CLASS_2_ACKED) {
+    } else if (fsmRes.state == CfdpStates::BUSY_CLASS_2_ACKED) {
      fsmRes.step = TransactionStep::SENDING_ACK_PDU;
    }
  }
@ -260,7 +260,7 @@ ReturnValue_t cfdp::DestHandler::handleMetadataParseError(ReturnValue_t result,
  cfdp::EntityId destId;
  headerReader.getDestId(destId);
  RemoteEntityCfg* remoteCfg;
-  if (not destParams.remoteCfgTable.getRemoteCfg(destId, &remoteCfg)) {
+  if (not dp.remoteCfgTable.getRemoteCfg(destId, &remoteCfg)) {
 // TODO: No remote config for dest ID. I consider this a configuration error, which is not
 //       covered by the standard.
 //       Warning or error, yield or cache appropriate returnvalue
@ -274,57 +274,51 @@ ReturnValue_t cfdp::DestHandler::handleMetadataParseError(ReturnValue_t result,
  return returnvalue::FAILED;
 }

-ReturnValue_t cfdp::DestHandler::startTransaction(const MetadataPduReader& reader) {
-  if (fsmRes.state != CfdpState::IDLE) {
+ReturnValue_t cfdp::DestHandler::startTransaction(MetadataPduReader& reader, MetadataInfo& info) {
+  if (fsmRes.state != CfdpStates::IDLE) {
    // According to standard, discard metadata PDU if we are busy
    return OK;
  }
  ReturnValue_t result = OK;
  size_t sourceNameSize = 0;

-  if (not reader.getSourceFileName().isEmpty()) {
-    const uint8_t* sourceNamePtr = reader.getSourceFileName().getValue(&sourceNameSize);
-    if (sourceNameSize + 1 > transactionParams.sourceName.size()) {
-      fileErrorHandler(events::FILENAME_TOO_LARGE_ERROR, 0, "source filename too large");
-      return FAILED;
-    }
-    std::memcpy(transactionParams.sourceName.data(), sourceNamePtr, sourceNameSize);
-    transactionParams.sourceName[sourceNameSize] = '\0';
+  const uint8_t* sourceNamePtr = info.getSourceFileName().getValue(&sourceNameSize);
+  if (sourceNameSize + 1 > tp.sourceName.size()) {
+    fileErrorHandler(events::FILENAME_TOO_LARGE_ERROR, 0, "source filename too large");
+    return FAILED;
  }
+  std::memcpy(tp.sourceName.data(), sourceNamePtr, sourceNameSize);
+  tp.sourceName[sourceNameSize] = '\0';
  size_t destNameSize = 0;
-  if (not reader.getDestFileName().isEmpty()) {
-    const uint8_t* destNamePtr = reader.getDestFileName().getValue(&destNameSize);
-    if (destNameSize + 1 > transactionParams.destName.size()) {
-      fileErrorHandler(events::FILENAME_TOO_LARGE_ERROR, 0, "dest filename too large");
-      return FAILED;
-    }
-    std::memcpy(transactionParams.destName.data(), destNamePtr, destNameSize);
-    transactionParams.destName[destNameSize] = '\0';
+  const uint8_t* destNamePtr = info.getDestFileName().getValue(&destNameSize);
+  if (destNameSize + 1 > tp.destName.size()) {
+    fileErrorHandler(events::FILENAME_TOO_LARGE_ERROR, 0, "dest filename too large");
+    return FAILED;
  }
+  std::memcpy(tp.destName.data(), destNamePtr, destNameSize);
+  tp.destName[destNameSize] = '\0';

-  transactionParams.metadataOnly = true;
  // If both dest name size and source name size are 0, we are dealing with a metadata only PDU,
  // so there is no need to create a file or truncate an existing file
  if (destNameSize > 0 and sourceNameSize > 0) {
-    transactionParams.metadataOnly = false;
-    FilesystemParams fparams(transactionParams.destName.data());
+    FilesystemParams fparams(tp.destName.data());
    // handling to allow only specifying target directory. Example:
    // Source path /test/hello.txt, dest path /tmp -> dest path /tmp/hello.txt
-    if (destParams.user.vfs.isDirectory(transactionParams.destName.data())) {
+    if (dp.user.vfs.isDirectory(tp.destName.data())) {
      result = tryBuildingAbsoluteDestName(destNameSize);
      if (result != OK) {
        return result;
      }
    }
-    if (destParams.user.vfs.fileExists(fparams)) {
-      result = destParams.user.vfs.truncateFile(fparams);
+    if (dp.user.vfs.fileExists(fparams)) {
+      result = dp.user.vfs.truncateFile(fparams);
      if (result != returnvalue::OK) {
        fileErrorHandler(events::FILESTORE_ERROR, result, "file truncation error");
        return FAILED;
        // TODO: Relevant for filestore rejection error?
      }
    } else {
-      result = destParams.user.vfs.createFile(fparams);
+      result = dp.user.vfs.createFile(fparams);
      if (result != OK) {
        fileErrorHandler(events::FILESTORE_ERROR, result, "file creation error");
        return FAILED;
@ -334,135 +328,120 @@ ReturnValue_t cfdp::DestHandler::startTransaction(const MetadataPduReader& reade
  }
  EntityId sourceId;
  reader.getSourceId(sourceId);
-  if (not destParams.remoteCfgTable.getRemoteCfg(sourceId, &transactionParams.remoteCfg)) {
+  if (not dp.remoteCfgTable.getRemoteCfg(sourceId, &tp.remoteCfg)) {
    // TODO: Warning, event etc.
 #if FSFW_CPP_OSTREAM_ENABLED == 1
    sif::warning << "cfdp::DestHandler" << __func__
                 << ": No remote configuration found for destination ID "
-                 << transactionParams.pduConf.sourceId.getValue() << std::endl;
+                 << tp.pduConf.sourceId.getValue() << std::endl;
 #endif
    return FAILED;
  }
+  fsmRes.step = TransactionStep::TRANSACTION_START;
  if (reader.getTransmissionMode() == TransmissionMode::UNACKNOWLEDGED) {
-    fsmRes.state = CfdpState::BUSY_CLASS_1_NACKED;
+    fsmRes.state = CfdpStates::BUSY_CLASS_1_NACKED;
  } else if (reader.getTransmissionMode() == TransmissionMode::ACKNOWLEDGED) {
-    fsmRes.state = CfdpState::BUSY_CLASS_2_ACKED;
+    fsmRes.state = CfdpStates::BUSY_CLASS_2_ACKED;
  }
-  if (transactionParams.metadataOnly) {
-    fsmRes.step = TransactionStep::TRANSFER_COMPLETION;
-  } else {
-    // Kind of ugly, make FSM working on packet per packet basis..
-    fsmRes.step = TransactionStep::TRANSACTION_START;
-    fsmRes.step = TransactionStep::RECEIVING_FILE_DATA_PDUS;
-  }
-  auto& info = reader.getGenericInfo();
-  transactionParams.checksumType = info.getChecksumType();
-  transactionParams.closureRequested = info.isClosureRequested();
-  reader.fillConfig(transactionParams.pduConf);
-  transactionParams.pduConf.direction = Direction::TOWARDS_SENDER;
-  transactionParams.transactionId.entityId = transactionParams.pduConf.sourceId;
-  transactionParams.transactionId.seqNum = transactionParams.pduConf.seqNum;
-  transactionParams.fileSize = info.getFileSize();
-  MetadataRecvdParams params(transactionParams.transactionId, transactionParams.pduConf.sourceId,
-                             transactionParams.fileSize);
-  params.destFileName = transactionParams.destName.data();
-  params.sourceFileName = transactionParams.sourceName.data();
-  params.numberOfMsgsToUser = 0;
-  for (const auto& opt : tlvVec) {
-    if (opt.getType() == TlvType::MSG_TO_USER) {
-      msgToUserVec[params.numberOfMsgsToUser] =
-          MessageToUserTlv(opt.getValue(), opt.getLengthField());
-      params.numberOfMsgsToUser++;
-    }
-  }
-  params.msgsToUserArray = msgToUserVec.data();
-  destParams.user.metadataRecvdIndication(params);
+  tp.checksumType = info.getChecksumType();
+  tp.closureRequested = info.isClosureRequested();
+  reader.fillConfig(tp.pduConf);
+  tp.pduConf.direction = Direction::TOWARDS_SENDER;
+  tp.transactionId.entityId = tp.pduConf.sourceId;
+  tp.transactionId.seqNum = tp.pduConf.seqNum;
+  fsmRes.step = TransactionStep::RECEIVING_FILE_DATA_PDUS;
+  MetadataRecvdParams params(tp.transactionId, tp.pduConf.sourceId);
+  params.fileSize = tp.fileSize.getSize();
+  params.destFileName = tp.destName.data();
+  params.sourceFileName = tp.sourceName.data();
+  params.msgsToUserArray = dynamic_cast<MessageToUserTlv*>(userTlvVec.data());
+  params.msgsToUserLen = info.getOptionsLen();
+  dp.user.metadataRecvdIndication(params);
  return result;
 }

-cfdp::CfdpState cfdp::DestHandler::getCfdpState() const { return fsmRes.state; }
+cfdp::CfdpStates cfdp::DestHandler::getCfdpState() const { return fsmRes.state; }

 ReturnValue_t cfdp::DestHandler::handleTransferCompletion() {
  ReturnValue_t result;
-  if (transactionParams.checksumType != ChecksumType::NULL_CHECKSUM) {
+  if (tp.checksumType != ChecksumType::NULL_CHECKSUM) {
    result = checksumVerification();
    if (result != OK) {
      // TODO: Warning / error handling?
    }
  } else {
-    transactionParams.conditionCode = ConditionCode::NO_ERROR;
+    tp.conditionCode = ConditionCode::NO_ERROR;
  }
  result = noticeOfCompletion();
  if (result != OK) {
  }
-  if (fsmRes.state == CfdpState::BUSY_CLASS_1_NACKED) {
-    if (transactionParams.closureRequested) {
+  if (fsmRes.state == CfdpStates::BUSY_CLASS_1_NACKED) {
+    if (tp.closureRequested) {
      fsmRes.step = TransactionStep::SENDING_FINISHED_PDU;
    } else {
      finish();
    }
-  } else if (fsmRes.state == CfdpState::BUSY_CLASS_2_ACKED) {
+  } else if (fsmRes.state == CfdpStates::BUSY_CLASS_2_ACKED) {
    fsmRes.step = TransactionStep::SENDING_FINISHED_PDU;
  }
  return OK;
 }

 ReturnValue_t cfdp::DestHandler::tryBuildingAbsoluteDestName(size_t destNameSize) {
-  // A path may only have a maximum of 256 characters in CFDP, so this buffer should be sufficient
-  // for all use-cases.
-  char baseNameBuf[512]{};
-  FilesystemParams fparamsSrc(transactionParams.sourceName.data());
+  char baseNameBuf[tp.destName.size()]{};
+  FilesystemParams fparamsSrc(tp.sourceName.data());
  size_t baseNameLen = 0;
-  ReturnValue_t result = destParams.user.vfs.getBaseFilename(fparamsSrc, baseNameBuf,
-                                                             sizeof(baseNameBuf), baseNameLen);
+  ReturnValue_t result =
+      dp.user.vfs.getBaseFilename(fparamsSrc, baseNameBuf, sizeof(baseNameBuf), baseNameLen);
  if (result != returnvalue::OK or baseNameLen == 0) {
    fileErrorHandler(events::FILENAME_TOO_LARGE_ERROR, 0, "error retrieving source base name");
    return FAILED;
  }
  // Destination name + slash + base name + null termination
-  if (destNameSize + 1 + baseNameLen + 1 > transactionParams.destName.size()) {
+  if (destNameSize + 1 + baseNameLen + 1 > tp.destName.size()) {
    fileErrorHandler(events::FILENAME_TOO_LARGE_ERROR, 0,
                     "dest filename too large after adding source base name");
    return FAILED;
  }
-  transactionParams.destName[destNameSize++] = '/';
-  std::memcpy(transactionParams.destName.data() + destNameSize, baseNameBuf, baseNameLen);
+  tp.destName[destNameSize++] = '/';
+  std::memcpy(tp.destName.data() + destNameSize, baseNameBuf, baseNameLen);
  destNameSize += baseNameLen;
-  transactionParams.destName[destNameSize++] = '\0';
+  tp.destName[destNameSize++] = '\0';
  return OK;
 }

-void cfdp::DestHandler::fileErrorHandler(Event event, ReturnValue_t result,
-                                         const char* info) const {
-  fsfwParams.eventReporter->forwardEvent(event, static_cast<uint8_t>(fsmRes.step), result);
+void cfdp::DestHandler::fileErrorHandler(Event event, ReturnValue_t result, const char* info) {
+  fp.eventReporter->forwardEvent(events::FILENAME_TOO_LARGE_ERROR,
+                                 static_cast<uint8_t>(fsmRes.step), result);
 #if FSFW_CPP_OSTREAM_ENABLED == 1
  sif::warning << "cfdp::DestHandler: " << info << std::endl;
 #endif
 }

 void cfdp::DestHandler::finish() {
-  transactionParams.reset();
-  destParams.packetListRef.clear();
-  fsmRes.state = CfdpState::IDLE;
+  tp.reset();
+  dp.packetListRef.clear();
+  fsmRes.state = CfdpStates::IDLE;
  fsmRes.step = TransactionStep::IDLE;
 }

 ReturnValue_t cfdp::DestHandler::checksumVerification() {
  std::array<uint8_t, 1024> buf{};
+  // TODO: Checksum verification and notice of completion
  etl::crc32 crcCalc;
  uint64_t currentOffset = 0;
-  FileOpParams params(transactionParams.destName.data(), transactionParams.fileSize.value());
-  while (currentOffset < transactionParams.fileSize.value()) {
+  FileOpParams params(tp.destName.data(), tp.fileSize.value());
+  while (currentOffset < tp.fileSize.value()) {
    uint64_t readLen;
-    if (currentOffset + buf.size() > transactionParams.fileSize.value()) {
-      readLen = transactionParams.fileSize.value() - currentOffset;
+    if (currentOffset + buf.size() > tp.fileSize.value()) {
+      readLen = tp.fileSize.value() - currentOffset;
    } else {
      readLen = buf.size();
    }
    if (readLen > 0) {
      params.offset = currentOffset;
      params.size = readLen;
-      auto result = destParams.user.vfs.readFromFile(params, buf.data(), buf.size());
+      auto result = dp.user.vfs.readFromFile(params, buf.data(), buf.size());
      if (result != OK) {
        // TODO: I think this is a case for a filestore rejection, but it might sense to print
        //       a warning or trigger an event because this should generally not happen
@ -474,43 +453,40 @@ ReturnValue_t cfdp::DestHandler::checksumVerification() {
  }

  uint32_t value = crcCalc.value();
-  if (value == transactionParams.crc) {
-    transactionParams.conditionCode = ConditionCode::NO_ERROR;
-    transactionParams.deliveryCode = FileDeliveryCode::DATA_COMPLETE;
+  if (value == tp.crc) {
+    tp.conditionCode = ConditionCode::NO_ERROR;
+    tp.deliveryCode = FileDeliveryCode::DATA_COMPLETE;
  } else {
    // TODO: Proper error handling
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "CRC check for file " << transactionParams.destName.data() << " failed"
-                 << std::endl;
+    sif::warning << "CRC check for file " << tp.destName.data() << " failed" << std::endl;
 #endif
-    transactionParams.conditionCode = ConditionCode::FILE_CHECKSUM_FAILURE;
+    tp.conditionCode = ConditionCode::FILE_CHECKSUM_FAILURE;
  }
  return OK;
 }

 ReturnValue_t cfdp::DestHandler::noticeOfCompletion() {
-  if (destParams.cfg.indicCfg.transactionFinishedIndicRequired) {
-    TransactionFinishedParams params(
-        transactionParams.transactionId, transactionParams.conditionCode,
-        transactionParams.deliveryCode, transactionParams.deliveryStatus);
-    destParams.user.transactionFinishedIndication(params);
+  if (dp.cfg.indicCfg.transactionFinishedIndicRequired) {
+    TransactionFinishedParams params(tp.transactionId, tp.conditionCode, tp.deliveryCode,
+                                     tp.deliveryStatus);
+    dp.user.transactionFinishedIndication(params);
  }
  return OK;
 }

 ReturnValue_t cfdp::DestHandler::sendFinishedPdu() {
-  FinishedInfo info(transactionParams.conditionCode, transactionParams.deliveryCode,
-                    transactionParams.deliveryStatus);
-  FinishPduCreator finishedPdu(transactionParams.pduConf, info);
+  FinishedInfo info(tp.conditionCode, tp.deliveryCode, tp.deliveryStatus);
+  FinishPduCreator finishedPdu(tp.pduConf, info);
  store_address_t storeId;
  uint8_t* dataPtr = nullptr;
  ReturnValue_t result =
-      fsfwParams.tmStore->getFreeElement(&storeId, finishedPdu.getSerializedSize(), &dataPtr);
+      fp.tmStore->getFreeElement(&storeId, finishedPdu.getSerializedSize(), &dataPtr);
  if (result != OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
    sif::warning << "cfdp::DestHandler:sendFinishedPdu: Getting store slot failed" << std::endl;
 #endif
-    fsfwParams.eventReporter->forwardEvent(events::STORE_ERROR, result, 0);
+    fp.eventReporter->forwardEvent(events::STORE_ERROR, result, 0);
    return result;
  }
  size_t serLen = 0;
@ -520,16 +496,16 @@ ReturnValue_t cfdp::DestHandler::sendFinishedPdu() {
    sif::warning << "cfdp::DestHandler::sendFinishedPdu: Serializing Finished PDU failed"
                 << std::endl;
 #endif
-    fsfwParams.eventReporter->forwardEvent(events::SERIALIZATION_ERROR, result, 0);
+    fp.eventReporter->forwardEvent(events::SERIALIZATION_ERROR, result, 0);
    return result;
  }
  TmTcMessage msg(storeId);
-  result = fsfwParams.msgQueue->sendMessage(fsfwParams.packetDest.getReportReceptionQueue(), &msg);
+  result = fp.msgQueue->sendMessage(fp.packetDest.getReportReceptionQueue(), &msg);
  if (result != OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
    sif::warning << "cfdp::DestHandler::sendFinishedPdu: Sending PDU failed" << std::endl;
 #endif
-    fsfwParams.eventReporter->forwardEvent(events::MSG_QUEUE_ERROR, result, 0);
+    fp.eventReporter->forwardEvent(events::MSG_QUEUE_ERROR, result, 0);
    return result;
  }
  fsmRes.packetsSent++;
@ -549,9 +525,7 @@ const cfdp::DestHandler::FsmResult& cfdp::DestHandler::updateFsmRes(uint8_t erro
  return fsmRes;
 }

-const cfdp::TransactionId& cfdp::DestHandler::getTransactionId() const {
-  return transactionParams.transactionId;
-}
+const cfdp::TransactionId& cfdp::DestHandler::getTransactionId() const { return tp.transactionId; }

 void cfdp::DestHandler::checkAndHandleError(ReturnValue_t result, uint8_t& errorIdx) {
  if (result != OK and errorIdx < 3) {
@ -560,15 +534,13 @@ void cfdp::DestHandler::checkAndHandleError(ReturnValue_t result, uint8_t& error
  }
 }

-void cfdp::DestHandler::setMsgQueue(MessageQueueIF& queue) { fsfwParams.msgQueue = &queue; }
+void cfdp::DestHandler::setMsgQueue(MessageQueueIF& queue) { fp.msgQueue = &queue; }

 void cfdp::DestHandler::setEventReporter(EventReportingProxyIF& reporter) {
-  fsfwParams.eventReporter = &reporter;
+  fp.eventReporter = &reporter;
 }

-const cfdp::DestHandlerParams& cfdp::DestHandler::getDestHandlerParams() const {
-  return destParams;
-}
+const cfdp::DestHandlerParams& cfdp::DestHandler::getDestHandlerParams() const { return dp; }

-StorageManagerIF* cfdp::DestHandler::getTmStore() const { return fsfwParams.tmStore; }
-StorageManagerIF* cfdp::DestHandler::getTcStore() const { return fsfwParams.tcStore; }
+StorageManagerIF* cfdp::DestHandler::getTmStore() const { return fp.tmStore; }
+StorageManagerIF* cfdp::DestHandler::getTcStore() const { return fp.tcStore; }
--- a/src/fsfw/cfdp/handler/DestHandler.h
+++ b/src/fsfw/cfdp/handler/DestHandler.h
@ -13,7 +13,6 @@
 #include "fsfw/cfdp/handler/mib.h"
 #include "fsfw/cfdp/pdu/MetadataPduReader.h"
 #include "fsfw/cfdp/pdu/PduConfig.h"
-#include "fsfw/cfdp/tlv/MessageToUserTlv.h"
 #include "fsfw/container/DynamicFIFO.h"
 #include "fsfw/storagemanager/StorageManagerIF.h"
 #include "fsfw/storagemanager/storeAddress.h"
@ -21,9 +20,23 @@

 namespace cfdp {

+struct PacketInfo {
+  PacketInfo(PduType type, store_address_t storeId,
+             std::optional<FileDirective> directive = std::nullopt)
+      : pduType(type), directiveType(directive), storeId(storeId) {}
+
+  PduType pduType = PduType::FILE_DATA;
+  std::optional<FileDirective> directiveType = FileDirective::INVALID_DIRECTIVE;
+  store_address_t storeId = store_address_t::invalid();
+  PacketInfo() = default;
+};
+
 template <size_t SIZE>
 using LostSegmentsList = etl::set<etl::pair<uint64_t, uint64_t>, SIZE>;
+template <size_t SIZE>
+using PacketInfoList = etl::list<PacketInfo, SIZE>;
 using LostSegmentsListBase = etl::iset<etl::pair<uint64_t, uint64_t>>;
+using PacketInfoListBase = etl::ilist<PacketInfo>;

 struct DestHandlerParams {
  DestHandlerParams(LocalEntityCfg cfg, UserBase& user, RemoteConfigTableIF& remoteCfgTable,
@ -31,9 +44,6 @@ struct DestHandlerParams {
                    // TODO: This container can potentially take tons of space. For a better
                    //       memory efficient implementation, an additional abstraction could be
                    //       be used so users can use uint32_t as the pair type
-                    // TODO: Actually, we can provide a better abstraction via interface, which
-                    //       allows using something like a bounded map. This simplifies
-                    //       the implementation significantly.
                    LostSegmentsListBase& lostSegmentsContainer)
      : cfg(std::move(cfg)),
        user(user),
@ -47,10 +57,31 @@ struct DestHandlerParams {

  PacketInfoListBase& packetListRef;
  LostSegmentsListBase& lostSegmentsContainer;
-  uint8_t maxTlvsInOnePdu = 20;
+  uint8_t maxTlvsInOnePdu = 10;
  size_t maxFilenameLen = 255;
 };

+struct FsfwParams {
+  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
+             EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore,
+             StorageManagerIF& tmStore)
+      : FsfwParams(packetDest, msgQueue, eventReporter) {
+    this->tcStore = &tcStore;
+    this->tmStore = &tmStore;
+  }
+
+  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
+             EventReportingProxyIF* eventReporter)
+      : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
+  AcceptsTelemetryIF& packetDest;
+  MessageQueueIF* msgQueue;
+  EventReportingProxyIF* eventReporter = nullptr;
+  StorageManagerIF* tcStore = nullptr;
+  StorageManagerIF* tmStore = nullptr;
+};
+
+enum class CallStatus { DONE, CALL_AFTER_DELAY, CALL_AGAIN };
+
 class DestHandler {
 public:
  enum class TransactionStep : uint8_t {
@ -67,7 +98,7 @@ class DestHandler {
    ReturnValue_t result = returnvalue::OK;
    CallStatus callStatus = CallStatus::CALL_AFTER_DELAY;
    TransactionStep step = TransactionStep::IDLE;
-    CfdpState state = CfdpState::IDLE;
+    CfdpStates state = CfdpStates::IDLE;
    uint32_t packetsSent = 0;
    uint8_t errors = 0;
    std::array<ReturnValue_t, 3> errorCodes = {};
@ -92,7 +123,7 @@ class DestHandler {
   *  - @c returnvalue::OK  State machine OK for this execution cycle
   *  - @c CALL_FSM_AGAIN   State machine should be called again.
   */
-  const FsmResult& stateMachine();
+  const FsmResult& performStateMachine();
  void setMsgQueue(MessageQueueIF& queue);
  void setEventReporter(EventReportingProxyIF& reporter);

@ -100,7 +131,7 @@ class DestHandler {

  ReturnValue_t initialize();

-  [[nodiscard]] CfdpState getCfdpState() const;
+  [[nodiscard]] CfdpStates getCfdpState() const;
  [[nodiscard]] TransactionStep getTransactionStep() const;
  [[nodiscard]] const TransactionId& getTransactionId() const;
  [[nodiscard]] const DestHandlerParams& getDestHandlerParams() const;
@ -125,19 +156,17 @@ class DestHandler {
      crc = 0;
      progress = 0;
      remoteCfg = nullptr;
-      metadataOnly = false;
      closureRequested = false;
      vfsErrorCount = 0;
      checksumType = ChecksumType::NULL_CHECKSUM;
    }

-    bool metadataOnly = false;
    ChecksumType checksumType = ChecksumType::NULL_CHECKSUM;
    bool closureRequested = false;
    uint16_t vfsErrorCount = 0;
    std::vector<char> sourceName;
    std::vector<char> destName;
-    cfdp::Fss fileSize;
+    cfdp::FileSize fileSize;
    TransactionId transactionId;
    PduConfig pduConf;
    ConditionCode conditionCode = ConditionCode::NO_ERROR;
@ -149,13 +178,13 @@ class DestHandler {
  };

  std::vector<cfdp::Tlv> tlvVec;
-  std::vector<MessageToUserTlv> msgToUserVec;
-  TransactionParams transactionParams;
-  DestHandlerParams destParams;
-  cfdp::FsfwParams fsfwParams;
+  std::vector<cfdp::Tlv> userTlvVec;
+  DestHandlerParams dp;
+  FsfwParams fp;
+  TransactionParams tp;
  FsmResult fsmRes;

-  ReturnValue_t startTransaction(const MetadataPduReader& reader);
+  ReturnValue_t startTransaction(MetadataPduReader& reader, MetadataInfo& info);
  ReturnValue_t handleMetadataPdu(const PacketInfo& info);
  ReturnValue_t handleFileDataPdu(const PacketInfo& info);
  ReturnValue_t handleEofPdu(const PacketInfo& info);
@ -166,7 +195,7 @@ class DestHandler {
  ReturnValue_t sendFinishedPdu();
  ReturnValue_t noticeOfCompletion();
  ReturnValue_t checksumVerification();
-  void fileErrorHandler(Event event, ReturnValue_t result, const char* info) const;
+  void fileErrorHandler(Event event, ReturnValue_t result, const char* info);
  const FsmResult& updateFsmRes(uint8_t errors);
  void checkAndHandleError(ReturnValue_t result, uint8_t& errorIdx);
  void finish();
--- a/src/fsfw/cfdp/handler/PutRequest.cpp
+++ b/src/fsfw/cfdp/handler/PutRequest.cpp
@ -1,201 +0,0 @@
-#include "PutRequest.h"
-
-using namespace returnvalue;
-
-cfdp::PutRequest::PutRequest(cfdp::EntityId destId, const uint8_t *msgsToUser,
-                             size_t msgsToUserTotalSize, const uint8_t *fsRequests,
-                             size_t fsRequestsSize)
-    : destId(std::move(destId)),
-      metadataOnly(true),
-      msgsToUsersTotalSize(msgsToUserTotalSize),
-      msgsToUserStartPtr(msgsToUser),
-      fsRequestsTotalSize(fsRequestsSize),
-      fsRequestStartPtr(fsRequests) {}
-
-cfdp::PutRequest::PutRequest(cfdp::EntityId destId, cfdp::StringLv &sourceName,
-                             cfdp::StringLv &destName)
-    : destId(std::move(destId)), sourceName(std::move(sourceName)), destName(std::move(destName)) {}
-
-[[nodiscard]] bool cfdp::PutRequest::isMetadataOnly() const { return metadataOnly; }
-
-ReturnValue_t cfdp::PutRequest::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
-                                          SerializeIF::Endianness streamEndianness) const {
-  if (buffer == nullptr or size == nullptr) {
-    return FAILED;
-  }
-  if (*size + getSerializedSize() > maxSize) {
-    return SerializeIF::BUFFER_TOO_SHORT;
-  }
-  ReturnValue_t result = destId.serializeAsLv(buffer, size, maxSize);
-  if (result != OK) {
-    return result;
-  }
-  result = SerializeAdapter::serialize(&metadataOnly, buffer, size, maxSize, streamEndianness);
-  if (result != OK) {
-    return result;
-  }
-  if (!metadataOnly) {
-    result = sourceName.serialize(buffer, size, maxSize, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result = destName.serialize(buffer, size, maxSize, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result =
-        SerializeAdapter::serialize(&hasTransmissionMode, buffer, size, maxSize, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result =
-        SerializeAdapter::serialize(&transmissionMode, buffer, size, maxSize, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result =
-        SerializeAdapter::serialize(&hasClosureRequested, buffer, size, maxSize, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result =
-        SerializeAdapter::serialize(&closureRequested, buffer, size, maxSize, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-  }
-  result =
-      SerializeAdapter::serialize(&msgsToUsersTotalSize, buffer, size, maxSize, streamEndianness);
-  if (result != OK) {
-    return result;
-  }
-  std::memcpy(*buffer, msgsToUserStartPtr, msgsToUsersTotalSize);
-  *buffer += msgsToUsersTotalSize;
-  *size += msgsToUsersTotalSize;
-
-  result =
-      SerializeAdapter::serialize(&fsRequestsTotalSize, buffer, size, maxSize, streamEndianness);
-  if (result != OK) {
-    return result;
-  }
-  std::memcpy(*buffer, fsRequestStartPtr, fsRequestsTotalSize);
-  *buffer += fsRequestsTotalSize;
-  *size += fsRequestsTotalSize;
-  return OK;
-}
-
-ReturnValue_t cfdp::PutRequest::deSerialize(const uint8_t **buffer, size_t *size,
-                                            SerializeIF::Endianness streamEndianness) {
-  if (buffer == nullptr or size == nullptr) {
-    return FAILED;
-  }
-  ReturnValue_t result = destId.deSerializeFromLv(buffer, size);
-  if (result != OK) {
-    return result;
-  }
-  result = SerializeAdapter::deSerialize(&metadataOnly, buffer, size, streamEndianness);
-  if (result != OK) {
-    return result;
-  }
-  if (!metadataOnly) {
-    result = sourceName.deSerialize(buffer, size, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result = destName.deSerialize(buffer, size, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result = SerializeAdapter::deSerialize(&hasTransmissionMode, buffer, size, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result = SerializeAdapter::deSerialize(&transmissionMode, buffer, size, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result = SerializeAdapter::deSerialize(&hasClosureRequested, buffer, size, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-    result = SerializeAdapter::deSerialize(&closureRequested, buffer, size, streamEndianness);
-    if (result != OK) {
-      return result;
-    }
-  }
-  result = SerializeAdapter::deSerialize(&msgsToUsersTotalSize, buffer, size, streamEndianness);
-  if (result != OK) {
-    return result;
-  }
-  msgsToUserStartPtr = *buffer;
-  *buffer += msgsToUsersTotalSize;
-  *size += msgsToUsersTotalSize;
-
-  result = SerializeAdapter::deSerialize(&fsRequestsTotalSize, buffer, size, streamEndianness);
-  if (result != OK) {
-    return result;
-  }
-  fsRequestStartPtr = *buffer;
-  *buffer += fsRequestsTotalSize;
-  *size += fsRequestsTotalSize;
-  return OK;
-}
-
-size_t cfdp::PutRequest::getSerializedSize() const {
-  // Entity ID LV (1 leading size byte) and the metadata only flag.
-  size_t baseSize = 1 + destId.getSerializedSize() + 1;
-  if (!metadataOnly) {
-    baseSize += sourceName.getSerializedSize() + destName.getSerializedSize() + 4;
-  }
-  baseSize += sizeof(msgsToUsersTotalSize) + msgsToUsersTotalSize + sizeof(fsRequestsTotalSize) +
-              fsRequestsTotalSize;
-  return baseSize;
-}
-
-void cfdp::PutRequest::setSourceAndDestName(cfdp::StringLv &sourceName_,
-                                            cfdp::StringLv &destName_) {
-  metadataOnly = false;
-  this->sourceName = std::move(sourceName_);
-  this->destName = std::move(destName_);
-}
-
-const cfdp::StringLv &cfdp::PutRequest::getSourceName() const { return sourceName; }
-
-const cfdp::StringLv &cfdp::PutRequest::getDestName() const { return destName; }
-
-const cfdp::EntityId &cfdp::PutRequest::getDestId() const { return destId; }
-
-void cfdp::PutRequest::setDestId(cfdp::EntityId id) { destId = std::move(id); }
-
-void cfdp::PutRequest::setTransmissionMode(cfdp::TransmissionMode transmissionMode_) {
-  this->transmissionMode = transmissionMode_;
-  hasTransmissionMode = true;
-}
-
-void cfdp::PutRequest::clearTransmissionMode() { hasTransmissionMode = false; }
-
-void cfdp::PutRequest::clearClosureRequest() { hasClosureRequested = false; }
-
-void cfdp::PutRequest::setClosureRequest(bool closureRequested_) {
-  this->closureRequested = closureRequested_;
-  hasClosureRequested = true;
-}
-
-const uint8_t *cfdp::PutRequest::getMessagesToUser(size_t &totalSize) {
-  totalSize = this->msgsToUsersTotalSize;
-  return msgsToUserStartPtr;
-}
-
-bool cfdp::PutRequest::getClosureRequested(bool &closureRequested_) const {
-  if (hasClosureRequested) {
-    closureRequested_ = this->closureRequested;
-  }
-  return hasClosureRequested;
-}
-
-bool cfdp::PutRequest::getTransmissionMode(cfdp::TransmissionMode &mode) const {
-  if (hasTransmissionMode) {
-    mode = static_cast<cfdp::TransmissionMode>(this->transmissionMode);
-  }
-  return hasTransmissionMode;
-}
--- a/src/fsfw/cfdp/handler/PutRequest.h
+++ b/src/fsfw/cfdp/handler/PutRequest.h
@ -1,82 +0,0 @@
-#pragma once
-
-#include <optional>
-#include <vector>
-
-#include "fsfw/cfdp/VarLenFields.h"
-#include "fsfw/cfdp/tlv/FilestoreRequestTlv.h"
-#include "fsfw/cfdp/tlv/MessageToUserTlv.h"
-
-namespace cfdp {
-
-class PutRequest : public SerializeIF {
- public:
-  /**
-   * Metadata only constructor.
-   * @param destId
-   * @param msgsToUser
-   * @param msgsToUserTotalSize
-   * @param fsRequests
-   * @param fsRequestsSize
-   */
-  PutRequest(EntityId destId, const uint8_t* msgsToUser, size_t msgsToUserTotalSize,
-             const uint8_t* fsRequests, size_t fsRequestsSize);
-  /**
-   * Put request to initiate file transfers. By default, the transmission mode and closure requested
-   * parameter are not present, thereby being derived from the remote configuration for a
-   * particular destination ID.
-   * @param destId
-   * @param sourceName
-   * @param destName
-   */
-  PutRequest(EntityId destId, cfdp::StringLv& sourceName, cfdp::StringLv& destName);
-
-  /**
-   * Default constructor for deserialization.
-   */
-  PutRequest() = default;
-
-  [[nodiscard]] ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
-                                        Endianness streamEndianness) const override;
-  ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
-                            Endianness streamEndianness) override;
-  [[nodiscard]] size_t getSerializedSize() const override;
-  void setSourceAndDestName(cfdp::StringLv& sourceName, cfdp::StringLv& destName);
-
-  [[nodiscard]] const cfdp::StringLv& getSourceName() const;
-  [[nodiscard]] const cfdp::StringLv& getDestName() const;
-
-  void setTransmissionMode(cfdp::TransmissionMode transmissionMode);
-  void clearTransmissionMode();
-  void setClosureRequest(bool closureRequested);
-  void clearClosureRequest();
-
-  const uint8_t* getMessagesToUser(size_t& msgSize);
-
-  [[nodiscard]] bool isMetadataOnly() const;
-
-  bool getTransmissionMode(TransmissionMode& mode) const;
-  bool getClosureRequested(bool& closureRequested) const;
-
-  [[nodiscard]] const EntityId& getDestId() const;
-  void setDestId(EntityId id);
-
- private:
-  EntityId destId;
-  uint8_t metadataOnly = true;
-  // Transaction parameters. Omitted if the put request is metadata only.
-  cfdp::StringLv sourceName;
-
-  cfdp::StringLv destName;
-  bool hasTransmissionMode = false;
-  uint8_t transmissionMode = TransmissionMode::UNACKNOWLEDGED;
-  bool hasClosureRequested = false;
-  uint8_t closureRequested = false;
-  // Metadata
-  size_t msgsToUsersTotalSize = 0;
-  const uint8_t* msgsToUserStartPtr = nullptr;
-  size_t fsRequestsTotalSize = 0;
-  const uint8_t* fsRequestStartPtr = nullptr;
-};
-
-}  // namespace cfdp
--- a/src/fsfw/cfdp/handler/RemoteConfigTableIF.h
+++ b/src/fsfw/cfdp/handler/RemoteConfigTableIF.h
@ -16,7 +16,7 @@ class RemoteConfigTableIF {
 */
 class OneRemoteConfigProvider : public RemoteConfigTableIF {
 public:
-  explicit OneRemoteConfigProvider(RemoteEntityCfg& cfg) : cfg(cfg) {}
+  explicit OneRemoteConfigProvider(RemoteEntityCfg cfg) : cfg(std::move(cfg)) {}

  bool getRemoteCfg(const EntityId& remoteId, cfdp::RemoteEntityCfg** cfg_) override {
    if (remoteId != cfg.remoteId) {
@ -27,7 +27,7 @@ class OneRemoteConfigProvider : public RemoteConfigTableIF {
  }

 private:
-  RemoteEntityCfg& cfg;
+  RemoteEntityCfg cfg;
 };

 }  // namespace cfdp
--- a/src/fsfw/cfdp/handler/ReservedMessageParser.cpp
+++ b/src/fsfw/cfdp/handler/ReservedMessageParser.cpp
@ -1,74 +0,0 @@
-#include "ReservedMessageParser.h"
-
-#include "fsfw/cfdp/CfdpMessage.h"
-#include "fsfw/cfdp/handler/PutRequest.h"
-#include "fsfw/cfdp/tlv/MessageToUserTlv.h"
-#include "fsfw/ipc/CommandMessage.h"
-#include "fsfw/ipc/QueueFactory.h"
-
-using namespace returnvalue;
-
-cfdp::ReservedMessageParser::ReservedMessageParser(StorageManagerIF& ipcStore,
-                                                   MessageQueueIF& msgQueue,
-                                                   MessageQueueId_t userDestination)
-    : msgQueue(msgQueue), ipcStore(ipcStore), userDestination(userDestination) {}
-
-ReturnValue_t cfdp::ReservedMessageParser::parse(const MessageToUserTlv* msgsToUserArray,
-                                                 size_t numMsgToUser) {
-  ReturnValue_t result = returnvalue::OK;
-  cfdp::StringLv sourceFileName;
-  cfdp::StringLv destFileName;
-  PutRequest putRequest;
-  const uint8_t* currentPtr = nullptr;
-  size_t deserSize = 0;
-  bool needToSendPutRequest = false;
-  for (size_t idx = 0; idx < numMsgToUser; idx++) {
-    if (&msgsToUserArray[idx] == nullptr) {
-      continue;
-    }
-    uint8_t messageType = 0;
-    if (msgsToUserArray[idx].isReservedCfdpMessage(messageType, &currentPtr, deserSize)) {
-      if (messageType == static_cast<uint8_t>(ProxyOpMessageType::PUT_REQUEST)) {
-        EntityId entityIdLv;
-        result = entityIdLv.deSerializeFromLv(&currentPtr, &deserSize);
-        if (result != returnvalue::OK) {
-          return result;
-        }
-        putRequest.setDestId(entityIdLv);
-        result =
-            sourceFileName.deSerialize(&currentPtr, &deserSize, SerializeIF::Endianness::NETWORK);
-        if (result != OK) {
-          return result;
-        }
-        result =
-            destFileName.deSerialize(&currentPtr, &deserSize, SerializeIF::Endianness::NETWORK);
-        if (result != OK) {
-          return result;
-        }
-        putRequest.setSourceAndDestName(sourceFileName, destFileName);
-        needToSendPutRequest = true;
-      }
-    }
-  }
-  if (needToSendPutRequest) {
-    store_address_t storeId;
-    uint8_t* dataPtr;
-    result = ipcStore.getFreeElement(&storeId, putRequest.getSerializedSize(), &dataPtr);
-    if (result != OK) {
-      return result;
-    }
-    size_t serLen = 0;
-    result = putRequest.serialize(&dataPtr, &serLen, putRequest.getSerializedSize(),
-                                  SerializeIF::Endianness::MACHINE);
-    if (result != OK) {
-      return result;
-    }
-    CommandMessage msg;
-    CfdpMessage::setPutRequest(&msg, storeId);
-    result = msgQueue.sendMessage(userDestination, &msg);
-    if (result != OK) {
-      return result;
-    }
-  }
-  return OK;
-}
--- a/src/fsfw/cfdp/handler/ReservedMessageParser.h
+++ b/src/fsfw/cfdp/handler/ReservedMessageParser.h
@ -1,27 +0,0 @@
-#pragma once
-
-#include "fsfw/cfdp/tlv/MessageToUserTlv.h"
-#include "fsfw/ipc/MessageQueueIF.h"
-#include "fsfw/storagemanager/StorageManagerIF.h"
-
-namespace cfdp {
-
-/**
- * This class parses messages to user for special CFDP messages and converts them to appropriate
- * CFDP requests sent via the IPC store where applicable. It also provides an API to retrieve
- * custom messages which are not special CFDP messages from a provided bytestream.
- */
-class ReservedMessageParser {
- public:
-  ReservedMessageParser(StorageManagerIF& ipcStore, MessageQueueIF& msgQueue,
-                        MessageQueueId_t userDestination);
-
-  ReturnValue_t parse(const MessageToUserTlv* msgsToUserArray, size_t numMsgsToUser);
-
- private:
-  MessageQueueIF& msgQueue;
-  StorageManagerIF& ipcStore;
-  MessageQueueId_t userDestination;
-};
-
-}  // namespace cfdp
--- a/src/fsfw/cfdp/handler/SourceHandler.cpp
+++ b/src/fsfw/cfdp/handler/SourceHandler.cpp
@ -1,376 +1 @@
 #include "SourceHandler.h"
-
-#include <etl/crc32.h>
-
-#include <array>
-
-#include "fsfw/cfdp/pdu/EofPduCreator.h"
-#include "fsfw/cfdp/pdu/FileDataCreator.h"
-#include "fsfw/cfdp/pdu/MetadataPduCreator.h"
-#include "fsfw/filesystem/HasFileSystemIF.h"
-#include "fsfw/globalfunctions/arrayprinter.h"
-#include "fsfw/objectmanager.h"
-#include "fsfw/serviceinterface.h"
-#include "fsfw/tasks/TaskFactory.h"
-#include "fsfw/tmtcservices/TmTcMessage.h"
-
-using namespace returnvalue;
-
-cfdp::SourceHandler::SourceHandler(SourceHandlerParams params, FsfwParams fsfwParams)
-    : sourceParams(std::move(params)), fsfwParams(fsfwParams) {
-  // The entity ID portion of the transaction ID will always remain fixed.
-  transactionParams.id.entityId = sourceParams.cfg.localId;
-  transactionParams.pduConf.sourceId = sourceParams.cfg.localId;
-  if (sourceParams.seqCountProvider.bitWidth() == 8) {
-    transactionParams.pduConf.seqNum.setWidth(cfdp::WidthInBytes::ONE_BYTE);
-  } else if (sourceParams.seqCountProvider.bitWidth() == 16) {
-    transactionParams.pduConf.seqNum.setWidth(cfdp::WidthInBytes::TWO_BYTES);
-  } else if (sourceParams.seqCountProvider.bitWidth() == 32) {
-    transactionParams.pduConf.seqNum.setWidth(cfdp::WidthInBytes::FOUR_BYTES);
-  } else if (sourceParams.seqCountProvider.bitWidth() == 64) {
-    transactionParams.pduConf.seqNum.setWidth(cfdp::WidthInBytes::EIGHT_BYTES);
-  } else {
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "cfdp::SourceHandler: Seq count provider bit width "
-               << sourceParams.seqCountProvider.bitWidth() << " not allowed" << std::endl;
-#else
-    sif::printError("cfdp::SourceHandler: Seq count provider bit width %d not allowed\n",
-                    sourceParams.seqCountProvider.bitWidth());
-#endif
-    // Yeah, what am I supposed to do here? Can't throw an exception in the FSFW..
-    transactionParams.pduConf.seqNum.setWidth(cfdp::WidthInBytes::ONE_BYTE);
-  }
-  transactionParams.pduConf.seqNum.setValue(0);
-}
-
-cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::fsmNacked() {
-  ReturnValue_t result;
-  if (step == TransactionStep::IDLE) {
-    step = TransactionStep::TRANSACTION_START;
-  }
-  if (step == TransactionStep::TRANSACTION_START) {
-    sourceParams.user.transactionIndication(transactionParams.id);
-    result = checksumGeneration();
-    if (result != OK) {
-      addError(result);
-    }
-    step = TransactionStep::SENDING_METADATA;
-  }
-  if (step == TransactionStep::SENDING_METADATA) {
-    result = prepareAndSendMetadataPdu();
-    if (result != OK) {
-      addError(result);
-    }
-    fsmResult.callStatus = CallStatus::CALL_AGAIN;
-    return fsmResult;
-  }
-  if (step == TransactionStep::SENDING_FILE_DATA) {
-    bool noFdPdu = false;
-    result = prepareAndSendNextFileDataPdu(noFdPdu);
-    if (result == OK and !noFdPdu) {
-      fsmResult.callStatus = CallStatus::CALL_AGAIN;
-      return fsmResult;
-    }
-  }
-  if (step == TransactionStep::SENDING_EOF) {
-    result = prepareAndSendEofPdu();
-    if (result != OK) {
-      addError(result);
-    }
-    if (sourceParams.cfg.indicCfg.eofSentIndicRequired) {
-      sourceParams.user.eofSentIndication(transactionParams.id);
-    }
-    if (transactionParams.closureRequested) {
-      step = TransactionStep::WAIT_FOR_FINISH;
-      fsmResult.callStatus = CallStatus::CALL_AFTER_DELAY;
-    } else {
-      step = TransactionStep::NOTICE_OF_COMPLETION;
-      fsmResult.callStatus = CallStatus::CALL_AGAIN;
-    }
-    return fsmResult;
-  }
-  if (step == TransactionStep::WAIT_FOR_FINISH) {
-    // TODO: In case this is a request with closure, wait for finish.
-    // Done, issue notice of completion
-    step = TransactionStep::NOTICE_OF_COMPLETION;
-  }
-  if (step == TransactionStep::NOTICE_OF_COMPLETION) {
-    noticeOfCompletion();
-    reset();
-  }
-  return fsmResult;
-}
-
-const cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::stateMachine() {
-  fsmResult.packetsSent = 0;
-  fsmResult.errors = 0;
-  fsmResult.callStatus = CallStatus::DONE;
-  if (state == cfdp::CfdpState::IDLE) {
-    return fsmResult;
-  }
-  if (state == cfdp::CfdpState::BUSY_CLASS_1_NACKED) {
-    return fsmNacked();
-  }
-  return fsmResult;
-}
-
-ReturnValue_t cfdp::SourceHandler::checksumGeneration() {
-  if (transactionParams.fileSize.value() == 0) {
-    // NULL checksum for empty file.
-    transactionParams.crc = 0;
-    return OK;
-  }
-  std::array<uint8_t, 1024> buf{};
-  etl::crc32 crcCalc;
-  uint64_t currentOffset = 0;
-  FileOpParams params(transactionParams.sourceName.data(), transactionParams.fileSize.value());
-  while (currentOffset < transactionParams.fileSize.value()) {
-    uint64_t readLen;
-    if (currentOffset + buf.size() > transactionParams.fileSize.value()) {
-      readLen = transactionParams.fileSize.value() - currentOffset;
-    } else {
-      readLen = buf.size();
-    }
-    if (readLen > 0) {
-      params.offset = currentOffset;
-      params.size = readLen;
-      auto result = sourceParams.user.vfs.readFromFile(params, buf.data(), buf.size());
-      if (result != OK) {
-        addError(result);
-        return FAILED;
-      }
-      crcCalc.add(buf.begin(), buf.begin() + readLen);
-    }
-    currentOffset += readLen;
-  }
-
-  transactionParams.crc = crcCalc.value();
-  return OK;
-}
-
-ReturnValue_t cfdp::SourceHandler::transactionStart(PutRequest& putRequest, RemoteEntityCfg& cfg) {
-  if (state != CfdpState::IDLE) {
-    return SOURCE_TRANSACTION_PENDING;
-  }
-  if (cfg.remoteId != putRequest.getDestId()) {
-    return WRONG_REMOTE_CFG_ENTITY_ID;
-  }
-  if (putRequest.getSourceName().getValueLen() == 0) {
-    return SOURCE_NAME_EMPTY;
-  }
-  if (putRequest.getDestName().getValueLen() == 0) {
-    return DEST_NAME_EMPTY;
-  }
-  const char* srcNamePtr = putRequest.getSourceName().getCString(transactionParams.sourceNameSize);
-  const char* destNamePtr = putRequest.getDestName().getCString(transactionParams.destNameSize);
-  std::strncpy(transactionParams.sourceName.data(), srcNamePtr, transactionParams.sourceNameSize);
-  std::strncpy(transactionParams.destName.data(), destNamePtr, transactionParams.destNameSize);
-  // Add 0 termination. The source and dest name size can not be larger than UINT8_MAX, so this
-  // operation is safe.
-  transactionParams.sourceName[transactionParams.sourceNameSize] = '\0';
-  transactionParams.destName[transactionParams.destNameSize] = '\0';
-  FilesystemParams params(transactionParams.sourceName.data());
-  if (!sourceParams.user.vfs.fileExists(params)) {
-    return FILE_DOES_NOT_EXIST;
-  }
-  if (cfg.maxFileSegmentLen > fileBuf.size() or cfg.maxFileSegmentLen == 0) {
-    return FILE_SEGMENT_LEN_INVALID;
-  }
-  // If transmission mode is not set, use default transmission mode for the remote entity.
-  if (not putRequest.getTransmissionMode(transactionParams.pduConf.mode)) {
-    transactionParams.pduConf.mode = cfg.defaultTransmissionMode;
-  }
-  // If closure request field is not set, use default option for the remote entity.
-  if (not putRequest.getClosureRequested(transactionParams.closureRequested)) {
-    transactionParams.closureRequested = cfg.closureRequested;
-  }
-  const EntityId& destId = putRequest.getDestId();
-  // The width of the source and destination ID must be the same. Use the larger ID value to
-  // ensure the width is large enough for both IDs
-  if (destId.getWidth() > transactionParams.pduConf.sourceId.getWidth()) {
-    transactionParams.pduConf.destId = destId;
-    transactionParams.pduConf.sourceId.setWidth(destId.getWidth());
-  } else {
-    transactionParams.pduConf.destId.setValueAndWidth(transactionParams.pduConf.sourceId.getWidth(),
-                                                      destId.getValue());
-  }
-  // Only used for PDU forwarding, file is sent to file receiver regularly here.
-  transactionParams.pduConf.direction = Direction::TOWARDS_RECEIVER;
-  transactionParams.pduConf.seqNum.setValue(sourceParams.seqCountProvider.getAndIncrement());
-  transactionParams.id.seqNum = transactionParams.pduConf.seqNum;
-
-  if (transactionParams.pduConf.mode == TransmissionMode::ACKNOWLEDGED) {
-    state = cfdp::CfdpState::BUSY_CLASS_2_ACKED;
-  } else if (transactionParams.pduConf.mode == TransmissionMode::UNACKNOWLEDGED) {
-    state = cfdp::CfdpState::BUSY_CLASS_1_NACKED;
-  }
-  step = TransactionStep::IDLE;
-  uint64_t fileSize = 0;
-  sourceParams.user.vfs.getFileSize(params, fileSize);
-  transactionParams.pduConf.largeFile = false;
-  if (fileSize > UINT32_MAX) {
-    transactionParams.pduConf.largeFile = true;
-  }
-  if (fileSize == 0) {
-    transactionParams.checksumType = ChecksumType::NULL_CHECKSUM;
-  } else {
-    transactionParams.checksumType = ChecksumType::CRC_32;
-  }
-  transactionParams.fileSize.setFileSize(fileSize, transactionParams.pduConf.largeFile);
-  transactionParams.progress = 0;
-  transactionParams.remoteCfg = cfg;
-  return OK;
-}
-
-ReturnValue_t cfdp::SourceHandler::prepareAndSendMetadataPdu() {
-  cfdp::StringLv sourceName(transactionParams.sourceName.data(), transactionParams.sourceNameSize);
-  cfdp::StringLv destName(transactionParams.destName.data(), transactionParams.destNameSize);
-  auto metadataInfo =
-      MetadataGenericInfo(transactionParams.closureRequested, transactionParams.checksumType,
-                          transactionParams.fileSize);
-  auto metadataPdu =
-      MetadataPduCreator(transactionParams.pduConf, metadataInfo, sourceName, destName, nullptr, 0);
-  ReturnValue_t result = sendGenericPdu(metadataPdu);
-  if (result != OK) {
-    return result;
-  }
-  // Advance FSM if everything works
-  step = TransactionStep::SENDING_FILE_DATA;
-  return OK;
-}
-
-ReturnValue_t cfdp::SourceHandler::prepareAndSendNextFileDataPdu(bool& noFileDataPdu) {
-  cfdp::Fss offset(transactionParams.progress);
-  uint64_t readLen;
-  uint64_t fileSize = transactionParams.fileSize.value();
-  noFileDataPdu = false;
-  if (fileSize == 0) {
-    // We are done, no need to send file data PDUs for an empty file.
-    step = TransactionStep::SENDING_EOF;
-    noFileDataPdu = true;
-    return OK;
-  }
-  if (fileSize < transactionParams.remoteCfg.maxFileSegmentLen) {
-    readLen = transactionParams.fileSize.value();
-  } else {
-    if (transactionParams.progress + transactionParams.remoteCfg.maxFileSegmentLen > fileSize) {
-      readLen = fileSize - transactionParams.progress;
-    } else {
-      readLen = transactionParams.remoteCfg.maxFileSegmentLen;
-    }
-  }
-  FileOpParams fileParams(transactionParams.sourceName.data(), readLen);
-  fileParams.offset = transactionParams.progress;
-  ReturnValue_t result =
-      sourceParams.user.vfs.readFromFile(fileParams, fileBuf.data(), fileBuf.size());
-  if (result != returnvalue::OK) {
-    addError(result);
-    return result;
-  }
-  auto fileDataInfo = FileDataInfo(offset, fileBuf.data(), readLen);
-  auto fileDataPdu = FileDataCreator(transactionParams.pduConf, fileDataInfo);
-  result = sendGenericPdu(fileDataPdu);
-  if (result != OK) {
-    return result;
-  }
-  transactionParams.progress += readLen;
-  if (transactionParams.progress >= fileSize) {
-    // Advance FSM after all file data PDUs were sent.
-    step = TransactionStep::SENDING_EOF;
-  }
-  return OK;
-}
-
-ReturnValue_t cfdp::SourceHandler::prepareAndSendEofPdu() {
-  auto eofInfo =
-      EofInfo(ConditionCode::NO_ERROR, transactionParams.crc, transactionParams.fileSize);
-  auto eofPdu = EofPduCreator(transactionParams.pduConf, eofInfo);
-  ReturnValue_t result = sendGenericPdu(eofPdu);
-  if (result != OK) {
-    return result;
-  }
-  return OK;
-}
-
-ReturnValue_t cfdp::SourceHandler::initialize() {
-  if (fsfwParams.tmStore == nullptr) {
-    fsfwParams.tmStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TM_STORE);
-    if (fsfwParams.tmStore == nullptr) {
-      return FAILED;
-    }
-  }
-
-  if (fsfwParams.tcStore == nullptr) {
-    fsfwParams.tcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
-    if (fsfwParams.tcStore == nullptr) {
-      return FAILED;
-    }
-  }
-
-  if (fsfwParams.msgQueue == nullptr) {
-    return FAILED;
-  }
-  return OK;
-}
-
-ReturnValue_t cfdp::SourceHandler::sendGenericPdu(const SerializeIF& pdu) {
-  uint8_t* dataPtr;
-  store_address_t storeId;
-  ReturnValue_t result =
-      fsfwParams.tmStore->getFreeElement(&storeId, pdu.getSerializedSize(), &dataPtr);
-  if (result != OK) {
-    addError(result);
-    fsmResult.callStatus = CallStatus::CALL_AFTER_DELAY;
-    if (result == StorageManagerIF::DATA_STORAGE_FULL) {
-      return TM_STORE_FULL;
-    }
-    return result;
-  }
-  size_t serializedLen = 0;
-  result = pdu.serializeBe(dataPtr, serializedLen, pdu.getSerializedSize());
-  if (result != OK) {
-    addError(result);
-    return result;
-  }
-  TmTcMessage tmMsg(storeId);
-  result =
-      fsfwParams.msgQueue->sendMessage(fsfwParams.packetDest.getReportReceptionQueue(), &tmMsg);
-  if (result != OK) {
-    fsmResult.callStatus = CallStatus::CALL_AFTER_DELAY;
-  }
-  if (result == MessageQueueIF::FULL) {
-    return TARGET_MSG_QUEUE_FULL;
-  } else if (result == OK) {
-    fsmResult.packetsSent += 1;
-  }
-  return result;
-}
-
-ReturnValue_t cfdp::SourceHandler::noticeOfCompletion() {
-  if (sourceParams.cfg.indicCfg.transactionFinishedIndicRequired) {
-    cfdp::TransactionFinishedParams params(transactionParams.id, ConditionCode::NO_ERROR,
-                                           FileDeliveryCode::DATA_COMPLETE,
-                                           FileDeliveryStatus::RETAINED_IN_FILESTORE);
-    sourceParams.user.transactionFinishedIndication(params);
-  }
-  return OK;
-}
-
-ReturnValue_t cfdp::SourceHandler::reset() {
-  step = TransactionStep::IDLE;
-  state = cfdp::CfdpState::IDLE;
-  fsmResult.callStatus = CallStatus::DONE;
-  transactionParams.reset();
-  return OK;
-}
-cfdp::CfdpState cfdp::SourceHandler::getState() const { return state; }
-
-cfdp::SourceHandler::TransactionStep cfdp::SourceHandler::getStep() const { return step; }
-
-void cfdp::SourceHandler::addError(ReturnValue_t error) {
-  if (fsmResult.errors < fsmResult.errorCodes.size()) {
-    fsmResult.errorCodes[fsmResult.errors] = error;
-    fsmResult.errors++;
-    fsmResult.result = error;
-  }
-}
--- a/src/fsfw/cfdp/handler/SourceHandler.h
+++ b/src/fsfw/cfdp/handler/SourceHandler.h
@ -1,110 +1,6 @@
 #ifndef FSFW_CFDP_CFDPSOURCEHANDLER_H
 #define FSFW_CFDP_CFDPSOURCEHANDLER_H

-#include <cstdint>
-#include <vector>
-
-#include "UserBase.h"
-#include "defs.h"
-#include "fsfw/cfdp/Fss.h"
-#include "fsfw/cfdp/handler/PutRequest.h"
-#include "fsfw/cfdp/handler/mib.h"
-#include "fsfw/events/EventReportingProxyIF.h"
-#include "fsfw/storagemanager/StorageManagerIF.h"
-#include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
-#include "fsfw/util/ProvidesSeqCountIF.h"
-
-namespace cfdp {
-
-struct SourceHandlerParams {
-  SourceHandlerParams(LocalEntityCfg cfg, UserBase& user, ProvidesSeqCountIF& seqCountProvider)
-      : cfg(std::move(cfg)), user(user), seqCountProvider(seqCountProvider) {}
-
-  LocalEntityCfg cfg;
-  UserBase& user;
-  ProvidesSeqCountIF& seqCountProvider;
-};
-
-class SourceHandler {
- public:
-  enum class TransactionStep : uint8_t {
-    IDLE = 0,
-    TRANSACTION_START = 1,
-    SENDING_METADATA = 3,
-    SENDING_FILE_DATA = 4,
-    SENDING_EOF = 5,
-    WAIT_FOR_ACK = 6,
-    WAIT_FOR_FINISH = 7,
-    NOTICE_OF_COMPLETION = 8
-  };
-  struct FsmResult {
-   public:
-    ReturnValue_t result = returnvalue::OK;
-    CallStatus callStatus = CallStatus::CALL_AFTER_DELAY;
-    CfdpState state = CfdpState::IDLE;
-    uint32_t packetsSent = 0;
-    uint8_t errors = 0;
-    std::array<ReturnValue_t, 3> errorCodes = {};
-  };
-
-  SourceHandler(SourceHandlerParams params, FsfwParams fsfwParams);
-
-  [[nodiscard]] CfdpState getState() const;
-  [[nodiscard]] TransactionStep getStep() const;
-
-  /**
-   * Pass a put request to the source handler, which might initiate a CFDP transaction and start
-   * the state machine
-   * @return
-   */
-  ReturnValue_t transactionStart(PutRequest& putRequest, RemoteEntityCfg& cfg);
-  const FsmResult& stateMachine();
-
-  ReturnValue_t initialize();
-
- private:
-  struct TransactionParams {
-    uint32_t crc{};
-    std::array<char, UINT8_MAX + 1> sourceName{};
-    size_t sourceNameSize = 0;
-    std::array<char, UINT8_MAX + 1> destName{};
-    size_t destNameSize = 0;
-    cfdp::Fss fileSize;
-    size_t progress = 0;
-    bool closureRequested = false;
-    ChecksumType checksumType = ChecksumType::NULL_CHECKSUM;
-    RemoteEntityCfg remoteCfg;
-    PduConfig pduConf;
-    cfdp::TransactionId id{};
-
-    void reset() {
-      sourceNameSize = 0;
-      destNameSize = 0;
-      fileSize.setFileSize(0, false);
-      progress = 0;
-      closureRequested = false;
-    }
-  } transactionParams;
-
-  cfdp::CfdpState state = cfdp::CfdpState::IDLE;
-  TransactionStep step = TransactionStep::IDLE;
-  std::array<uint8_t, 4096> fileBuf{};
-  SourceHandlerParams sourceParams;
-  cfdp::FsfwParams fsfwParams;
-  FsmResult fsmResult;
-
-  FsmResult& fsmNacked();
-  ReturnValue_t checksumGeneration();
-  ReturnValue_t prepareAndSendMetadataPdu();
-  ReturnValue_t prepareAndSendNextFileDataPdu(bool& noFileDataPdu);
-  ReturnValue_t prepareAndSendEofPdu();
-  ReturnValue_t noticeOfCompletion();
-  ReturnValue_t reset();
-
-  [[nodiscard]] ReturnValue_t sendGenericPdu(const SerializeIF& pdu);
-  void addError(ReturnValue_t error);
-};
-
-}  // namespace cfdp
+class SourceHandler {};

 #endif  // FSFW_CFDP_CFDPSOURCEHANDLER_H
--- a/src/fsfw/cfdp/handler/UserBase.h
+++ b/src/fsfw/cfdp/handler/UserBase.h
@ -6,7 +6,6 @@
 #include <vector>

 #include "StatusReportIF.h"
-#include "fsfw/cfdp/Fss.h"
 #include "fsfw/cfdp/VarLenFields.h"
 #include "fsfw/cfdp/tlv/FilestoreResponseTlv.h"
 #include "fsfw/cfdp/tlv/MessageToUserTlv.h"
@ -28,14 +27,14 @@ struct TransactionFinishedParams {
 };

 struct MetadataRecvdParams {
-  MetadataRecvdParams(const TransactionId& id, const EntityId& sourceId, Fss fileSize)
-      : id(id), sourceId(sourceId), fileSize(std::move(fileSize)) {}
+  MetadataRecvdParams(const TransactionId& id, const EntityId& sourceId)
+      : id(id), sourceId(sourceId) {}
  const TransactionId& id;
  const EntityId& sourceId;
-  Fss fileSize{};
+  uint64_t fileSize = 0;
  const char* sourceFileName = "";
  const char* destFileName = "";
-  size_t numberOfMsgsToUser = 0;
+  size_t msgsToUserLen = 0;
  const MessageToUserTlv* msgsToUserArray = nullptr;
 };

@ -66,7 +65,6 @@ struct FileSegmentRecvdParams {
 */
 class UserBase {
  friend class DestHandler;
-  friend class SourceHandler;

 public:
  explicit UserBase(HasFileSystemIF& vfs);
--- a/src/fsfw/cfdp/handler/defs.h
+++ b/src/fsfw/cfdp/handler/defs.h
@ -1,54 +1,11 @@
 #ifndef FSFW_CFDP_HANDLER_DEFS_H
 #define FSFW_CFDP_HANDLER_DEFS_H

-#include <etl/list.h>
-
-#include "fsfw/storagemanager/StorageManagerIF.h"
-#include "fsfw/storagemanager/storeAddress.h"
-#include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
-
 namespace cfdp {

-enum class CfdpState { IDLE, BUSY_CLASS_1_NACKED, BUSY_CLASS_2_ACKED, SUSPENDED };
+enum class CfdpStates { IDLE, BUSY_CLASS_1_NACKED, BUSY_CLASS_2_ACKED, SUSPENDED };

 static constexpr uint8_t SSID = SUBSYSTEM_ID::CFDP;
-static constexpr uint8_t CID = CLASS_ID::CFDP_HANDLER;
-
-struct PacketInfo {
-  PacketInfo(PduType type, store_address_t storeId,
-             std::optional<FileDirective> directive = std::nullopt)
-      : pduType(type), directiveType(directive), storeId(storeId) {}
-
-  PduType pduType = PduType::FILE_DATA;
-  std::optional<FileDirective> directiveType = FileDirective::INVALID_DIRECTIVE;
-  store_address_t storeId = store_address_t::invalid();
-  PacketInfo() = default;
-};
-
-struct FsfwParams {
-  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-             EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore,
-             StorageManagerIF& tmStore)
-      : FsfwParams(packetDest, msgQueue, eventReporter) {
-    this->tcStore = &tcStore;
-    this->tmStore = &tmStore;
-  }
-
-  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-             EventReportingProxyIF* eventReporter)
-      : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
-  AcceptsTelemetryIF& packetDest;
-  MessageQueueIF* msgQueue;
-  EventReportingProxyIF* eventReporter = nullptr;
-  StorageManagerIF* tcStore = nullptr;
-  StorageManagerIF* tmStore = nullptr;
-};
-
-template <size_t SIZE>
-using PacketInfoList = etl::list<PacketInfo, SIZE>;
-using PacketInfoListBase = etl::ilist<PacketInfo>;
-
-enum class CallStatus { DONE, CALL_AFTER_DELAY, CALL_AGAIN };

 namespace events {

@ -58,19 +15,8 @@ static constexpr Event SERIALIZATION_ERROR = event::makeEvent(SSID, 2, severity:
 static constexpr Event FILESTORE_ERROR = event::makeEvent(SSID, 3, severity::LOW);
 //! [EXPORT] : [COMMENT] P1: Transaction step ID, P2: 0 for source file name, 1 for dest file name
 static constexpr Event FILENAME_TOO_LARGE_ERROR = event::makeEvent(SSID, 4, severity::LOW);
-//! [EXPORT] : [COMMENT] CFDP request handling failed. P2: Returncode.
-static constexpr Event HANDLING_CFDP_REQUEST_FAILED = event::makeEvent(SSID, 5, severity::LOW);

 }  // namespace events

-static constexpr ReturnValue_t SOURCE_TRANSACTION_PENDING = returnvalue::makeCode(CID, 0);
-static constexpr ReturnValue_t FILE_DOES_NOT_EXIST = returnvalue::makeCode(CID, 1);
-static constexpr ReturnValue_t FILE_SEGMENT_LEN_INVALID = returnvalue::makeCode(CID, 2);
-static constexpr ReturnValue_t SOURCE_NAME_EMPTY = returnvalue::makeCode(CID, 3);
-static constexpr ReturnValue_t DEST_NAME_EMPTY = returnvalue::makeCode(CID, 4);
-static constexpr ReturnValue_t WRONG_REMOTE_CFG_ENTITY_ID = returnvalue::makeCode(CID, 5);
-static constexpr ReturnValue_t TARGET_MSG_QUEUE_FULL = returnvalue::makeCode(CID, 6);
-static constexpr ReturnValue_t TM_STORE_FULL = returnvalue::makeCode(CID, 7);
-
 }  // namespace cfdp
 #endif  // FSFW_CFDP_HANDLER_DEFS_H
--- a/src/fsfw/cfdp/handler/mib.h
+++ b/src/fsfw/cfdp/handler/mib.h
@ -27,15 +27,14 @@ struct LocalEntityCfg {
 };

 struct RemoteEntityCfg {
-  RemoteEntityCfg() = default;
  explicit RemoteEntityCfg(EntityId id) : remoteId(std::move(id)) {}
  EntityId remoteId;
-  size_t maxFileSegmentLen = 1024;
+  size_t maxFileSegmentLen = 2048;
  bool closureRequested = false;
  bool crcOnTransmission = false;
  TransmissionMode defaultTransmissionMode = TransmissionMode::UNACKNOWLEDGED;
  ChecksumType defaultChecksum = ChecksumType::NULL_CHECKSUM;
-  uint8_t version = CFDP_VERSION_2;
+  const uint8_t version = CFDP_VERSION_2;
 };

 }  // namespace cfdp
--- a/src/fsfw/cfdp/pdu/CMakeLists.txt
+++ b/src/fsfw/cfdp/pdu/CMakeLists.txt
@ -17,7 +17,7 @@ target_sources(
          FinishedInfo.cpp
          FinishedPduCreator.cpp
          FinishedPduReader.cpp
-          MetadataGenericInfo.cpp
+          MetadataInfo.cpp
          MetadataPduCreator.cpp
          MetadataPduReader.cpp
          KeepAlivePduCreator.cpp
--- a/src/fsfw/cfdp/pdu/EofInfo.cpp
+++ b/src/fsfw/cfdp/pdu/EofInfo.cpp
@ -1,13 +1,8 @@
 #include "EofInfo.h"

-#include <utility>
-
-EofInfo::EofInfo(cfdp::ConditionCode conditionCode, uint32_t checksum, cfdp::Fss fileSize,
+EofInfo::EofInfo(cfdp::ConditionCode conditionCode, uint32_t checksum, cfdp::FileSize fileSize,
                 EntityIdTlv* faultLoc)
-    : conditionCode(conditionCode),
-      checksum(checksum),
-      fileSize(std::move(fileSize)),
-      faultLoc(faultLoc) {}
+    : conditionCode(conditionCode), checksum(checksum), fileSize(fileSize), faultLoc(faultLoc) {}

 EofInfo::EofInfo(EntityIdTlv* faultLoc)
    : conditionCode(cfdp::ConditionCode::NO_CONDITION_FIELD),
@ -21,15 +16,15 @@ cfdp::ConditionCode EofInfo::getConditionCode() const { return conditionCode; }

 EntityIdTlv* EofInfo::getFaultLoc() const { return faultLoc; }

-cfdp::Fss& EofInfo::getFileSize() { return fileSize; }
+cfdp::FileSize& EofInfo::getFileSize() { return fileSize; }

-void EofInfo::setChecksum(uint32_t checksum_) { this->checksum = checksum_; }
+void EofInfo::setChecksum(uint32_t checksum) { this->checksum = checksum; }

-void EofInfo::setConditionCode(cfdp::ConditionCode conditionCode_) {
-  this->conditionCode = conditionCode_;
+void EofInfo::setConditionCode(cfdp::ConditionCode conditionCode) {
+  this->conditionCode = conditionCode;
 }

-void EofInfo::setFaultLoc(EntityIdTlv* faultLoc_) { this->faultLoc = faultLoc_; }
+void EofInfo::setFaultLoc(EntityIdTlv* faultLoc) { this->faultLoc = faultLoc; }

 size_t EofInfo::getSerializedSize(bool fssLarge) {
  // Condition code + spare + 4 byte checksum
@ -47,6 +42,6 @@ size_t EofInfo::getSerializedSize(bool fssLarge) {
  return size;
 }

-ReturnValue_t EofInfo::setFileSize(size_t fileSize_, bool isLarge) {
-  return this->fileSize.setFileSize(fileSize_, isLarge);
+ReturnValue_t EofInfo::setFileSize(size_t fileSize, bool isLarge) {
+  return this->fileSize.setFileSize(fileSize, isLarge);
 }
--- a/src/fsfw/cfdp/pdu/EofInfo.h
+++ b/src/fsfw/cfdp/pdu/EofInfo.h
@ -1,14 +1,14 @@
 #ifndef FSFW_SRC_FSFW_CFDP_PDU_EOFINFO_H_
 #define FSFW_SRC_FSFW_CFDP_PDU_EOFINFO_H_

-#include "../Fss.h"
+#include "../FileSize.h"
 #include "../definitions.h"
 #include "fsfw/cfdp/tlv/EntityIdTlv.h"

 struct EofInfo {
 public:
  explicit EofInfo(EntityIdTlv* faultLoc = nullptr);
-  EofInfo(cfdp::ConditionCode conditionCode, uint32_t checksum, cfdp::Fss fileSize,
+  EofInfo(cfdp::ConditionCode conditionCode, uint32_t checksum, cfdp::FileSize fileSize,
          EntityIdTlv* faultLoc = nullptr);

  size_t getSerializedSize(bool fssLarge = false);
@ -17,7 +17,7 @@ struct EofInfo {
  [[nodiscard]] cfdp::ConditionCode getConditionCode() const;

  [[nodiscard]] EntityIdTlv* getFaultLoc() const;
-  cfdp::Fss& getFileSize();
+  cfdp::FileSize& getFileSize();
  void setChecksum(uint32_t checksum);
  void setConditionCode(cfdp::ConditionCode conditionCode);
  void setFaultLoc(EntityIdTlv* faultLoc);
@ -26,7 +26,7 @@ struct EofInfo {
 private:
  cfdp::ConditionCode conditionCode;
  uint32_t checksum;
-  cfdp::Fss fileSize;
+  cfdp::FileSize fileSize;
  EntityIdTlv* faultLoc = nullptr;
 };

--- a/src/fsfw/cfdp/pdu/FileDataCreator.cpp
+++ b/src/fsfw/cfdp/pdu/FileDataCreator.cpp
@ -37,7 +37,7 @@ ReturnValue_t FileDataCreator::serialize(uint8_t** buffer, size_t* size, size_t
    *buffer += segmentMetadataLen;
    *size += segmentMetadataLen;
  }
-  cfdp::Fss& offset = info.getOffset();
+  cfdp::FileSize& offset = info.getOffset();
  result = offset.serialize(this->getLargeFileFlag(), buffer, size, maxSize, streamEndianness);
  if (result != returnvalue::OK) {
    return result;
--- a/src/fsfw/cfdp/pdu/FileDataInfo.cpp
+++ b/src/fsfw/cfdp/pdu/FileDataInfo.cpp
@ -1,9 +1,9 @@
 #include "FileDataInfo.h"

-#include <utility>
+FileDataInfo::FileDataInfo(cfdp::FileSize &offset, const uint8_t *fileData, size_t fileSize)
+    : offset(offset), fileData(fileData), fileSize(fileSize) {}

-FileDataInfo::FileDataInfo(cfdp::Fss offset, const uint8_t *fileData, size_t fileSize)
-    : offset(std::move(offset)), fileData(fileData), fileSize(fileSize) {}
+FileDataInfo::FileDataInfo(cfdp::FileSize &offset) : offset(offset) {}

 void FileDataInfo::setSegmentMetadataFlag(bool enable) {
  if (enable) {
@ -71,7 +71,7 @@ const uint8_t *FileDataInfo::getSegmentMetadata(size_t *segmentMetadataLen_) {
  return segmentMetadata;
 }

-cfdp::Fss &FileDataInfo::getOffset() { return offset; }
+cfdp::FileSize &FileDataInfo::getOffset() { return offset; }

 void FileDataInfo::setRecordContinuationState(cfdp::RecordContinuationState recContState) {
  this->recContState = recContState;
--- a/src/fsfw/cfdp/pdu/FileDataInfo.h
+++ b/src/fsfw/cfdp/pdu/FileDataInfo.h
@ -1,17 +1,17 @@
 #ifndef FSFW_SRC_FSFW_CFDP_PDU_FILEDATAINFO_H_
 #define FSFW_SRC_FSFW_CFDP_PDU_FILEDATAINFO_H_

-#include <fsfw/cfdp/Fss.h>
+#include <fsfw/cfdp/FileSize.h>
 #include <fsfw/cfdp/definitions.h>

 class FileDataInfo {
 public:
-  FileDataInfo() = default;
-  FileDataInfo(cfdp::Fss offset, const uint8_t* fileData, size_t fileSize);
+  explicit FileDataInfo(cfdp::FileSize& offset);
+  FileDataInfo(cfdp::FileSize& offset, const uint8_t* fileData, size_t fileSize);

  [[nodiscard]] size_t getSerializedSize(bool largeFile = false) const;

-  cfdp::Fss& getOffset();
+  cfdp::FileSize& getOffset();
  const uint8_t* getFileData(size_t* fileSize = nullptr) const;
  void setFileData(const uint8_t* fileData, size_t fileSize);

@ -33,7 +33,7 @@ class FileDataInfo {
 private:
  cfdp::SegmentMetadataFlag segmentMetadataFlag = cfdp::SegmentMetadataFlag::NOT_PRESENT;
  cfdp::SegmentationControl segCtrl = cfdp::SegmentationControl::NO_RECORD_BOUNDARIES_PRESERVATION;
-  cfdp::Fss offset;
+  cfdp::FileSize& offset;
  const uint8_t* fileData = nullptr;
  size_t fileSize = 0;
  cfdp::RecordContinuationState recContState = cfdp::RecordContinuationState::NO_START_NO_END;
--- a/src/fsfw/cfdp/pdu/HeaderCreator.cpp
+++ b/src/fsfw/cfdp/pdu/HeaderCreator.cpp
@ -24,8 +24,8 @@ ReturnValue_t HeaderCreator::serialize(uint8_t **buffer, size_t *size, size_t ma
  *buffer += 1;
  **buffer = pduDataFieldLen & 0x00ff;
  *buffer += 1;
-  **buffer = segmentationCtrl << 7 | ((pduConf.sourceId.getWidth() - 1) << 4) |
-             segmentMetadataFlag << 3 | (pduConf.seqNum.getWidth() - 1);
+  **buffer = segmentationCtrl << 7 | pduConf.sourceId.getWidth() << 4 | segmentMetadataFlag << 3 |
+             pduConf.seqNum.getWidth();
  *buffer += 1;
  *size += 4;
  ReturnValue_t result = pduConf.sourceId.serialize(buffer, size, maxSize, streamEndianness);
--- a/src/fsfw/cfdp/pdu/HeaderReader.cpp
+++ b/src/fsfw/cfdp/pdu/HeaderReader.cpp
@ -78,11 +78,11 @@ cfdp::SegmentationControl PduHeaderReader::getSegmentationControl() const {
 }

 cfdp::WidthInBytes PduHeaderReader::getLenEntityIds() const {
-  return static_cast<cfdp::WidthInBytes>(((pointers.fixedHeader->fourthByte >> 4) & 0b111) + 1);
+  return static_cast<cfdp::WidthInBytes>((pointers.fixedHeader->fourthByte >> 4) & 0x07);
 }

 cfdp::WidthInBytes PduHeaderReader::getLenSeqNum() const {
-  return static_cast<cfdp::WidthInBytes>((pointers.fixedHeader->fourthByte & 0b111) + 1);
+  return static_cast<cfdp::WidthInBytes>(pointers.fixedHeader->fourthByte & 0x07);
 }

 cfdp::SegmentMetadataFlag PduHeaderReader::getSegmentMetadataFlag() const {
@ -103,11 +103,11 @@ void PduHeaderReader::getTransactionSeqNum(cfdp::TransactionSeqNum &seqNum) cons
 }

 void PduHeaderReader::assignVarLenField(cfdp::VarLenField *field, cfdp::WidthInBytes width,
-                                        void *sourcePtr) {
+                                        void *sourcePtr) const {
  switch (width) {
    case (cfdp::WidthInBytes::ONE_BYTE): {
      auto *fieldTyped = static_cast<uint8_t *>(sourcePtr);
-      field->setValueAndWidth(width, *fieldTyped);
+      field->setValue(width, *fieldTyped);
      break;
    }
    case (cfdp::WidthInBytes::TWO_BYTES): {
@ -115,7 +115,7 @@ void PduHeaderReader::assignVarLenField(cfdp::VarLenField *field, cfdp::WidthInB
      size_t deserSize = 0;
      SerializeAdapter::deSerialize(&fieldTyped, static_cast<uint8_t *>(sourcePtr), &deserSize,
                                    SerializeIF::Endianness::NETWORK);
-      field->setValueAndWidth(width, fieldTyped);
+      field->setValue(width, fieldTyped);
      break;
    }
    case (cfdp::WidthInBytes::FOUR_BYTES): {
@ -123,15 +123,7 @@ void PduHeaderReader::assignVarLenField(cfdp::VarLenField *field, cfdp::WidthInB
      size_t deserSize = 0;
      SerializeAdapter::deSerialize(&fieldTyped, static_cast<uint8_t *>(sourcePtr), &deserSize,
                                    SerializeIF::Endianness::NETWORK);
-      field->setValueAndWidth(width, fieldTyped);
-      break;
-    }
-    case (cfdp::WidthInBytes::EIGHT_BYTES): {
-      uint64_t fieldTyped = 0;
-      size_t deserSize = 0;
-      SerializeAdapter::deSerialize(&fieldTyped, static_cast<uint8_t *>(sourcePtr), &deserSize,
-                                    SerializeIF::Endianness::NETWORK);
-      field->setValueAndWidth(width, fieldTyped);
+      field->setValue(width, fieldTyped);
      break;
    }
  }
--- a/src/fsfw/cfdp/pdu/KeepAlivePduCreator.cpp
+++ b/src/fsfw/cfdp/pdu/KeepAlivePduCreator.cpp
@ -1,6 +1,6 @@
 #include "KeepAlivePduCreator.h"

-KeepAlivePduCreator::KeepAlivePduCreator(PduConfig &conf, cfdp::Fss &progress)
+KeepAlivePduCreator::KeepAlivePduCreator(PduConfig &conf, cfdp::FileSize &progress)
    : FileDirectiveCreator(conf, cfdp::FileDirective::KEEP_ALIVE, 4), progress(progress) {
  updateDirectiveFieldLen();
 }
--- a/src/fsfw/cfdp/pdu/KeepAlivePduCreator.h
+++ b/src/fsfw/cfdp/pdu/KeepAlivePduCreator.h
@ -1,12 +1,12 @@
 #ifndef FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_
 #define FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_

-#include "fsfw/cfdp/Fss.h"
+#include "fsfw/cfdp/FileSize.h"
 #include "fsfw/cfdp/pdu/FileDirectiveCreator.h"

 class KeepAlivePduCreator : public FileDirectiveCreator {
 public:
-  KeepAlivePduCreator(PduConfig& conf, cfdp::Fss& progress);
+  KeepAlivePduCreator(PduConfig& conf, cfdp::FileSize& progress);

  void updateDirectiveFieldLen();

@ -16,7 +16,7 @@ class KeepAlivePduCreator : public FileDirectiveCreator {
                          Endianness streamEndianness) const override;

 private:
-  cfdp::Fss& progress;
+  cfdp::FileSize& progress;
 };

 #endif /* FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_ */
--- a/src/fsfw/cfdp/pdu/KeepAlivePduReader.cpp
+++ b/src/fsfw/cfdp/pdu/KeepAlivePduReader.cpp
@ -1,6 +1,7 @@
 #include "KeepAlivePduReader.h"

-KeepAlivePduReader::KeepAlivePduReader(const uint8_t* pduBuf, size_t maxSize, cfdp::Fss& progress)
+KeepAlivePduReader::KeepAlivePduReader(const uint8_t* pduBuf, size_t maxSize,
+                                       cfdp::FileSize& progress)
    : FileDirectiveReader(pduBuf, maxSize), progress(progress) {}

 ReturnValue_t KeepAlivePduReader::parseData() {
@ -14,4 +15,4 @@ ReturnValue_t KeepAlivePduReader::parseData() {
  return progress.deSerialize(&buffer, &remLen, getEndianness());
 }

-cfdp::Fss& KeepAlivePduReader::getProgress() { return progress; }
+cfdp::FileSize& KeepAlivePduReader::getProgress() { return progress; }
--- a/src/fsfw/cfdp/pdu/KeepAlivePduReader.h
+++ b/src/fsfw/cfdp/pdu/KeepAlivePduReader.h
@ -1,19 +1,19 @@
 #ifndef FSFW_CFDP_PDU_KEEPALIVEREADER_H_
 #define FSFW_CFDP_PDU_KEEPALIVEREADER_H_

-#include "fsfw/cfdp/Fss.h"
+#include "fsfw/cfdp/FileSize.h"
 #include "fsfw/cfdp/pdu/FileDirectiveReader.h"

 class KeepAlivePduReader : public FileDirectiveReader {
 public:
-  KeepAlivePduReader(const uint8_t* pduBuf, size_t maxSize, cfdp::Fss& progress);
+  KeepAlivePduReader(const uint8_t* pduBuf, size_t maxSize, cfdp::FileSize& progress);

  ReturnValue_t parseData() override;

-  cfdp::Fss& getProgress();
+  cfdp::FileSize& getProgress();

 private:
-  cfdp::Fss& progress;
+  cfdp::FileSize& progress;
 };

 #endif /* FSFW_CFDP_PDU_KEEPALIVEPDUREADER_H_ */
--- a/src/fsfw/cfdp/pdu/MetadataGenericInfo.cpp
+++ b/src/fsfw/cfdp/pdu/MetadataGenericInfo.cpp
@ -1,35 +0,0 @@
-#include "MetadataGenericInfo.h"
-
-MetadataGenericInfo::MetadataGenericInfo(bool closureRequested, cfdp::ChecksumType checksumType,
-                                         cfdp::Fss fileSize)
-    : MetadataGenericInfo(std::move(fileSize)) {
-  this->closureRequested = closureRequested;
-  this->checksumType = checksumType;
-}
-
-MetadataGenericInfo::MetadataGenericInfo(cfdp::Fss fileSize) : fileSize(std::move(fileSize)) {}
-
-cfdp::ChecksumType MetadataGenericInfo::getChecksumType() const { return checksumType; }
-
-void MetadataGenericInfo::setChecksumType(cfdp::ChecksumType checksumType_) {
-  checksumType = checksumType_;
-}
-
-bool MetadataGenericInfo::isClosureRequested() const { return closureRequested; }
-
-void MetadataGenericInfo::setClosureRequested(bool closureRequested_) {
-  closureRequested = closureRequested_;
-}
-
-const cfdp::Fss& MetadataGenericInfo::getFileSize() const { return fileSize; }
-
-size_t MetadataGenericInfo::getSerializedSize(bool fssLarge) {
-  // 1 byte + minimal FSS 4 bytes
-  size_t size = 5;
-  if (fssLarge) {
-    size += 4;
-  }
-  return size;
-}
-
-cfdp::Fss& MetadataGenericInfo::getMutFileSize() { return fileSize; }
--- a/src/fsfw/cfdp/pdu/MetadataGenericInfo.h
+++ b/src/fsfw/cfdp/pdu/MetadataGenericInfo.h
@ -1,35 +0,0 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_METADATAINFO_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_METADATAINFO_H_
-
-#include <optional>
-
-#include "fsfw/cfdp/Fss.h"
-#include "fsfw/cfdp/definitions.h"
-#include "fsfw/cfdp/tlv/Lv.h"
-#include "fsfw/cfdp/tlv/StringLv.h"
-#include "fsfw/cfdp/tlv/Tlv.h"
-
-class MetadataGenericInfo {
- public:
-  MetadataGenericInfo() = default;
-  explicit MetadataGenericInfo(cfdp::Fss fileSize);
-  MetadataGenericInfo(bool closureRequested, cfdp::ChecksumType checksumType, cfdp::Fss fileSize);
-
-  static size_t getSerializedSize(bool fssLarge = false);
-
-  [[nodiscard]] cfdp::ChecksumType getChecksumType() const;
-  void setChecksumType(cfdp::ChecksumType checksumType);
-  [[nodiscard]] bool isClosureRequested() const;
-  void setClosureRequested(bool closureRequested = false);
-
-  [[nodiscard]] const cfdp::Fss& getFileSize() const;
-
-  cfdp::Fss& getMutFileSize();
-
- private:
-  bool closureRequested = false;
-  cfdp::ChecksumType checksumType = cfdp::ChecksumType::NULL_CHECKSUM;
-  cfdp::Fss fileSize;
-};
-
-#endif /* FSFW_SRC_FSFW_CFDP_PDU_METADATAINFO_H_ */
--- a/src/fsfw/cfdp/pdu/MetadataInfo.cpp
+++ b/src/fsfw/cfdp/pdu/MetadataInfo.cpp
@ -0,0 +1,103 @@
+#include "MetadataInfo.h"
+
+MetadataInfo::MetadataInfo(bool closureRequested, cfdp::ChecksumType checksumType,
+                           cfdp::FileSize& fileSize, cfdp::StringLv& sourceFileName,
+                           cfdp::StringLv& destFileName)
+    : MetadataInfo(fileSize, sourceFileName, destFileName) {
+  this->closureRequested = closureRequested;
+  this->checksumType = checksumType;
+}
+
+MetadataInfo::MetadataInfo(cfdp::FileSize& fileSize, cfdp::StringLv& sourceFileName,
+                           cfdp::StringLv& destFileName)
+    : fileSize(fileSize), sourceFileName(sourceFileName), destFileName(destFileName) {}
+
+void MetadataInfo::setOptionsArray(cfdp::Tlv** optionsArray_, std::optional<size_t> optionsLen_,
+                                   std::optional<size_t> maxOptionsLen_) {
+  this->optionsArray = optionsArray_;
+  if (maxOptionsLen_) {
+    this->maxOptionsLen = maxOptionsLen_.value();
+  }
+  if (optionsLen_) {
+    this->optionsLen = optionsLen_.value();
+  }
+}
+
+cfdp::ChecksumType MetadataInfo::getChecksumType() const { return checksumType; }
+
+void MetadataInfo::setChecksumType(cfdp::ChecksumType checksumType_) {
+  checksumType = checksumType_;
+}
+
+bool MetadataInfo::isClosureRequested() const { return closureRequested; }
+
+void MetadataInfo::setClosureRequested(bool closureRequested_) {
+  closureRequested = closureRequested_;
+}
+
+cfdp::StringLv& MetadataInfo::getDestFileName() { return destFileName; }
+
+cfdp::FileSize& MetadataInfo::getFileSize() { return fileSize; }
+
+ReturnValue_t MetadataInfo::getOptions(cfdp::Tlv*** optionsArray_, size_t* optionsLen_,
+                                       size_t* maxOptsLen) {
+  if (optionsArray_ == nullptr or optionsArray == nullptr) {
+    return returnvalue::FAILED;
+  }
+  *optionsArray_ = optionsArray;
+  if (optionsLen_ != nullptr) {
+    *optionsLen_ = this->optionsLen;
+  }
+  if (maxOptsLen != nullptr) {
+    *maxOptsLen = this->maxOptionsLen;
+  }
+  return returnvalue::OK;
+}
+
+bool MetadataInfo::hasOptions() const {
+  if (optionsArray != nullptr and optionsLen > 0) {
+    return true;
+  }
+  return false;
+}
+
+bool MetadataInfo::canHoldOptions() const {
+  if (optionsArray != nullptr and maxOptionsLen > 0) {
+    return true;
+  }
+  return false;
+}
+
+size_t MetadataInfo::getSerializedSize(bool fssLarge) {
+  // 1 byte + minimal FSS 4 bytes
+  size_t size = 5;
+  if (fssLarge) {
+    size += 4;
+  }
+  size += sourceFileName.getSerializedSize();
+  size += destFileName.getSerializedSize();
+  if (hasOptions()) {
+    for (size_t idx = 0; idx < optionsLen; idx++) {
+      size += optionsArray[idx]->getSerializedSize();
+    }
+  }
+  return size;
+}
+
+void MetadataInfo::setDestFileName(cfdp::StringLv& destFileName_) {
+  this->destFileName = destFileName_;
+}
+
+void MetadataInfo::setSourceFileName(cfdp::StringLv& sourceFileName_) {
+  this->sourceFileName = sourceFileName_;
+}
+
+size_t MetadataInfo::getMaxOptionsLen() const { return maxOptionsLen; }
+
+void MetadataInfo::setMaxOptionsLen(size_t maxOptionsLen_) { this->maxOptionsLen = maxOptionsLen_; }
+
+size_t MetadataInfo::getOptionsLen() const { return optionsLen; }
+
+void MetadataInfo::setOptionsLen(size_t optionsLen_) { this->optionsLen = optionsLen_; }
+
+cfdp::StringLv& MetadataInfo::getSourceFileName() { return sourceFileName; }
--- a/src/fsfw/cfdp/pdu/MetadataInfo.h
+++ b/src/fsfw/cfdp/pdu/MetadataInfo.h
@ -0,0 +1,55 @@
+#ifndef FSFW_SRC_FSFW_CFDP_PDU_METADATAINFO_H_
+#define FSFW_SRC_FSFW_CFDP_PDU_METADATAINFO_H_
+
+#include <optional>
+
+#include "fsfw/cfdp/FileSize.h"
+#include "fsfw/cfdp/definitions.h"
+#include "fsfw/cfdp/tlv/Lv.h"
+#include "fsfw/cfdp/tlv/StringLv.h"
+#include "fsfw/cfdp/tlv/Tlv.h"
+
+class MetadataInfo {
+ public:
+  MetadataInfo(cfdp::FileSize& fileSize, cfdp::StringLv& sourceFileName,
+               cfdp::StringLv& destFileName);
+  MetadataInfo(bool closureRequested, cfdp::ChecksumType checksumType, cfdp::FileSize& fileSize,
+               cfdp::StringLv& sourceFileName, cfdp::StringLv& destFileName);
+
+  size_t getSerializedSize(bool fssLarge = false);
+
+  void setOptionsArray(cfdp::Tlv** optionsArray, std::optional<size_t> optionsLen,
+                       std::optional<size_t> maxOptionsLen);
+  [[nodiscard]] cfdp::ChecksumType getChecksumType() const;
+  void setChecksumType(cfdp::ChecksumType checksumType);
+  [[nodiscard]] bool isClosureRequested() const;
+  void setClosureRequested(bool closureRequested = false);
+
+  void setDestFileName(cfdp::StringLv& destFileName);
+  void setSourceFileName(cfdp::StringLv& sourceFileName);
+
+  cfdp::StringLv& getDestFileName();
+  cfdp::StringLv& getSourceFileName();
+  cfdp::FileSize& getFileSize();
+
+  [[nodiscard]] bool hasOptions() const;
+  [[nodiscard]] bool canHoldOptions() const;
+  ReturnValue_t getOptions(cfdp::Tlv*** optionsArray, size_t* optionsLen, size_t* maxOptsLen);
+  void setOptionsLen(size_t optionsLen);
+  [[nodiscard]] size_t getOptionsLen() const;
+  void setMaxOptionsLen(size_t maxOptionsLen);
+  [[nodiscard]] size_t getMaxOptionsLen() const;
+
+ private:
+  bool closureRequested = false;
+  cfdp::ChecksumType checksumType = cfdp::ChecksumType::NULL_CHECKSUM;
+  cfdp::FileSize& fileSize;
+  cfdp::StringLv& sourceFileName;
+  cfdp::StringLv& destFileName;
+
+  cfdp::Tlv** optionsArray = nullptr;
+  size_t optionsLen = 0;
+  size_t maxOptionsLen = 0;
+};
+
+#endif /* FSFW_SRC_FSFW_CFDP_PDU_METADATAINFO_H_ */
--- a/src/fsfw/cfdp/pdu/MetadataPduCreator.cpp
+++ b/src/fsfw/cfdp/pdu/MetadataPduCreator.cpp
@ -1,26 +1,12 @@
 #include "MetadataPduCreator.h"

-MetadataPduCreator::MetadataPduCreator(PduConfig &conf, MetadataGenericInfo &info,
-                                       cfdp::StringLv &srcFileName, cfdp::StringLv &destFileName,
-                                       cfdp::Tlv **optionsArray, size_t optionsLen)
-    : FileDirectiveCreator(conf, cfdp::FileDirective::METADATA, 5),
-      info(info),
-      srcFileName(srcFileName),
-      destFileName(destFileName),
-      optionsArray(optionsArray),
-      optionsLen(optionsLen) {
+MetadataPduCreator::MetadataPduCreator(PduConfig &conf, MetadataInfo &info)
+    : FileDirectiveCreator(conf, cfdp::FileDirective::METADATA, 5), info(info) {
  updateDirectiveFieldLen();
 }

 void MetadataPduCreator::updateDirectiveFieldLen() {
-  size_t dirFieldLen = MetadataGenericInfo::getSerializedSize(HeaderCreator::getLargeFileFlag()) +
-                       srcFileName.getSerializedSize() + destFileName.getSerializedSize();
-  if (optionsLen > 0 and optionsArray != nullptr) {
-    for (size_t idx = 0; idx < optionsLen; idx++) {
-      dirFieldLen += optionsArray[idx]->getSerializedSize();
-    }
-  }
-  setDirectiveDataFieldLen(dirFieldLen);
+  setDirectiveDataFieldLen(info.getSerializedSize(getLargeFileFlag()));
 }

 size_t MetadataPduCreator::getSerializedSize() const {
@ -43,18 +29,21 @@ ReturnValue_t MetadataPduCreator::serialize(uint8_t **buffer, size_t *size, size
  if (result != returnvalue::OK) {
    return result;
  }
-  result = srcFileName.serialize(buffer, size, maxSize, streamEndianness);
+  result = info.getSourceFileName().serialize(buffer, size, maxSize, streamEndianness);
  if (result != returnvalue::OK) {
    return result;
  }
-  result = destFileName.serialize(buffer, size, maxSize, streamEndianness);
+  result = info.getDestFileName().serialize(buffer, size, maxSize, streamEndianness);
  if (result != returnvalue::OK) {
    return result;
  }

-  if (optionsLen > 0 and optionsArray != nullptr) {
-    for (size_t idx = 0; idx < optionsLen; idx++) {
-      result = optionsArray[idx]->serialize(buffer, size, maxSize, streamEndianness);
+  if (info.hasOptions()) {
+    cfdp::Tlv **optsArray = nullptr;
+    size_t optsLen = 0;
+    info.getOptions(&optsArray, &optsLen, nullptr);
+    for (size_t idx = 0; idx < optsLen; idx++) {
+      result = optsArray[idx]->serialize(buffer, size, maxSize, streamEndianness);
      if (result != returnvalue::OK) {
        return result;
      }
@ -62,5 +51,3 @@ ReturnValue_t MetadataPduCreator::serialize(uint8_t **buffer, size_t *size, size
  }
  return result;
 }
-const cfdp::StringLv &MetadataPduCreator::getSourceFileName() const { return srcFileName; }
-const cfdp::StringLv &MetadataPduCreator::getDestFileName() const { return destFileName; }
--- a/src/fsfw/cfdp/pdu/MetadataPduCreator.h
+++ b/src/fsfw/cfdp/pdu/MetadataPduCreator.h
@ -2,30 +2,22 @@
 #define FSFW_CFDP_PDU_METADATAPDUCREATOR_H_

 #include "fsfw/cfdp/pdu/FileDirectiveCreator.h"
-#include "fsfw/cfdp/pdu/MetadataGenericInfo.h"
+#include "fsfw/cfdp/pdu/MetadataInfo.h"

 class MetadataPduCreator : public FileDirectiveCreator {
 public:
-  MetadataPduCreator(PduConfig& conf, MetadataGenericInfo& info, cfdp::StringLv& srcFileName,
-                     cfdp::StringLv& destFileName, cfdp::Tlv** optionsArray, size_t optionsLen);
+  MetadataPduCreator(PduConfig& conf, MetadataInfo& info);

  void updateDirectiveFieldLen();

  [[nodiscard]] size_t getSerializedSize() const override;

-  const cfdp::StringLv& getSourceFileName() const;
-  const cfdp::StringLv& getDestFileName() const;
-
  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                          Endianness streamEndianness) const override;
  using FileDirectiveCreator::serialize;

 private:
-  MetadataGenericInfo& info;
-  cfdp::StringLv& srcFileName;
-  cfdp::StringLv& destFileName;
-  cfdp::Tlv** optionsArray;
-  size_t optionsLen;
+  MetadataInfo& info;
 };

 #endif /* FSFW_CFDP_PDU_METADATAPDUCREATOR_H_ */
--- a/src/fsfw/cfdp/pdu/MetadataPduReader.cpp
+++ b/src/fsfw/cfdp/pdu/MetadataPduReader.cpp
@ -1,15 +1,9 @@
 #include "MetadataPduReader.h"

-MetadataPduReader::MetadataPduReader(const uint8_t* pduBuf, size_t maxSize,
-                                     MetadataGenericInfo& info, cfdp::Tlv* optionsArray,
-                                     size_t optArrayMaxSize)
-    : FileDirectiveReader(pduBuf, maxSize),
-      info(info),
-      optionArray(optionsArray),
-      optionArrayMaxSize(optArrayMaxSize) {}
+MetadataPduReader::MetadataPduReader(const uint8_t* pduBuf, size_t maxSize, MetadataInfo& info)
+    : FileDirectiveReader(pduBuf, maxSize), info(info) {}

 ReturnValue_t MetadataPduReader::parseData() {
-  parsedOptions = 0;
  ReturnValue_t result = FileDirectiveReader::parseData();
  if (result != returnvalue::OK) {
    return result;
@ -25,43 +19,39 @@ ReturnValue_t MetadataPduReader::parseData() {
  remSize -= 1;
  buf += 1;
  auto endianness = getEndianness();
-  result = info.getMutFileSize().deSerialize(&buf, &remSize, endianness);
+  result = info.getFileSize().deSerialize(&buf, &remSize, endianness);
  if (result != returnvalue::OK) {
    return result;
  }
-  result = srcFileName.deSerialize(&buf, &remSize, endianness);
+  result = info.getSourceFileName().deSerialize(&buf, &remSize, endianness);
  if (result != returnvalue::OK) {
    return result;
  }
-  result = destFileName.deSerialize(&buf, &remSize, endianness);
+  result = info.getDestFileName().deSerialize(&buf, &remSize, endianness);
  if (result != returnvalue::OK) {
    return result;
  }

+  info.setOptionsLen(0);
  if (remSize > 0) {
-    if (optionArrayMaxSize == 0 or optionArray == nullptr) {
+    if (not info.canHoldOptions()) {
      return cfdp::METADATA_CANT_PARSE_OPTIONS;
    }
+    cfdp::Tlv** optionsArray = nullptr;
+    size_t optsMaxLen = 0;
    size_t optsIdx = 0;
+    info.getOptions(&optionsArray, nullptr, &optsMaxLen);
    while (remSize > 0) {
-      if (optsIdx > optionArrayMaxSize) {
+      if (optsIdx > optsMaxLen) {
        return cfdp::METADATA_CANT_PARSE_OPTIONS;
      }
-      result = optionArray[optsIdx].deSerialize(&buf, &remSize, endianness);
+      result = optionsArray[optsIdx]->deSerialize(&buf, &remSize, endianness);
      if (result != returnvalue::OK) {
        return result;
      }
      optsIdx++;
    }
-    parsedOptions = optsIdx;
+    info.setOptionsLen(optsIdx);
  }
  return result;
 }
-
-size_t MetadataPduReader::getNumberOfParsedOptions() const { return parsedOptions; }
-
-const cfdp::StringLv& MetadataPduReader::getSourceFileName() const { return srcFileName; }
-
-const cfdp::StringLv& MetadataPduReader::getDestFileName() const { return destFileName; }
-
-const MetadataGenericInfo& MetadataPduReader::getGenericInfo() const { return info; }
--- a/src/fsfw/cfdp/pdu/MetadataPduReader.h
+++ b/src/fsfw/cfdp/pdu/MetadataPduReader.h
@ -2,28 +2,16 @@
 #define FSFW_CFDP_PDU_METADATAPDUREADER_H_

 #include "fsfw/cfdp/pdu/FileDirectiveReader.h"
-#include "fsfw/cfdp/pdu/MetadataGenericInfo.h"
+#include "fsfw/cfdp/pdu/MetadataInfo.h"

 class MetadataPduReader : public FileDirectiveReader {
 public:
-  MetadataPduReader(const uint8_t* pduBuf, size_t maxSize, MetadataGenericInfo& info,
-                    cfdp::Tlv* optionsArray, size_t optArrayMaxSize);
+  MetadataPduReader(const uint8_t* pduBuf, size_t maxSize, MetadataInfo& info);

  ReturnValue_t parseData() override;

-  [[nodiscard]] const MetadataGenericInfo& getGenericInfo() const;
-  [[nodiscard]] const cfdp::StringLv& getSourceFileName() const;
-  [[nodiscard]] const cfdp::StringLv& getDestFileName() const;
-
-  [[nodiscard]] size_t getNumberOfParsedOptions() const;
-
 private:
-  cfdp::StringLv srcFileName;
-  cfdp::StringLv destFileName;
-  MetadataGenericInfo& info;
-  cfdp::Tlv* optionArray;
-  size_t optionArrayMaxSize;
-  size_t parsedOptions = 0;
+  MetadataInfo& info;
 };

 #endif /* FSFW_CFDP_PDU_METADATAPDUREADER_H_ */
--- a/src/fsfw/cfdp/pdu/NakInfo.cpp
+++ b/src/fsfw/cfdp/pdu/NakInfo.cpp
@ -1,6 +1,6 @@
 #include "NakInfo.h"

-NakInfo::NakInfo(cfdp::Fss startOfScope, cfdp::Fss endOfScope)
+NakInfo::NakInfo(cfdp::FileSize startOfScope, cfdp::FileSize endOfScope)
    : startOfScope(startOfScope), endOfScope(endOfScope) {}

 size_t NakInfo::getSerializedSize(bool fssLarge) {
@ -57,9 +57,9 @@ void NakInfo::setSegmentRequests(SegmentRequest* segmentRequests, size_t* segmen
  }
 }

-cfdp::Fss& NakInfo::getStartOfScope() { return startOfScope; }
+cfdp::FileSize& NakInfo::getStartOfScope() { return startOfScope; }

-cfdp::Fss& NakInfo::getEndOfScope() { return endOfScope; }
+cfdp::FileSize& NakInfo::getEndOfScope() { return endOfScope; }

 size_t NakInfo::getSegmentRequestsLen() const { return segmentRequestsLen; }

--- a/src/fsfw/cfdp/pdu/NakInfo.h
+++ b/src/fsfw/cfdp/pdu/NakInfo.h
@ -3,21 +3,21 @@

 #include <utility>

-#include "fsfw/cfdp/Fss.h"
+#include "fsfw/cfdp/FileSize.h"

 class NakInfo {
 public:
-  using SegmentRequest = std::pair<cfdp::Fss, cfdp::Fss>;
+  using SegmentRequest = std::pair<cfdp::FileSize, cfdp::FileSize>;

-  NakInfo(cfdp::Fss startOfScope, cfdp::Fss endOfScope);
+  NakInfo(cfdp::FileSize startOfScope, cfdp::FileSize endOfScope);

  void setSegmentRequests(SegmentRequest* segmentRequests, size_t* segmentRequestLen,
                          size_t* maxSegmentRequestLen);

  size_t getSerializedSize(bool fssLarge = false);

-  cfdp::Fss& getStartOfScope();
-  cfdp::Fss& getEndOfScope();
+  cfdp::FileSize& getStartOfScope();
+  cfdp::FileSize& getEndOfScope();

  bool hasSegmentRequests() const;
  bool canHoldSegmentRequests() const;
@ -31,8 +31,8 @@ class NakInfo {
  void setSegmentRequestLen(size_t readLen);

 private:
-  cfdp::Fss startOfScope;
-  cfdp::Fss endOfScope;
+  cfdp::FileSize startOfScope;
+  cfdp::FileSize endOfScope;
  SegmentRequest* segmentRequests = nullptr;
  size_t segmentRequestsLen = 0;
  size_t maxSegmentRequestsLen = 0;
--- a/src/fsfw/cfdp/pdu/NakPduCreator.h
+++ b/src/fsfw/cfdp/pdu/NakPduCreator.h
@ -4,7 +4,7 @@
 #include <vector>

 #include "NakInfo.h"
-#include "fsfw/cfdp/Fss.h"
+#include "fsfw/cfdp/FileSize.h"
 #include "fsfw/cfdp/definitions.h"
 #include "fsfw/cfdp/pdu/FileDirectiveCreator.h"

--- a/src/fsfw/cfdp/pdu/PduHeaderReader.h
+++ b/src/fsfw/cfdp/pdu/PduHeaderReader.h
@ -105,8 +105,7 @@ class PduHeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
   * @return
   */
  ReturnValue_t setData(uint8_t* dataPtr, size_t maxSize, void* args) override;
-  static void assignVarLenField(cfdp::VarLenField* field, cfdp::WidthInBytes width,
-                                void* sourcePtr);
+  void assignVarLenField(cfdp::VarLenField* field, cfdp::WidthInBytes width, void* sourcePtr) const;
  void* sourceIdRaw = nullptr;
  void* seqNumRaw = nullptr;
  void* destIdRaw = nullptr;
--- a/src/fsfw/cfdp/tlv/CMakeLists.txt
+++ b/src/fsfw/cfdp/tlv/CMakeLists.txt
@ -8,5 +8,4 @@ target_sources(
          StringLv.cpp
          FlowLabelTlv.cpp
          MessageToUserTlv.cpp
-          FaultHandlerOverrideTlv.cpp
-          ReservedMessageCreator.cpp)
+          FaultHandlerOverrideTlv.cpp)
--- a/src/fsfw/cfdp/tlv/Lv.cpp
+++ b/src/fsfw/cfdp/tlv/Lv.cpp
@ -14,6 +14,23 @@ cfdp::Lv::Lv(const std::vector<uint8_t>& data) : value(data.data(), data.size(),

 cfdp::Lv::Lv() : value(static_cast<uint8_t*>(nullptr), 0, true) {}

+cfdp::Lv::Lv(const Lv& other)
+    : value(other.value.getConstBuffer(), other.value.getSerializedSize() - 1, true) {
+  if (other.value.getSerializedSize() - 1 > 0) {
+    zeroLen = false;
+  }
+}
+
+cfdp::Lv& cfdp::Lv::operator=(const Lv& other) {
+  size_t otherSize = 0;
+  auto* otherVal = const_cast<uint8_t*>(other.getValue(&otherSize));
+  if (otherVal == nullptr or otherSize == 0) {
+    this->zeroLen = true;
+  }
+  this->value.setConstBuffer(otherVal, otherSize);
+  return *this;
+}
+
 ReturnValue_t cfdp::Lv::serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                                  Endianness streamEndianness) const {
  if (maxSize < 1) {
@ -32,8 +49,10 @@ ReturnValue_t cfdp::Lv::serialize(uint8_t** buffer, size_t* size, size_t maxSize
 }

 size_t cfdp::Lv::getSerializedSize() const {
-  if (zeroLen or value.getConstBuffer() == nullptr) {
+  if (zeroLen) {
    return 1;
+  } else if (value.getConstBuffer() == nullptr) {
+    return 0;
  }
  return value.getSerializedSize();
 }
@ -66,34 +85,7 @@ ReturnValue_t cfdp::Lv::deSerialize(const uint8_t** buffer, size_t* size,
 const uint8_t* cfdp::Lv::getValue(size_t* size) const {
  if (size != nullptr) {
    // Length without length field
-    *size = getSerializedSize() - 1;
+    *size = value.getSerializedSize() - 1;
  }
  return value.getConstBuffer();
 }
-cfdp::Lv::Lv(cfdp::Lv&& other) noexcept
-    : value(other.value.getConstBuffer(), other.value.getSerializedSize() - 1, true) {
-  if (other.value.getSerializedSize() - 1 > 0) {
-    zeroLen = false;
-  }
-  // Leave other class in intact state.
-  other.zeroLen = false;
-  other.value = SerialBufferAdapter<uint8_t>();
-}
-
-cfdp::Lv& cfdp::Lv::operator=(cfdp::Lv&& other) noexcept {
-  size_t otherSize = 0;
-  this->zeroLen = false;
-  auto* otherVal = const_cast<uint8_t*>(other.getValue(&otherSize));
-  if (otherVal == nullptr or otherSize == 0) {
-    this->zeroLen = true;
-  }
-  this->value.setConstBuffer(otherVal, otherSize);
-  // Leave other class in intact state.
-  other.zeroLen = false;
-  other.value = SerialBufferAdapter<uint8_t>();
-  return *this;
-}
-
-size_t cfdp::Lv::getValueLen() const { return getSerializedSize() - 1; }
-
-bool cfdp::Lv::isEmpty() const { return zeroLen; }
--- a/src/fsfw/cfdp/tlv/Lv.h
+++ b/src/fsfw/cfdp/tlv/Lv.h
@ -18,12 +18,8 @@ class Lv : public SerializeIF {
  Lv(const uint8_t* value, size_t size);
  Lv();

-  // Semantically, this class is a zero-copy helper, so the copy ctor and copy assigment do not
-  // really make sense here.
-  Lv(const Lv&) = delete;
-  Lv& operator=(const Lv&) = delete;
-  Lv(Lv&&) noexcept;
-  Lv& operator=(Lv&&) noexcept;
+  Lv(const Lv&);
+  Lv& operator=(const Lv&);

  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                          Endianness streamEndianness) const override;
@ -40,8 +36,6 @@ class Lv : public SerializeIF {
  ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
                            Endianness streamEndianness) override;

-  size_t getValueLen() const;
-
  /**
   * Get value field and its size.
   * @param size Optionally retrieve size. Size will be the size of the actual value field
@ -50,8 +44,6 @@ class Lv : public SerializeIF {
   */
  const uint8_t* getValue(size_t* size) const;

-  bool isEmpty() const;
-
 private:
  bool zeroLen = true;
  SerialBufferAdapter<uint8_t> value;
--- a/src/fsfw/cfdp/tlv/MessageToUserTlv.cpp
+++ b/src/fsfw/cfdp/tlv/MessageToUserTlv.cpp
@ -7,22 +7,3 @@ MessageToUserTlv::MessageToUserTlv() : Tlv() {}

 MessageToUserTlv::MessageToUserTlv(const std::vector<uint8_t>& data)
    : Tlv(cfdp::TlvType::MSG_TO_USER, data.data(), data.size()) {}
-
-MessageToUserTlv::MessageToUserTlv(const uint8_t* value, size_t size)
-    : Tlv(cfdp::TlvType::MSG_TO_USER, value, size) {}
-
-bool MessageToUserTlv::isReservedCfdpMessage(uint8_t& messageType, const uint8_t** msgDataStart,
-                                             size_t& msgLen) const {
-  if (cfdp::Tlv::getLengthField() < 5) {
-    return false;
-  }
-  if (std::strncmp(reinterpret_cast<const char*>(getValue()), "cfdp", 4) == 0) {
-    messageType = getValue()[4];
-    if (msgDataStart != nullptr) {
-      *msgDataStart = getValue() + 5;
-    }
-    msgLen = cfdp::Tlv::getSerializedSize() - 5;
-    return true;
-  }
-  return false;
-}
--- a/src/fsfw/cfdp/tlv/MessageToUserTlv.h
+++ b/src/fsfw/cfdp/tlv/MessageToUserTlv.h
@ -9,12 +9,8 @@ class MessageToUserTlv : public cfdp::Tlv {
 public:
  MessageToUserTlv();
  MessageToUserTlv(uint8_t* value, size_t size);
-  MessageToUserTlv(const uint8_t* value, size_t size);
  explicit MessageToUserTlv(const std::vector<uint8_t>& data);

-  bool isReservedCfdpMessage(uint8_t& messageType, const uint8_t** msgDataStart,
-                             size_t& msgLen) const;
-
 private:
 };

--- a/src/fsfw/cfdp/tlv/ReservedMessageCreator.cpp
+++ b/src/fsfw/cfdp/tlv/ReservedMessageCreator.cpp
@ -1,39 +0,0 @@
-#include "ReservedMessageCreator.h"
-
-cfdp::ReservedMessageCreator::ReservedMessageCreator(uint8_t messageType, uint8_t *msgData,
-                                                     size_t msgLen)
-    : messageType(messageType), msgData(msgData), msgSize(msgLen) {}
-
-ReturnValue_t cfdp::ReservedMessageCreator::serialize(
-    uint8_t **buffer, size_t *size, size_t maxSize,
-    SerializeIF::Endianness streamEndianness) const {
-  if (*size + getSerializedSize() > maxSize) {
-    return SerializeIF::BUFFER_TOO_SHORT;
-  }
-  **buffer = TlvType::MSG_TO_USER;
-  *buffer += 1;
-  *size += 1;
-  **buffer = getSerializedSize() - 2;
-  *size += 1;
-  *buffer += 1;
-  std::memcpy(*buffer, MSG_HEADER, 4);
-  *buffer += 4;
-  *size += 4;
-  **buffer = messageType;
-  *buffer += 1;
-  *size += 1;
-  std::memcpy(*buffer, msgData, msgSize);
-  *buffer += msgSize;
-  *size += msgSize;
-  return returnvalue::OK;
-}
-
-size_t cfdp::ReservedMessageCreator::getSerializedSize() const {
-  // 2 bytes type and length, 4 bytes CFDP, 1 byte reserved message type, message data.
-  return 2 + 5 + msgSize;
-}
-
-ReturnValue_t cfdp::ReservedMessageCreator::deSerialize(const uint8_t **buffer, size_t *size,
-                                                        SerializeIF::Endianness streamEndianness) {
-  return returnvalue::FAILED;
-}
--- a/src/fsfw/cfdp/tlv/ReservedMessageCreator.h
+++ b/src/fsfw/cfdp/tlv/ReservedMessageCreator.h
@ -1,24 +0,0 @@
-#pragma once
-
-#include "Tlv.h"
-
-namespace cfdp {
-
-class ReservedMessageCreator : public SerializeIF {
- public:
-  static constexpr char MSG_HEADER[] = "cfdp";
-
-  ReservedMessageCreator(uint8_t messageType, uint8_t *msgData, size_t msgLen);
-  [[nodiscard]] ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
-                                        Endianness streamEndianness) const override;
-  [[nodiscard]] size_t getSerializedSize() const override;
-  ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
-                            Endianness streamEndianness) override;
-
- private:
-  uint8_t messageType;
-  uint8_t *msgData;
-  size_t msgSize;
-};
-
-}  // namespace cfdp
--- a/src/fsfw/cfdp/tlv/StringLv.cpp
+++ b/src/fsfw/cfdp/tlv/StringLv.cpp
@ -7,12 +7,3 @@ cfdp::StringLv::StringLv(const char* filename, size_t len)
    : Lv(reinterpret_cast<const uint8_t*>(filename), len) {}

 cfdp::StringLv::StringLv() : Lv() {}
-
-const char* cfdp::StringLv::getCString(size_t& fileSize) const {
-  return reinterpret_cast<const char*>(getValue(&fileSize));
-}
-
-std::string cfdp::StringLv::getString() const {
-  size_t fileSize;
-  return {getCString(fileSize), fileSize};
-}
--- a/src/fsfw/cfdp/tlv/StringLv.h
+++ b/src/fsfw/cfdp/tlv/StringLv.h
@ -13,8 +13,6 @@ class StringLv : public Lv {
  explicit StringLv(const std::string& fileName);
  explicit StringLv(const char* filename, size_t len);

-  const char* getCString(size_t& fileSize) const;
-  std::string getString() const;
  // Delete the move constructor to avoid passing in a temporary
  StringLv(const std::string&&) = delete;
 };
--- a/src/fsfw/cfdp/tlv/Tlv.cpp
+++ b/src/fsfw/cfdp/tlv/Tlv.cpp
@ -54,7 +54,6 @@ ReturnValue_t cfdp::Tlv::deSerialize(const uint8_t **buffer, size_t *size,
    return STREAM_TOO_SHORT;
  }

-  rawData = *buffer;
  uint8_t rawType = **buffer;
  if (not checkType(rawType)) {
    return INVALID_TLV_TYPE;
@ -103,5 +102,3 @@ void cfdp::Tlv::setValue(uint8_t *value, size_t len) {
 uint8_t cfdp::Tlv::getLengthField() const { return this->value.getSerializedSize() - 1; }

 void cfdp::Tlv::setType(TlvType type) { this->type = type; }
-
-const uint8_t *cfdp::Tlv::getRawData() const { return rawData; }
--- a/src/fsfw/cfdp/tlv/Tlv.h
+++ b/src/fsfw/cfdp/tlv/Tlv.h
@ -47,7 +47,6 @@ class Tlv : public TlvIF {
  void setValue(uint8_t *value, size_t len);

  [[nodiscard]] const uint8_t *getValue() const;
-  [[nodiscard]] const uint8_t *getRawData() const;
  void setType(TlvType type);
  [[nodiscard]] TlvType getType() const override;
  [[nodiscard]] uint8_t getLengthField() const override;
@ -56,7 +55,6 @@ class Tlv : public TlvIF {
  bool checkType(uint8_t rawType);

  bool zeroLen = true;
-  const uint8_t *rawData = nullptr;
  TlvType type = TlvType::INVALID_TLV;
  SerialBufferAdapter<uint8_t> value;
 };
--- a/src/fsfw/controller/ControllerBase.cpp
+++ b/src/fsfw/controller/ControllerBase.cpp
@ -58,7 +58,7 @@ void ControllerBase::handleQueue() {

 void ControllerBase::startTransition(Mode_t mode_, Submode_t submode_) {
  changeHK(this->mode, this->submode, false);
-  triggerEvent(CHANGING_MODE, mode_, submode_);
+  triggerEvent(CHANGING_MODE, mode, submode);
  mode = mode_;
  submode = submode_;
  modeHelper.modeChanged(mode, submode);
@ -72,17 +72,18 @@ void ControllerBase::getMode(Mode_t* mode_, Submode_t* submode_) {
  *submode_ = this->submode;
 }

-void ControllerBase::announceMode(bool recursive) { triggerEvent(MODE_INFO, mode, submode); }
-
-void ControllerBase::modeChanged(Mode_t mode_, Submode_t submode_) {}
-
 void ControllerBase::setToExternalControl() { healthHelper.setHealth(EXTERNAL_CONTROL); }

+void ControllerBase::announceMode(bool recursive) { triggerEvent(MODE_INFO, mode, submode); }
+
 ReturnValue_t ControllerBase::performOperation(uint8_t opCode) {
  handleQueue();
  performControlOperation();
  return returnvalue::OK;
 }
+
+void ControllerBase::modeChanged(Mode_t mode_, Submode_t submode_) {}
+
 ReturnValue_t ControllerBase::setHealth(HealthState health) {
  switch (health) {
    case HEALTHY:
--- a/src/fsfw/coordinates/CoordinateTransformations.cpp
+++ b/src/fsfw/coordinates/CoordinateTransformations.cpp
@ -6,8 +6,6 @@
 #include "fsfw/globalfunctions/constants.h"
 #include "fsfw/globalfunctions/math/MatrixOperations.h"
 #include "fsfw/globalfunctions/math/VectorOperations.h"
-#include "fsfw/globalfunctions/sign.h"
-#include "fsfw/serviceinterface.h"

 void CoordinateTransformations::positionEcfToEci(const double* ecfPosition, double* eciPosition,
                                                 timeval* timeUTC) {
@ -99,14 +97,7 @@ void CoordinateTransformations::ecfToEci(const double* ecfCoordinates, double* e

 double CoordinateTransformations::getJuleanCenturiesTT(timeval timeUTC) {
  timeval timeTT;
-  ReturnValue_t result = Clock::convertUTCToTT(timeUTC, &timeTT);
-  if (result != returnvalue::OK) {
-    // i think it is better to continue here than to abort
-    timeTT = timeUTC;
-    sif::error << "CoordinateTransformations::Conversion from UTC to TT failed. Continuing "
-                  "calculations with UTC."
-               << std::endl;
-  }
+  Clock::convertUTCToTT(timeUTC, &timeTT);
  double jD2000TT;
  Clock::convertTimevalToJD2000(timeTT, &jD2000TT);

@ -216,61 +207,3 @@ void CoordinateTransformations::getTransMatrixECITOECF(timeval timeUTC, double T

  MatrixOperations<double>::multiply(mTheta[0], Ttemp[0], Tfi[0], 3, 3, 3);
 };
-
-void CoordinateTransformations::cartesianFromLatLongAlt(const double lat, const double longi,
-                                                        const double alt, double* cartesianOutput) {
-  /* @brief:  cartesianFromLatLongAlt() - calculates cartesian coordinates in ECEF from latitude,
-   * 								longitude and altitude
-   * @param:  lat   				geodetic latitude [rad]
-   * 			longi 				longitude [rad]
-   * 			alt					altitude [m]
-   * 			cartesianOutput 	Cartesian Coordinates in ECEF (3x1)
-   * @source: Fundamentals of Spacecraft Attitude Determination and Control, P.34ff
-   * 			Landis Markley and John L. Crassidis*/
-  double radiusPolar = 6356752.314;
-  double radiusEqua = 6378137;
-
-  double eccentricity = sqrt(1 - pow(radiusPolar, 2) / pow(radiusEqua, 2));
-  double auxRadius = radiusEqua / sqrt(1 - pow(eccentricity, 2) * pow(sin(lat), 2));
-
-  cartesianOutput[0] = (auxRadius + alt) * cos(lat) * cos(longi);
-  cartesianOutput[1] = (auxRadius + alt) * cos(lat) * sin(longi);
-  cartesianOutput[2] = ((1 - pow(eccentricity, 2)) * auxRadius + alt) * sin(lat);
-};
-
-void CoordinateTransformations::latLongAltFromCartesian(const double* vector, double& latitude,
-                                                        double& longitude, double& altitude) {
-  /* @brief:  latLongAltFromCartesian() - calculates latitude, longitude and altitude from
-   * cartesian coordinates in ECEF
-   * @param:  x   			x-value of position vector [m]
-   * 			y 				y-value of position vector [m]
-   * 			z				z-value of position vector [m]
-   * 			latitude 		geodetic latitude [rad]
-   * 			longitude		longitude [rad]
-   * 			altitude		altitude [m]
-   * @source: Fundamentals of Spacecraft Attitude Determination and Control, P.35 f
-   * 			Landis Markley and John L. Crassidis*/
-  // From World Geodetic System the Earth Radii
-  double a = 6378137.0;     // semimajor axis [m]
-  double b = 6356752.3142;  // semiminor axis [m]
-
-  // Calculation
-  double e2 = 1 - pow(b, 2) / pow(a, 2);
-  double epsilon2 = pow(a, 2) / pow(b, 2) - 1;
-  double rho = sqrt(pow(vector[0], 2) + pow(vector[1], 2));
-  double p = std::abs(vector[2]) / epsilon2;
-  double s = pow(rho, 2) / (e2 * epsilon2);
-  double q = pow(p, 2) - pow(b, 2) + s;
-  double u = p / sqrt(q);
-  double v = pow(b, 2) * pow(u, 2) / q;
-  double P = 27 * v * s / q;
-  double Q = pow(sqrt(P + 1) + sqrt(P), 2. / 3.);
-  double t = (1 + Q + 1 / Q) / 6;
-  double c = sqrt(pow(u, 2) - 1 + 2 * t);
-  double w = (c - u) / 2;
-  double d = sign(vector[2]) * sqrt(q) * (w + sqrt(sqrt(pow(t, 2) + v) - u * w - t / 2 - 1. / 4.));
-  double N = a * sqrt(1 + epsilon2 * pow(d, 2) / pow(b, 2));
-  latitude = asin((epsilon2 + 1) * d / N);
-  altitude = rho * cos(latitude) + vector[2] * sin(latitude) - pow(a, 2) / N;
-  longitude = atan2(vector[1], vector[0]);
-}
--- a/src/fsfw/coordinates/CoordinateTransformations.h
+++ b/src/fsfw/coordinates/CoordinateTransformations.h
@ -23,12 +23,6 @@ class CoordinateTransformations {

  static void getEarthRotationMatrix(timeval timeUTC, double matrix[][3]);

-  static void cartesianFromLatLongAlt(const double lat, const double longi, const double alt,
-                                      double* cartesianOutput);
-
-  static void latLongAltFromCartesian(const double* vector, double& latitude, double& longitude,
-                                      double& altitude);
-
 private:
  CoordinateTransformations();
  static void ecfToEci(const double* ecfCoordinates, double* eciCoordinates,
--- a/src/fsfw/coordinates/Sgp4Propagator.cpp
+++ b/src/fsfw/coordinates/Sgp4Propagator.cpp
@ -166,9 +166,9 @@ ReturnValue_t Sgp4Propagator::propagate(double* position, double* velocity, time
  timeval timeSinceEpoch = time - epoch;
  double minutesSinceEpoch = timeSinceEpoch.tv_sec / 60. + timeSinceEpoch.tv_usec / 60000000.;

-  double daysSinceEpoch = minutesSinceEpoch / 60 / 24;
+  double yearsSinceEpoch = minutesSinceEpoch / 60 / 24 / 365;

-  if ((daysSinceEpoch > 7) || (daysSinceEpoch < -7)) {
+  if ((yearsSinceEpoch > 1) || (yearsSinceEpoch < -1)) {
    return TLE_TOO_OLD;
  }

--- a/src/fsfw/datapoollocal/LocalDataPoolManager.cpp
+++ b/src/fsfw/datapoollocal/LocalDataPoolManager.cpp
@ -70,7 +70,8 @@ ReturnValue_t LocalDataPoolManager::initialize(MessageQueueIF* queueToUse) {
  return returnvalue::OK;
 }

-ReturnValue_t LocalDataPoolManager::initializeAfterTaskCreation() {
+ReturnValue_t LocalDataPoolManager::initializeAfterTaskCreation(uint8_t nonDiagInvlFactor) {
+  setNonDiagnosticIntervalFactor(nonDiagInvlFactor);
  return initializeHousekeepingPoolEntriesOnce();
 }

@ -505,9 +506,9 @@ ReturnValue_t LocalDataPoolManager::handleHousekeepingMessage(CommandMessage* me
      float newCollIntvl = 0;
      HousekeepingMessage::getCollectionIntervalModificationCommand(message, &newCollIntvl);
      if (command == HousekeepingMessage::MODIFY_DIAGNOSTICS_REPORT_COLLECTION_INTERVAL) {
-        result = changeCollectionInterval(sid, newCollIntvl);
+        result = changeCollectionInterval(sid, newCollIntvl, true);
      } else {
-        result = changeCollectionInterval(sid, newCollIntvl);
+        result = changeCollectionInterval(sid, newCollIntvl, false);
      }
      break;
    }
@ -660,6 +661,10 @@ ReturnValue_t LocalDataPoolManager::serializeHkPacketIntoStore(HousekeepingPacke
  return hkPacket.serialize(&dataPtr, serializedSize, maxSize, SerializeIF::Endianness::MACHINE);
 }

+void LocalDataPoolManager::setNonDiagnosticIntervalFactor(uint8_t nonDiagInvlFactor) {
+  this->nonDiagnosticIntervalFactor = nonDiagInvlFactor;
+}
+
 void LocalDataPoolManager::performPeriodicHkGeneration(HkReceiver& receiver) {
  sid_t sid = receiver.dataId.sid;
  LocalPoolDataSetBase* dataSet = HasLocalDpIFManagerAttorney::getDataSetHandle(owner, sid);
@ -713,15 +718,15 @@ ReturnValue_t LocalDataPoolManager::togglePeriodicGeneration(sid_t sid, bool ena

  if ((LocalPoolDataSetAttorney::getReportingEnabled(*dataSet) and enable) or
      (not LocalPoolDataSetAttorney::getReportingEnabled(*dataSet) and not enable)) {
-    return returnvalue::OK;
+    return REPORTING_STATUS_UNCHANGED;
  }

  LocalPoolDataSetAttorney::setReportingEnabled(*dataSet, enable);
  return returnvalue::OK;
 }

-ReturnValue_t LocalDataPoolManager::changeCollectionInterval(sid_t sid,
-                                                             float newCollectionInterval) {
+ReturnValue_t LocalDataPoolManager::changeCollectionInterval(sid_t sid, float newCollectionInterval,
+                                                             bool isDiagnostics) {
  LocalPoolDataSetBase* dataSet = HasLocalDpIFManagerAttorney::getDataSetHandle(owner, sid);
  if (dataSet == nullptr) {
    printWarningOrError(sif::OutputTypes::OUT_WARNING, "changeCollectionInterval",
@ -729,6 +734,11 @@ ReturnValue_t LocalDataPoolManager::changeCollectionInterval(sid_t sid,
    return DATASET_NOT_FOUND;
  }

+  bool targetIsDiagnostics = LocalPoolDataSetAttorney::isDiagnostics(*dataSet);
+  if ((targetIsDiagnostics and not isDiagnostics) or (not targetIsDiagnostics and isDiagnostics)) {
+    return WRONG_HK_PACKET_TYPE;
+  }
+
  PeriodicHousekeepingHelper* periodicHelper =
      LocalPoolDataSetAttorney::getPeriodicHelper(*dataSet);

--- a/src/fsfw/datapoollocal/LocalDataPoolManager.h
+++ b/src/fsfw/datapoollocal/LocalDataPoolManager.h
@ -102,7 +102,7 @@ class LocalDataPoolManager : public ProvidesDataPoolSubscriptionIF, public Acces
   * @param nonDiagInvlFactor
   * @return
   */
-  ReturnValue_t initializeAfterTaskCreation();
+  ReturnValue_t initializeAfterTaskCreation(uint8_t nonDiagInvlFactor = 5);

  /**
   * @brief   This should be called in the periodic handler of the owner.
@ -152,6 +152,17 @@ class LocalDataPoolManager : public ProvidesDataPoolSubscriptionIF, public Acces
                                                  MessageQueueId_t targetQueueId,
                                                  bool generateSnapshot) override;

+  /**
+   * Non-Diagnostics packets usually have a lower minimum sampling frequency
+   * than diagnostic packets.
+   * A factor can be specified to determine the minimum sampling frequency
+   * for non-diagnostic packets. The minimum sampling frequency of the
+   * diagnostics packets,which is usually jusst the period of the
+   * performOperation calls, is multiplied with that factor.
+   * @param factor
+   */
+  void setNonDiagnosticIntervalFactor(uint8_t nonDiagInvlFactor);
+
  /**
   * @brief   The manager is also able to handle housekeeping messages.
   * @details
@ -174,7 +185,6 @@ class LocalDataPoolManager : public ProvidesDataPoolSubscriptionIF, public Acces
  ReturnValue_t generateHousekeepingPacket(sid_t sid, LocalPoolDataSetBase* dataSet,
                                           bool forDownlink,
                                           MessageQueueId_t destination = MessageQueueIF::NO_QUEUE);
-  ReturnValue_t changeCollectionInterval(sid_t sid, float newCollectionInterval);

  HasLocalDataPoolIF* getOwner();

@ -338,6 +348,8 @@ class LocalDataPoolManager : public ProvidesDataPoolSubscriptionIF, public Acces

  void performPeriodicHkGeneration(HkReceiver& hkReceiver);
  ReturnValue_t togglePeriodicGeneration(sid_t sid, bool enable, bool isDiagnostics);
+  ReturnValue_t changeCollectionInterval(sid_t sid, float newCollectionInterval,
+                                         bool isDiagnostics);
  ReturnValue_t generateSetStructurePacket(sid_t sid, bool isDiagnostics);

  void handleHkUpdateResetListInsertion(DataType dataType, DataId dataId);
--- a/src/fsfw/datapoollocal/LocalPoolDataSetBase.cpp
+++ b/src/fsfw/datapoollocal/LocalPoolDataSetBase.cpp
@ -250,8 +250,9 @@ void LocalPoolDataSetBase::setReportingEnabled(bool reportingEnabled) {
 bool LocalPoolDataSetBase::getReportingEnabled() const { return reportingEnabled; }

 void LocalPoolDataSetBase::initializePeriodicHelper(float collectionInterval,
-                                                    dur_millis_t minimumPeriodicInterval) {
-  periodicHelper->initialize(collectionInterval, minimumPeriodicInterval);
+                                                    dur_millis_t minimumPeriodicInterval,
+                                                    uint8_t nonDiagIntervalFactor) {
+  periodicHelper->initialize(collectionInterval, minimumPeriodicInterval, nonDiagIntervalFactor);
 }

 void LocalPoolDataSetBase::setChanged(bool changed) { this->changed = changed; }
--- a/src/fsfw/datapoollocal/LocalPoolDataSetBase.h
+++ b/src/fsfw/datapoollocal/LocalPoolDataSetBase.h
@ -191,7 +191,8 @@ class LocalPoolDataSetBase : public PoolDataSetBase, public MarkChangedIF {
   */
  bool reportingEnabled = false;

-  void initializePeriodicHelper(float collectionInterval, dur_millis_t minimumPeriodicInterval);
+  void initializePeriodicHelper(float collectionInterval, dur_millis_t minimumPeriodicInterval,
+                                uint8_t nonDiagIntervalFactor = 5);

  /**
   * If the valid state of a dataset is always relevant to the whole
--- a/src/fsfw/datapoollocal/internal/LocalPoolDataSetAttorney.h
+++ b/src/fsfw/datapoollocal/internal/LocalPoolDataSetAttorney.h
@ -12,8 +12,10 @@ class LocalPoolDataSetAttorney {
  static bool isDiagnostics(LocalPoolDataSetBase& set) { return set.isDiagnostics(); }

  static void initializePeriodicHelper(LocalPoolDataSetBase& set, float collectionInterval,
-                                       uint32_t minimumPeriodicIntervalMs) {
-    set.initializePeriodicHelper(collectionInterval, minimumPeriodicIntervalMs);
+                                       uint32_t minimumPeriodicIntervalMs,
+                                       uint8_t nonDiagIntervalFactor = 5) {
+    set.initializePeriodicHelper(collectionInterval, minimumPeriodicIntervalMs,
+                                 nonDiagIntervalFactor);
  }

  static void setReportingEnabled(LocalPoolDataSetBase& set, bool enabled) {
--- a/src/fsfw/devicehandlers/CMakeLists.txt
+++ b/src/fsfw/devicehandlers/CMakeLists.txt
@ -7,5 +7,4 @@ target_sources(
          DeviceHandlerFailureIsolation.cpp
          DeviceHandlerMessage.cpp
          DeviceTmReportingWrapper.cpp
-          FreshDeviceHandlerBase.cpp
          HealthDevice.cpp)
--- a/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+++ b/src/fsfw/devicehandlers/DeviceCommunicationIF.h
@ -49,7 +49,6 @@ class DeviceCommunicationIF {
  // is this needed if there is no open/close call?
  static const ReturnValue_t NOT_ACTIVE = MAKE_RETURN_CODE(0x05);
  static const ReturnValue_t TOO_MUCH_DATA = MAKE_RETURN_CODE(0x06);
-  static constexpr ReturnValue_t BUSY = MAKE_RETURN_CODE(0x07);

  virtual ~DeviceCommunicationIF() {}

--- a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
@ -567,7 +567,7 @@ void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) {
    continueToNormal = false;
    // TODO: Check whether the following two lines are okay to do so.
    transitionSourceMode = MODE_ON;
-    transitionSourceSubMode = newSubmode;
+    transitionSourceSubMode = submode;
    mode = _MODE_TO_NORMAL;
    return;
  }
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@ -257,8 +257,8 @@ class DeviceHandlerBase : public DeviceHandlerIF,
  Mode_t getTransitionSourceMode() const;
  Submode_t getTransitionSourceSubMode() const;
  virtual void getMode(Mode_t *mode, Submode_t *submode);
-  virtual HealthState getHealth() override;
-  virtual ReturnValue_t setHealth(HealthState health) override;
+  HealthState getHealth();
+  ReturnValue_t setHealth(HealthState health);
  virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId,
                                     ParameterWrapper *parameterWrapper,
                                     const ParameterWrapper *newValues,
--- a/src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.cpp
@ -10,9 +10,8 @@

 object_id_t DeviceHandlerFailureIsolation::powerConfirmationId = objects::NO_OBJECT;

-DeviceHandlerFailureIsolation::DeviceHandlerFailureIsolation(object_id_t owner, object_id_t parent,
-                                                             uint8_t eventQueueDepth)
-    : FailureIsolationBase(owner, parent, eventQueueDepth),
+DeviceHandlerFailureIsolation::DeviceHandlerFailureIsolation(object_id_t owner, object_id_t parent)
+    : FailureIsolationBase(owner, parent),
      strangeReplyCount(DEFAULT_MAX_STRANGE_REPLIES, DEFAULT_STRANGE_REPLIES_TIME_MS,
                        parameterDomainBase++),
      missedReplyCount(DEFAULT_MAX_MISSED_REPLY_COUNT, DEFAULT_MISSED_REPLY_TIME_MS,
@ -26,11 +25,6 @@ ReturnValue_t DeviceHandlerFailureIsolation::eventReceived(EventMessage* event)
  if (isFdirInActionOrAreWeFaulty(event)) {
    return returnvalue::OK;
  }
-  // As mentioned in the function documentation, no FDIR reaction are performed when the device
-  // is in external control.
-  if (owner->getHealth() == HasHealthIF::EXTERNAL_CONTROL) {
-    return returnvalue::OK;
-  }
  ReturnValue_t result = returnvalue::FAILED;
  switch (event->getEvent()) {
    case HasModesIF::MODE_TRANSITION_FAILED:
@ -191,6 +185,15 @@ void DeviceHandlerFailureIsolation::setFdirState(FDIRState state) {
  fdirState = state;
 }

+void DeviceHandlerFailureIsolation::triggerEvent(Event event, uint32_t parameter1,
+                                                 uint32_t parameter2) {
+  // Do not throw error events if fdirState != none.
+  // This will still forward MODE and HEALTH INFO events in any case.
+  if (fdirState == NONE || event::getSeverity(event) == severity::INFO) {
+    FailureIsolationBase::triggerEvent(event, parameter1, parameter2);
+  }
+}
+
 bool DeviceHandlerFailureIsolation::isFdirActionInProgress() { return (fdirState != NONE); }

 void DeviceHandlerFailureIsolation::startRecovery(Event reason) {
--- a/src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h
@ -13,10 +13,10 @@ class DeviceHandlerFailureIsolation : public FailureIsolationBase {
  friend class Heater;

 public:
-  DeviceHandlerFailureIsolation(object_id_t owner, object_id_t parent,
-                                uint8_t eventQueueDepth = 10);
+  DeviceHandlerFailureIsolation(object_id_t owner, object_id_t parent);
  ~DeviceHandlerFailureIsolation();
  ReturnValue_t initialize();
+  void triggerEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0);
  bool isFdirActionInProgress();
  virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId,
                                     ParameterWrapper* parameterWrapper,
@ -40,19 +40,6 @@ class DeviceHandlerFailureIsolation : public FailureIsolationBase {
  static const uint32_t DEFAULT_MAX_MISSED_REPLY_COUNT = 5;
  static const uint32_t DEFAULT_MISSED_REPLY_TIME_MS = 10000;

-  /**
-   * This is the default implementation of the eventReceived function.
-   *
-   * It will perform recoveries or failures on a pre-defined set of events. If the user wants
-   * to add handling for custom events, this function should be overriden.
-   *
-   * It should be noted that the default implementation will not perform FDIR reactions if the
-   * handler is faulty or in external control by default. If the user commands the device
-   * manually, this might be related to debugging to testing the device in a low-level way. FDIR
-   * reactions might get in the way of this process by restarting the device or putting it in
-   * the faulty state. If the user still requires FDIR handling in the EXTERNAL_CONTROL case,
-   * this function should be overriden.
-   */
  virtual ReturnValue_t eventReceived(EventMessage* event);
  virtual void eventConfirmed(EventMessage* event);
  void wasParentsFault(EventMessage* event);
--- a/src/fsfw/devicehandlers/DeviceHandlerIF.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerIF.h
@ -85,7 +85,6 @@ class DeviceHandlerIF {
  static const ReturnValue_t NO_REPLY_EXPECTED = MAKE_RETURN_CODE(0xA8);
  static const ReturnValue_t NON_OP_TEMPERATURE = MAKE_RETURN_CODE(0xA9);
  static const ReturnValue_t COMMAND_NOT_IMPLEMENTED = MAKE_RETURN_CODE(0xAA);
-  static const ReturnValue_t NON_OP_STATE_OF_CHARGE = MAKE_RETURN_CODE(0xAB);

  // Standard codes used in scanForReply
  static const ReturnValue_t CHECKSUM_ERROR = MAKE_RETURN_CODE(0xB0);
--- a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp
@ -1,203 +0,0 @@
-#include "FreshDeviceHandlerBase.h"
-
-#include "fsfw/devicehandlers/DeviceHandlerFailureIsolation.h"
-#include "fsfw/ipc/QueueFactory.h"
-#include "fsfw/subsystem/helper.h"
-
-FreshDeviceHandlerBase::FreshDeviceHandlerBase(DhbConfig config)
-    : SystemObject(config.objectId),
-      actionHelper(this, nullptr),
-      modeHelper(this),
-      healthHelper(this, getObjectId()),
-      paramHelper(this),
-      poolManager(this, nullptr),
-      fdirInstance(config.fdirInstance),
-      defaultFdirParent(config.defaultFdirParent) {
-  auto mqArgs = MqArgs(config.objectId, static_cast<void*>(this));
-  messageQueue = QueueFactory::instance()->createMessageQueue(
-      config.msgQueueDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
-}
-FreshDeviceHandlerBase::~FreshDeviceHandlerBase() {
-  QueueFactory::instance()->deleteMessageQueue(messageQueue);
-  if (not hasCustomFdir) {
-    delete fdirInstance;
-  }
-}
-
-[[nodiscard]] object_id_t FreshDeviceHandlerBase::getObjectId() const {
-  return SystemObject::getObjectId();
-}
-
-ReturnValue_t FreshDeviceHandlerBase::performOperation(uint8_t opCode) {
-  performDeviceOperationPreQueueHandling(opCode);
-  handleQueue();
-  fdirInstance->checkForFailures();
-  performDeviceOperation(opCode);
-  poolManager.performHkOperation();
-  return returnvalue::OK;
-}
-
-ReturnValue_t FreshDeviceHandlerBase::performDeviceOperationPreQueueHandling(uint8_t opCode) {
-  return returnvalue::OK;
-}
-
-void FreshDeviceHandlerBase::startTransition(Mode_t mode_, Submode_t submode_) {
-  triggerEvent(CHANGING_MODE, mode_, submode_);
-  // Complete mode transition immediately by default.
-  setMode(mode_, submode_);
-}
-
-void FreshDeviceHandlerBase::setMode(Mode_t newMode, Submode_t newSubmode) {
-  mode = newMode;
-  submode = newSubmode;
-  modeHelper.modeChanged(mode, submode);
-  modeChanged(mode, submode);
-  announceMode(false);
-}
-
-void FreshDeviceHandlerBase::setMode(Mode_t newMode) { setMode(newMode, submode); }
-
-void FreshDeviceHandlerBase::getMode(Mode_t* mode_, Submode_t* submode_) {
-  *mode_ = this->mode;
-  *submode_ = this->submode;
-}
-
-void FreshDeviceHandlerBase::announceMode(bool recursive) {
-  triggerEvent(MODE_INFO, mode, submode);
-}
-
-void FreshDeviceHandlerBase::modeChanged(Mode_t mode_, Submode_t submode_) {}
-
-[[nodiscard]] MessageQueueId_t FreshDeviceHandlerBase::getCommandQueue() const {
-  return messageQueue->getId();
-}
-
-ReturnValue_t FreshDeviceHandlerBase::handleQueue() {
-  CommandMessage command;
-  ReturnValue_t result;
-  for (result = messageQueue->receiveMessage(&command); result == returnvalue::OK;
-       result = messageQueue->receiveMessage(&command)) {
-    result = actionHelper.handleActionMessage(&command);
-    if (result == returnvalue::OK) {
-      continue;
-    }
-
-    result = modeHelper.handleModeCommand(&command);
-    if (result == returnvalue::OK) {
-      continue;
-    }
-
-    result = healthHelper.handleHealthCommand(&command);
-    if (result == returnvalue::OK) {
-      continue;
-    }
-
-    result = paramHelper.handleParameterMessage(&command);
-    if (result == returnvalue::OK) {
-      continue;
-    }
-
-    result = poolManager.handleHousekeepingMessage(&command);
-    if (result == returnvalue::OK) {
-      continue;
-    }
-
-    result = handleCommandMessage(&command);
-    if (result == returnvalue::OK) {
-      continue;
-    }
-    command.setToUnknownCommand();
-    messageQueue->reply(&command);
-  }
-  return result;
-}
-
-HasHealthIF::HealthState FreshDeviceHandlerBase::getHealth() { return healthHelper.getHealth(); }
-
-const HasHealthIF* FreshDeviceHandlerBase::getOptHealthIF() const { return this; }
-
-const HasModesIF& FreshDeviceHandlerBase::getModeIF() const { return *this; }
-
-ModeTreeChildIF& FreshDeviceHandlerBase::getModeTreeChildIF() { return *this; }
-
-ReturnValue_t FreshDeviceHandlerBase::connectModeTreeParent(HasModeTreeChildrenIF& parent) {
-  return modetree::connectModeTreeParent(parent, *this, &healthHelper, modeHelper);
-}
-
-// Executable Overrides.
-void FreshDeviceHandlerBase::setTaskIF(PeriodicTaskIF* task_) { executingTask = task_; }
-
-// Pool Manager overrides.
-LocalDataPoolManager* FreshDeviceHandlerBase::getHkManagerHandle() { return &poolManager; }
-
-[[nodiscard]] uint32_t FreshDeviceHandlerBase::getPeriodicOperationFrequency() const {
-  return this->executingTask->getPeriodMs();
-}
-
-ReturnValue_t FreshDeviceHandlerBase::initializeAfterTaskCreation() {
-  return poolManager.initializeAfterTaskCreation();
-}
-
-ReturnValue_t FreshDeviceHandlerBase::setHealth(HasHealthIF::HealthState health) {
-  // Assembly should handle commanding to OFF.
-  healthHelper.setHealth(health);
-  return returnvalue::OK;
-}
-
-void FreshDeviceHandlerBase::triggerEvent(Event event, uint32_t parameter1, uint32_t parameter2) {
-  fdirInstance->triggerEvent(event, parameter1, parameter2);
-}
-
-void FreshDeviceHandlerBase::forwardEvent(Event event, uint32_t parameter1,
-                                          uint32_t parameter2) const {
-  fdirInstance->triggerEvent(event, parameter1, parameter2);
-}
-
-void FreshDeviceHandlerBase::setToExternalControl() { setHealth(HealthState::EXTERNAL_CONTROL); }
-
-// System Object overrides.
-ReturnValue_t FreshDeviceHandlerBase::initialize() {
-  ReturnValue_t result = modeHelper.initialize();
-  if (result != returnvalue::OK) {
-    return result;
-  }
-  result = healthHelper.initialize();
-  if (result != returnvalue::OK) {
-    return result;
-  }
-  result = actionHelper.initialize(messageQueue);
-  if (result != returnvalue::OK) {
-    return result;
-  }
-  result = paramHelper.initialize();
-  if (result != returnvalue::OK) {
-    return result;
-  }
-
-  result = poolManager.initialize(messageQueue);
-  if (result != returnvalue::OK) {
-    return result;
-  }
-  if (fdirInstance == nullptr) {
-    hasCustomFdir = false;
-    fdirInstance = new DeviceHandlerFailureIsolation(getObjectId(), defaultFdirParent);
-  }
-
-  result = fdirInstance->initialize();
-  if (result != returnvalue::OK) {
-    return result;
-  }
-  return SystemObject::initialize();
-}
-
-ReturnValue_t FreshDeviceHandlerBase::getParameter(uint8_t domainId, uint8_t uniqueId,
-                                                   ParameterWrapper* parameterWrapper,
-                                                   const ParameterWrapper* newValues,
-                                                   uint16_t startAtIndex) {
-  ReturnValue_t result =
-      fdirInstance->getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex);
-  if (result != INVALID_DOMAIN_ID) {
-    return result;
-  }
-  return INVALID_DOMAIN_ID;
-}
--- a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.h
@ -1,167 +0,0 @@
-#pragma once
-
-#include "fsfw/action.h"
-#include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
-#include "fsfw/datapoollocal/LocalDataPoolManager.h"
-#include "fsfw/devicehandlers/DeviceHandlerIF.h"
-#include "fsfw/fdir/FailureIsolationBase.h"
-#include "fsfw/health/HasHealthIF.h"
-#include "fsfw/health/HealthHelper.h"
-#include "fsfw/modes/HasModesIF.h"
-#include "fsfw/objectmanager.h"
-#include "fsfw/parameters/ParameterHelper.h"
-#include "fsfw/parameters/ReceivesParameterMessagesIF.h"
-#include "fsfw/retval.h"
-#include "fsfw/subsystem/ModeTreeChildIF.h"
-#include "fsfw/subsystem/ModeTreeConnectionIF.h"
-#include "fsfw/tasks/ExecutableObjectIF.h"
-#include "fsfw/tasks/PeriodicTaskIF.h"
-
-struct DhbConfig {
-  explicit DhbConfig(object_id_t objectId) : objectId(objectId) {}
-  object_id_t objectId;
-  FailureIsolationBase* fdirInstance = nullptr;
-  object_id_t defaultFdirParent = objects::NO_OBJECT;
-  uint32_t msgQueueDepth = 10;
-};
-
-class FreshDeviceHandlerBase : public SystemObject,
-                               public DeviceHandlerIF,
-                               public HasModesIF,
-                               public HasHealthIF,
-                               public ExecutableObjectIF,
-                               public ModeTreeChildIF,
-                               public ModeTreeConnectionIF,
-                               public HasActionsIF,
-                               public ReceivesParameterMessagesIF,
-                               public HasLocalDataPoolIF {
- public:
-  explicit FreshDeviceHandlerBase(DhbConfig config);
-  ~FreshDeviceHandlerBase() override;
-
-  /**
-   * Periodic helper executed function, implemented by child class.
-   */
-  virtual void performDeviceOperation(uint8_t opCode) = 0;
-
-  [[nodiscard]] object_id_t getObjectId() const override;
-
-  [[nodiscard]] MessageQueueId_t getCommandQueue() const override;
-
-  HasHealthIF::HealthState getHealth() override;
-
-  // Mode Tree Overrides.
-  [[nodiscard]] const HasHealthIF* getOptHealthIF() const override;
-  [[nodiscard]] const HasModesIF& getModeIF() const override;
-  ReturnValue_t connectModeTreeParent(HasModeTreeChildrenIF& parent) override;
-  ModeTreeChildIF& getModeTreeChildIF() override;
-
-  [[nodiscard]] uint32_t getPeriodicOperationFrequency() const override;
-
- protected:
-  // Pool Manager overrides.
-  LocalDataPoolManager* getHkManagerHandle() override;
-  ActionHelper actionHelper;
-  ModeHelper modeHelper;
-  HealthHelper healthHelper;
-  ParameterHelper paramHelper;
-  LocalDataPoolManager poolManager;
-
-  bool hasCustomFdir = false;
-  FailureIsolationBase* fdirInstance;
-  object_id_t defaultFdirParent;
-
-  /**
-   * Pointer to the task which executes this component,
-   * is invalid before setTaskIF was called.
-   */
-  PeriodicTaskIF* executingTask = nullptr;
-
-  Mode_t mode = HasModesIF::MODE_UNDEFINED;
-  Submode_t submode = 0;
-
-  MessageQueueIF* messageQueue;
-
-  /**
-   * The default queue handler will process all messages for the interfaces implemented
-   * by this class. If there are special requirements, for example that action commands are
-   * received on a different queue, the user can override this function for those special
-   * requirements.
-   */
-  virtual ReturnValue_t handleQueue();
-
-  // Mode Helpers.
-  virtual void modeChanged(Mode_t mode, Submode_t submode);
-  /**
-   * The default implementation sets the new mode immediately. If this is not applicable for
-   * certain modes, the user should provide a custom implementation, which performs rougly
-   * the same functionality of this function, when all the steps have been taken to reach the
-   * new mode.
-   */
-  void startTransition(Mode_t mode, Submode_t submode) override;
-  virtual void setMode(Mode_t newMode, Submode_t newSubmode);
-  virtual void setMode(Mode_t newMode);
-  void getMode(Mode_t* mode, Submode_t* submode) override;
-  void setToExternalControl() override;
-  void announceMode(bool recursive) override;
-  // System Object overrides.
-  ReturnValue_t initialize() override;
-
-  /**
-   * Implemented by child class. Handle all command messages which are
-   * not health, mode, action or housekeeping messages.
-   * @param message
-   * @return
-   */
-  virtual ReturnValue_t handleCommandMessage(CommandMessage* message) = 0;
-
-  // HK manager abstract functions.
-  LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override = 0;
-  ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
-                                        LocalDataPoolManager& poolManager) override = 0;
-
-  // Mode abstract functions
-  ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
-                                 uint32_t* msToReachTheMode) override = 0;
-  // Health Overrides.
-  ReturnValue_t setHealth(HealthState health) override;
-  // Action override. Forward to user.
-  ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
-                              const uint8_t* data, size_t size) override = 0;
-  // Executable overrides.
-  virtual ReturnValue_t performOperation(uint8_t opCode) override;
-  ReturnValue_t initializeAfterTaskCreation() override;
-
-  /**
-   * This calls the FDIR instance event trigger function.
-   * @param event
-   * @param parameter1
-   * @param parameter2
-   */
-  void triggerEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0) override;
-  /**
-   * This calls the FDIR instance event forward function.
-   * @param event
-   * @param parameter1
-   * @param parameter2
-   */
-  void forwardEvent(Event event, uint32_t parameter1, uint32_t parameter2) const override;
-  /**
-   * This implementation handles the FDIR parameters. The user can override this to handle
-   * custom parameters.
-   * @param domainId
-   * @param uniqueId
-   * @param parameterWrapper
-   * @param newValues
-   * @param startAtIndex
-   * @return
-   */
-  ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper* parameterWrapper,
-                             const ParameterWrapper* newValues, uint16_t startAtIndex) override;
-
-  virtual ReturnValue_t performDeviceOperationPreQueueHandling(uint8_t opCode);
-
- private:
-  // Executable Overrides.
-  void setTaskIF(PeriodicTaskIF* task) override;
-};
--- a/src/fsfw/devicehandlers/HealthDevice.cpp
+++ b/src/fsfw/devicehandlers/HealthDevice.cpp
@ -29,10 +29,11 @@ ReturnValue_t HealthDevice::initialize() {
  if (result != returnvalue::OK) {
    return result;
  }
-  if (parentQueue != MessageQueueIF::NO_QUEUE) {
+  if (parentQueue != 0) {
    return healthHelper.initialize(parentQueue);
+  } else {
+    return healthHelper.initialize();
  }
-  return healthHelper.initialize();
 }

 MessageQueueId_t HealthDevice::getCommandQueue() const { return commandQueue->getId(); }
--- a/src/fsfw/devicehandlers/HealthDevice.h
+++ b/src/fsfw/devicehandlers/HealthDevice.h
@ -29,8 +29,10 @@ class HealthDevice : public SystemObject, public ExecutableObjectIF, public HasH
 protected:
  HealthState lastHealth;

-  MessageQueueId_t parentQueue = MessageQueueIF::NO_QUEUE;
+  MessageQueueId_t parentQueue;
  MessageQueueIF* commandQueue;
+
+ public:
  HealthHelper healthHelper;
 };

--- a/src/fsfw/events/EventManager.cpp
+++ b/src/fsfw/events/EventManager.cpp
@ -55,9 +55,8 @@ void EventManager::notifyListeners(EventMessage* message) {
      if (result != returnvalue::OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
        sif::error << std::hex << "EventManager::notifyListeners: MSG to 0x" << std::setfill('0')
-                   << std::setw(8) << listener.first << " for event 0x" << std::setw(4)
-                   << message->getEventId() << " failed with result 0x" << std::setw(4) << result
-                   << std::setfill(' ') << std::endl;
+                   << std::setw(8) << listener.first << " failed with result 0x" << std::setw(4)
+                   << result << std::setfill(' ') << std::endl;
 #else
        sif::printError("Sending message to listener 0x%08x failed with result %04x\n",
                        listener.first, result);
--- a/src/fsfw/events/fwSubsystemIdRanges.h
+++ b/src/fsfw/events/fwSubsystemIdRanges.h
@ -10,7 +10,7 @@ enum : uint8_t {
  CDH = 28,
  TCS_1 = 59,
  PCDU_1 = 42,
-  POWER_SWITCH_IF = 43,
+  PCDU_2 = 43,
  HEATER = 50,
  T_SENSORS = 52,
  FDIR = 70,
--- a/src/fsfw/fdir/FailureIsolationBase.cpp
+++ b/src/fsfw/fdir/FailureIsolationBase.cpp
@ -148,16 +148,25 @@ void FailureIsolationBase::doConfirmFault(EventMessage* event) {
 ReturnValue_t FailureIsolationBase::confirmFault(EventMessage* event) { return YOUR_FAULT; }

 void FailureIsolationBase::triggerEvent(Event event, uint32_t parameter1, uint32_t parameter2) {
-  // By default, we trigger all events and also call the handler function to handle FDIR reactions
-  // which might occur due to these events. This makes all events visible. If the handling of
-  // FDIR reaction should be disabled, this should be done through dedicated logic inside the
-  // eventReceived function.
+  // With this mechanism, all events are disabled for a certain device.
+  // That's not so good for visibility.
+  if (isFdirDisabledForSeverity(event::getSeverity(event))) {
+    return;
+  }
  EventMessage message(event, ownerId, parameter1, parameter2);
  EventManagerIF::triggerEvent(&message, eventQueue->getId());
  eventReceived(&message);
 }

-bool FailureIsolationBase::isFdirDisabledForSeverity(EventSeverity_t severity) { return false; }
+bool FailureIsolationBase::isFdirDisabledForSeverity(EventSeverity_t severity) {
+  if ((owner != NULL) && (severity != severity::INFO)) {
+    if (owner->getHealth() == HasHealthIF::EXTERNAL_CONTROL) {
+      // External control disables handling of fault messages.
+      return true;
+    }
+  }
+  return false;
+}

 void FailureIsolationBase::throwFdirEvent(Event event, uint32_t parameter1, uint32_t parameter2) {
  EventMessage message(event, ownerId, parameter1, parameter2);
--- a/src/fsfw/fdir/FailureIsolationBase.h
+++ b/src/fsfw/fdir/FailureIsolationBase.h
@ -44,13 +44,13 @@ class FailureIsolationBase : public ConfirmsFailuresIF, public HasParametersIF {
  virtual void wasParentsFault(EventMessage* event);
  virtual ReturnValue_t confirmFault(EventMessage* event);
  virtual void decrementFaultCounters() = 0;
-  virtual bool isFdirDisabledForSeverity(EventSeverity_t severity);
  ReturnValue_t sendConfirmationRequest(EventMessage* event,
                                        MessageQueueId_t destination = MessageQueueIF::NO_QUEUE);
  void throwFdirEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0);

 private:
  void doConfirmFault(EventMessage* event);
+  bool isFdirDisabledForSeverity(EventSeverity_t severity);
 };

-#endif /* FRAMEWORK_FDIR */
+#endif /* FRAMEWORK_FDIR_FAILUREISOLATIONBASE_H_ */
--- a/src/fsfw/filesystem/HasFileSystemIF.h
+++ b/src/fsfw/filesystem/HasFileSystemIF.h
@ -17,7 +17,7 @@ struct FilesystemParams {
 };

 struct FileOpParams {
-  FileOpParams(const char* path, size_t opSize) : fsParams(path), size(opSize) {}
+  FileOpParams(const char* path, size_t size) : fsParams(path), size(size) {}

  [[nodiscard]] const char* path() const { return fsParams.path; }

@ -80,8 +80,6 @@ class HasFileSystemIF {

  virtual bool isDirectory(const char* path) = 0;

-  virtual bool getFileSize(FilesystemParams params, uint64_t& fileSize) = 0;
-
  virtual bool fileExists(FilesystemParams params) = 0;

  /**
--- a/src/fsfw/globalfunctions/DleParser.h
+++ b/src/fsfw/globalfunctions/DleParser.h
@ -18,11 +18,8 @@
 */
 class DleParser {
 public:
-  //! [EXPORT] : [SKIP]
  static constexpr ReturnValue_t NO_PACKET_FOUND = returnvalue::makeCode(1, 1);
-  //! [EXPORT] : [SKIP]
  static constexpr ReturnValue_t POSSIBLE_PACKET_LOSS = returnvalue::makeCode(1, 2);
-
  using BufPair = std::pair<uint8_t*, size_t>;

  enum class ContextType { NONE, PACKET_FOUND, ERROR };
--- a/src/fsfw/globalfunctions/math/MatrixOperations.h
+++ b/src/fsfw/globalfunctions/math/MatrixOperations.h
@ -1,12 +1,9 @@
 #ifndef MATRIXOPERATIONS_H_
 #define MATRIXOPERATIONS_H_

-#include <fsfw/retval.h>
 #include <stdint.h>

 #include <cmath>
-#include <cstring>
-#include <utility>

 template <typename T1, typename T2 = T1, typename T3 = T2>
 class MatrixOperations {
@ -98,139 +95,6 @@ class MatrixOperations {
      }
    }
  }
-
-  static bool isFinite(const T1 *inputMatrix, uint8_t rows, uint8_t cols) {
-    for (uint8_t col = 0; col < cols; col++) {
-      for (uint8_t row = 0; row < rows; row++) {
-        if (not std::isfinite(inputMatrix[row * cols + cols])) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-  static void writeSubmatrix(T1 *mainMatrix, T1 *subMatrix, uint8_t subRows, uint8_t subCols,
-                             uint8_t mainRows, uint8_t mainCols, uint8_t startRow,
-                             uint8_t startCol) {
-    if ((startRow + subRows > mainRows) or (startCol + subCols > mainCols)) {
-      return;
-    }
-    for (uint8_t row = 0; row < subRows; row++) {
-      for (uint8_t col = 0; col < subCols; col++) {
-        mainMatrix[(startRow + row) * mainCols + (startCol + col)] = subMatrix[row * subCols + col];
-      }
-    }
-  }
-
-  static ReturnValue_t inverseMatrix(const T1 *inputMatrix, T1 *inverse, uint8_t size) {
-    // Stopwatch stopwatch;
-    T1 matrix[size][size], identity[size][size];
-    // reformat array to matrix
-    for (uint8_t row = 0; row < size; row++) {
-      for (uint8_t col = 0; col < size; col++) {
-        matrix[row][col] = inputMatrix[row * size + col];
-      }
-    }
-    // init identity matrix
-    std::memset(identity, 0.0, sizeof(identity));
-    for (uint8_t diag = 0; diag < size; diag++) {
-      identity[diag][diag] = 1;
-    }
-    // gauss-jordan algo
-    // sort matrix such as no diag entry shall be 0
-    for (uint8_t row = 0; row < size; row++) {
-      if (matrix[row][row] == 0.0) {
-        bool swaped = false;
-        uint8_t rowIndex = 0;
-        while ((rowIndex < size) && !swaped) {
-          if ((matrix[rowIndex][row] != 0.0) && (matrix[row][rowIndex] != 0.0)) {
-            for (uint8_t colIndex = 0; colIndex < size; colIndex++) {
-              std::swap(matrix[row][colIndex], matrix[rowIndex][colIndex]);
-              std::swap(identity[row][colIndex], identity[rowIndex][colIndex]);
-            }
-            swaped = true;
-          }
-          rowIndex++;
-        }
-        if (!swaped) {
-          return returnvalue::FAILED;  // matrix not invertible
-        }
-      }
-    }
-
-    for (int row = 0; row < size; row++) {
-      if (matrix[row][row] == 0.0) {
-        uint8_t rowIndex;
-        if (row == 0) {
-          rowIndex = size - 1;
-        } else {
-          rowIndex = row - 1;
-        }
-        for (uint8_t colIndex = 0; colIndex < size; colIndex++) {
-          std::swap(matrix[row][colIndex], matrix[rowIndex][colIndex]);
-          std::swap(identity[row][colIndex], identity[rowIndex][colIndex]);
-        }
-        row--;
-        if (row < 0) {
-          return returnvalue::FAILED;  // Matrix is not invertible
-        }
-      }
-    }
-    // remove non diag elements in matrix (jordan)
-    for (int row = 0; row < size; row++) {
-      for (int rowIndex = 0; rowIndex < size; rowIndex++) {
-        if (row != rowIndex) {
-          double ratio = matrix[rowIndex][row] / matrix[row][row];
-          for (int colIndex = 0; colIndex < size; colIndex++) {
-            matrix[rowIndex][colIndex] -= ratio * matrix[row][colIndex];
-            identity[rowIndex][colIndex] -= ratio * identity[row][colIndex];
-          }
-        }
-      }
-    }
-    // normalize rows in matrix (gauss)
-    for (int row = 0; row < size; row++) {
-      for (int col = 0; col < size; col++) {
-        identity[row][col] = identity[row][col] / matrix[row][row];
-      }
-    }
-    std::memcpy(inverse, identity, sizeof(identity));
-    return returnvalue::OK;  // successful inversion
-  }
-
-  static void inverseMatrixDimThree(const T1 *matrix, T1 *output) {
-    int i, j;
-    double determinant = 0;
-    double mat[3][3] = {{matrix[0], matrix[1], matrix[2]},
-                        {matrix[3], matrix[4], matrix[5]},
-                        {matrix[6], matrix[7], matrix[8]}};
-
-    for (i = 0; i < 3; i++) {
-      determinant = determinant + (mat[0][i] * (mat[1][(i + 1) % 3] * mat[2][(i + 2) % 3] -
-                                                mat[1][(i + 2) % 3] * mat[2][(i + 1) % 3]));
-    }
-    for (i = 0; i < 3; i++) {
-      for (j = 0; j < 3; j++) {
-        output[i * 3 + j] = ((mat[(j + 1) % 3][(i + 1) % 3] * mat[(j + 2) % 3][(i + 2) % 3]) -
-                             (mat[(j + 1) % 3][(i + 2) % 3] * mat[(j + 2) % 3][(i + 1) % 3])) /
-                            determinant;
-      }
-    }
-  }
-
-  static void skewMatrix(const T1 *vector, T2 *result) {
-    // Input Dimension [3], Output [3][3]
-    result[0] = 0;
-    result[1] = -vector[2];
-    result[2] = vector[1];
-    result[3] = vector[2];
-    result[4] = 0;
-    result[5] = -vector[0];
-    result[6] = -vector[1];
-    result[7] = vector[0];
-    result[8] = 0;
-  }
 };

 #endif /* MATRIXOPERATIONS_H_ */
--- a/src/fsfw/globalfunctions/math/QuaternionOperations.cpp
+++ b/src/fsfw/globalfunctions/math/QuaternionOperations.cpp
@ -39,48 +39,6 @@ void QuaternionOperations::inverse(const double* quaternion, double* inverseQuat
  VectorOperations<double>::mulScalar(inverseQuaternion, -1, inverseQuaternion, 3);
 }

-void QuaternionOperations::slerp(const double q1[4], const double q2[4], const double weight,
-                                 double q[4]) {
-  double q1s[4] = {0, 0, 0, 0}, q2I[4] = {0, 0, 0, 0}, qD[4] = {0, 0, 0, 0}, left[4] = {0, 0, 0, 0},
-         right[4] = {0, 0, 0, 0}, angle = 0;
-
-  // we need to be able to invert this quaternion
-  std::memcpy(q1s, q1, 4 * sizeof(double));
-  // calculate angle between orientations
-  inverse(q2, q2I);
-  multiply(q1s, q2I, qD);
-  angle = std::acos(qD[3]);
-
-  if (std::cos(angle) < 0.0) {
-    // we need to invert one quaternion
-    VectorOperations<double>::mulScalar(q1s, -1, q1s, 4);
-    multiply(q1s, q2I, qD);
-    angle = std::acos(qD[3]);
-  }
-
-  if (std::sin(angle) == 0.0) {
-    // nothing to calculate here
-    std::memcpy(q, q1s, 4 * sizeof(double));
-    return;
-  }
-
-  VectorOperations<double>::mulScalar(q1s, std::sin((1 - weight) * angle) / std::sin(angle), left,
-                                      4);
-  VectorOperations<double>::mulScalar(q2, std::sin(weight * angle) / std::sin(angle), right, 4);
-  VectorOperations<double>::add(left, right, q, 4);
-
-  normalize(q);
-}
-
-void QuaternionOperations::preventSignJump(double qNew[4], const double qOld[4]) {
-  double qDiff[4] = {0, 0, 0, 0}, qSum[4] = {0, 0, 0, 0};
-  VectorOperations<double>::subtract(qOld, qNew, qDiff, 4);
-  VectorOperations<double>::add(qOld, qNew, qSum, 4);
-  if (VectorOperations<double>::norm(qDiff, 4) > VectorOperations<double>::norm(qSum, 4)) {
-    VectorOperations<double>::mulScalar(qNew, -1, qNew, 4);
-  }
-}
-
 QuaternionOperations::QuaternionOperations() {}

 void QuaternionOperations::normalize(const double* quaternion, double* unitQuaternion) {
@ -162,25 +120,3 @@ double QuaternionOperations::getAngle(const double* quaternion, bool abs) {
    }
  }
 }
-
-void QuaternionOperations::rotationFromQuaternions(const double qNew[4], const double qOld[4],
-                                                   const double timeDelta, double rotRate[3]) {
-  double qOldInv[4] = {0, 0, 0, 0};
-  double qDelta[4] = {0, 0, 0, 0};
-
-  inverse(qOld, qOldInv);
-  multiply(qNew, qOldInv, qDelta);
-  if (VectorOperations<double>::norm(qDelta, 4) != 0.0) {
-    normalize(qDelta);
-  }
-  if (VectorOperations<double>::norm(qDelta, 3) == 0.0) {
-    rotRate[0] = 0.0;
-    rotRate[1] = 0.0;
-    rotRate[2] = 0.0;
-    return;
-  }
-  double rotVec[3] = {0, 0, 0};
-  double angle = getAngle(qDelta);
-  VectorOperations<double>::normalize(qDelta, rotVec, 3);
-  VectorOperations<double>::mulScalar(rotVec, angle / timeDelta, rotRate, 3);
-}
--- a/src/fsfw/globalfunctions/math/QuaternionOperations.h
+++ b/src/fsfw/globalfunctions/math/QuaternionOperations.h
@ -23,13 +23,6 @@ class QuaternionOperations {

  static void inverse(const double *quaternion, double *inverseQuaternion);

-  static void slerp(const double q1[4], const double q2[4], const double weight, double q[4]);
-
-  static void rotationFromQuaternions(const double qNew[4], const double qOld[4],
-                                      const double timeDelta, double rotRate[3]);
-
-  static void preventSignJump(double qNew[4], const double qOld[4]);
-
  /**
   * returns angle in ]-Pi;Pi] or [0;Pi] if abs == true
   */
--- a/src/fsfw/globalfunctions/math/VectorOperations.h
+++ b/src/fsfw/globalfunctions/math/VectorOperations.h
@ -53,9 +53,8 @@ class VectorOperations {
    mulScalar(vector, 1 / norm(vector, size), normalizedVector, size);
  }

-  static T maxAbsValue(const T *vector, uint8_t size, uint8_t *index = nullptr) {
-    T max = vector[size - 1];
-    uint8_t foundIndex = size - 1;
+  static T maxAbsValue(const T *vector, uint8_t size, uint8_t *index = 0) {
+    T max = -1;

    for (; size > 0; size--) {
      T abs = vector[size - 1];
@ -65,49 +64,29 @@ class VectorOperations {
      if (abs > max) {
        max = abs;
        if (index != 0) {
-          foundIndex = size - 1;
+          *index = size - 1;
        }
      }
    }
-
-    if (index != nullptr) {
-      *index = foundIndex;
-    }
-
    return max;
  }

-  static T maxValue(const T *vector, uint8_t size, uint8_t *index = nullptr) {
-    T max = vector[size - 1];
-    uint8_t foundIndex = size - 1;
+  static T maxValue(const T *vector, uint8_t size, uint8_t *index = 0) {
+    T max = -1;

    for (; size > 0; size--) {
      if (vector[size - 1] > max) {
        max = vector[size - 1];
        if (index != 0) {
-          foundIndex = size - 1;
+          *index = size - 1;
        }
      }
    }
-
-    if (index != nullptr) {
-      *index = foundIndex;
-    }
-
    return max;
  }

  static void copy(const T *in, T *out, uint8_t size) { mulScalar(in, 1, out, size); }

-  static bool isFinite(const T *inputVector, uint8_t size) {
-    for (uint8_t i = 0; i < size; i++) {
-      if (not std::isfinite(inputVector[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
 private:
  VectorOperations();
 };
--- a/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp
+++ b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp
@ -3,37 +3,85 @@
 #include <cmath>

 #include "fsfw/datapoollocal/LocalPoolDataSetBase.h"
-#include "fsfw/serviceinterface.h"

 PeriodicHousekeepingHelper::PeriodicHousekeepingHelper(LocalPoolDataSetBase* owner)
    : owner(owner) {}

 void PeriodicHousekeepingHelper::initialize(float collectionInterval,
-                                            dur_millis_t minimumPeriodicInterval) {
+                                            dur_millis_t minimumPeriodicInterval,
+                                            uint8_t nonDiagIntervalFactor) {
  this->minimumPeriodicInterval = minimumPeriodicInterval;
-  changeCollectionInterval(collectionInterval);
+  this->nonDiagIntervalFactor = nonDiagIntervalFactor;
+  collectionIntervalTicks = intervalSecondsToIntervalTicks(collectionInterval);
+  /* This will cause a checkOpNecessary call to be true immediately. I think it's okay
+      if a HK packet is generated immediately instead of waiting one generation cycle. */
+  internalTickCounter = collectionIntervalTicks;
 }

 float PeriodicHousekeepingHelper::getCollectionIntervalInSeconds() const {
-  return collectionInterval;
+  return intervalTicksToSeconds(collectionIntervalTicks);
 }

 bool PeriodicHousekeepingHelper::checkOpNecessary() {
-  if (hkGenerationCd.hasTimedOut()) {
-    hkGenerationCd.resetTimer();
+  if (internalTickCounter >= collectionIntervalTicks) {
+    internalTickCounter = 1;
    return true;
  }
+  internalTickCounter++;
  return false;
 }

-void PeriodicHousekeepingHelper::changeCollectionInterval(float newIntervalSeconds) {
-  uint32_t intervalMs = newIntervalSeconds * 1000;
-  if (newIntervalSeconds <= 0) {
-    intervalMs = minimumPeriodicInterval;
-    newIntervalSeconds = static_cast<float>(minimumPeriodicInterval) / 1000.0;
+uint32_t PeriodicHousekeepingHelper::intervalSecondsToIntervalTicks(
+    float collectionIntervalSeconds) {
+  if (owner == nullptr) {
+    return 0;
+  }
+  bool isDiagnostics = owner->isDiagnostics();
+
+  /* Avoid division by zero */
+  if (minimumPeriodicInterval == 0) {
+    if (isDiagnostics) {
+      /* Perform operation each cycle */
+      return 1;
+    } else {
+      return nonDiagIntervalFactor;
+    }
+  } else {
+    dur_millis_t intervalInMs = collectionIntervalSeconds * 1000;
+    uint32_t divisor = minimumPeriodicInterval;
+    if (not isDiagnostics) {
+      /* We need to multiply the divisor because non-diagnostics only
+      allow a multiple of the minimum periodic interval */
+      divisor *= nonDiagIntervalFactor;
+    }
+    uint32_t ticks = std::ceil(static_cast<float>(intervalInMs) / divisor);
+    if (not isDiagnostics) {
+      /* Now we need to multiply the calculated ticks with the factor as as well
+      because the minimum tick count to generate a non-diagnostic is the factor itself.
+
+      Example calculation for non-diagnostic with
+      0.4 second interval and 0.2 second task interval.
+      Resultant tick count of 5 is equal to operation each second.
+
+      Examle calculation for non-diagnostic with  2.0 second interval and 0.2 second
+      task interval.
+      Resultant tick count of 10 is equal to operatin every 2 seconds.
+
+      Example calculation for diagnostic with 0.4 second interval and 0.3
+      second task interval. Resulting tick count of 2 is equal to operation
+      every 0.6 seconds. */
+      ticks *= nonDiagIntervalFactor;
+    }
+    return ticks;
  }
-  collectionInterval = newIntervalSeconds;
-  hkGenerationCd.setTimeout(intervalMs);
-  // We want an immediate HK packet at the start, so time out the generation CD immediately.
-  hkGenerationCd.timeOut();
+}
+
+float PeriodicHousekeepingHelper::intervalTicksToSeconds(uint32_t collectionInterval) const {
+  /* Number of ticks times the minimum interval is in milliseconds, so we divide by 1000 to get
+  the value in seconds */
+  return static_cast<float>(collectionInterval * minimumPeriodicInterval / 1000.0);
+}
+
+void PeriodicHousekeepingHelper::changeCollectionInterval(float newIntervalSeconds) {
+  collectionIntervalTicks = intervalSecondsToIntervalTicks(newIntervalSeconds);
 }
--- a/src/fsfw/housekeeping/PeriodicHousekeepingHelper.h
+++ b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.h
@ -4,7 +4,6 @@
 #include <cstdint>

 #include "fsfw/timemanager/Clock.h"
-#include "fsfw/timemanager/Countdown.h"

 class LocalPoolDataSetBase;

@ -12,7 +11,8 @@ class PeriodicHousekeepingHelper {
 public:
  PeriodicHousekeepingHelper(LocalPoolDataSetBase* owner);

-  void initialize(float collectionInterval, dur_millis_t minimumPeriodicInterval);
+  void initialize(float collectionInterval, dur_millis_t minimumPeriodicInterval,
+                  uint8_t nonDiagIntervalFactor);

  void changeCollectionInterval(float newInterval);
  float getCollectionIntervalInSeconds() const;
@ -20,10 +20,14 @@ class PeriodicHousekeepingHelper {

 private:
  LocalPoolDataSetBase* owner = nullptr;
-  Countdown hkGenerationCd;
-  float collectionInterval = 0.0;
+  uint8_t nonDiagIntervalFactor = 0;
+
+  uint32_t intervalSecondsToIntervalTicks(float collectionIntervalSeconds);
+  float intervalTicksToSeconds(uint32_t collectionInterval) const;

  dur_millis_t minimumPeriodicInterval = 0;
+  uint32_t internalTickCounter = 1;
+  uint32_t collectionIntervalTicks = 0;
 };

 #endif /* FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_ */
--- a/src/fsfw/internalerror/InternalErrorReporter.cpp
+++ b/src/fsfw/internalerror/InternalErrorReporter.cpp
@ -5,12 +5,9 @@
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"

-InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth,
-                                             bool enableSetByDefault, float generationFrequency)
+InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth)
    : SystemObject(setObjectId),
      poolManager(this, commandQueue),
-      enableSetByDefault(enableSetByDefault),
-      generationFrequency(generationFrequency),
      internalErrorSid(setObjectId, InternalErrorDataset::ERROR_SET_ID),
      internalErrorDataset(this) {
  commandQueue = QueueFactory::instance()->createMessageQueue(messageQueueDepth);
@ -137,8 +134,9 @@ ReturnValue_t InternalErrorReporter::initializeLocalDataPool(localpool::DataPool
  localDataPoolMap.emplace(errorPoolIds::TM_HITS, &tmHitsEntry);
  localDataPoolMap.emplace(errorPoolIds::QUEUE_HITS, &queueHitsEntry);
  localDataPoolMap.emplace(errorPoolIds::STORE_HITS, &storeHitsEntry);
-  poolManager.subscribeForRegularPeriodicPacket(
-      subdp::RegularHkPeriodicParams(internalErrorSid, enableSetByDefault, generationFrequency));
+  poolManager.subscribeForDiagPeriodicPacket(subdp::DiagnosticsHkPeriodicParams(
+      internalErrorSid, false,
+      static_cast<float>(getPeriodicOperationFrequency()) / static_cast<float>(1000.0)));
  internalErrorDataset.setValidity(true, true);
  return returnvalue::OK;
 }
--- a/src/fsfw/internalerror/InternalErrorReporter.h
+++ b/src/fsfw/internalerror/InternalErrorReporter.h
@ -21,8 +21,7 @@ class InternalErrorReporter : public SystemObject,
                              public InternalErrorReporterIF,
                              public HasLocalDataPoolIF {
 public:
-  InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth,
-                        bool enableSetByDefault, float generationFrequency);
+  InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth = 5);

  /**
   * Enable diagnostic printout. Please note that this feature will
@ -64,8 +63,6 @@ class InternalErrorReporter : public SystemObject,
  MutexIF* mutex = nullptr;
  MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
  uint32_t timeoutMs = 20;
-  bool enableSetByDefault;
-  float generationFrequency;

  sid_t internalErrorSid;
  InternalErrorDataset internalErrorDataset;
--- a/src/fsfw/objectmanager/ObjectManager.cpp
+++ b/src/fsfw/objectmanager/ObjectManager.cpp
@ -116,8 +116,8 @@ void ObjectManager::initialize() {
                 << std::dec << std::setfill(' ') << std::endl;
 #else
      sif::printError(
-          "ObjectManager::initialize: Object 0x%08x failed to initialize with code 0x%04x\n",
-          it.first, result);
+          "ObjectManager::initialize: Object 0x%08x failed to initialize with code 0x%04x\n", var,
+          it.first);
 #endif
 #endif
      errorCount++;
--- a/src/fsfw/osal/common/TcpTmTcBridge.cpp
+++ b/src/fsfw/osal/common/TcpTmTcBridge.cpp
@ -21,7 +21,7 @@ TcpTmTcBridge::TcpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
    : TmTcBridge("TCP TMTC Bridge", objectId, tcDestination, msgQueueDepth, tmStoreId, tcStoreId) {
  mutex = MutexFactory::instance()->createMutex();
  // Connection is always up, TM is requested by connecting to server and receiving packets
-  TmTcBridge::registerCommConnect();
+  registerCommConnect();
 }

 ReturnValue_t TcpTmTcBridge::initialize() {
--- a/Show More
+++ b/Show More