diff --git a/score/mw/com/design/events_fields/event_lola_model.puml b/score/mw/com/design/events_fields/event_lola_model.puml
index 62c534b39..3f43c6c15 100644
--- a/score/mw/com/design/events_fields/event_lola_model.puml
+++ b/score/mw/com/design/events_fields/event_lola_model.puml
@@ -39,7 +39,7 @@ abstract class SkeletonBinding {
 ' Concrete classes
 class lola::SkeletonEvent<SampleType> {
   -event_data_storage: EventDataStorage<SampleType>*
-  -event_data_control: score::cpp::optional<EventDataControlComposite>
+  -event_data_control: score::cpp::optional<EventDataControlComposite<>>
   +SkeletonEvent(parent: Skeleton&, event_fqn: const ElementFqId, max_number_of_slots: const std::size_t, enforce_max_samples: const bool)
   +Send(SampleType const&): void
   +Send(SampleAllocateePtr<SampleType>): void
@@ -71,7 +71,7 @@ class lola::Skeleton {
   +Skeleton(const InstanceIdentifier&, SkeletonEvents&)
   +PrepareOffer(): ResultBlank
   +PrepareStopOffer(): ResultBlank
-  +Register(ElementFqId, size_t numberOfSlots): std::pair<EventDataStorage*, EventDataControlComposite>
+  +Register(ElementFqId, size_t numberOfSlots): std::pair<EventDataStorage*, EventDataControlComposite<>>
   +GetInstanceQualityType() const: QualityType
 }
 
@@ -136,7 +136,7 @@ class lola::SampleAllocateePtr<SampleType> {
   -event_data_control_: EventDataControlComposite
   +SampleAllocateePtr()
   +SampleAllocateePtr(std::nullptr_t)
-  +SampleAllocateePtr(ptr: pointer, const EventDataControlComposite&, const EventDataControl::SlotIndexType)
+  +SampleAllocateePtr(ptr: pointer, const EventDataControlComposite<>&, const EventDataControl::SlotIndexType)
   +GetReferencedSlot() const: EventDataControl::SlotIndexType
   +get() const: SampleType*
   +reset(std::nullptr_t): void
@@ -159,7 +159,7 @@ class lola::SamplePtr<SampleType> {
   -event_data_control_: EventDataControl*
   +SamplePtr()
   +SamplePtr(std::nullptr_t)
-  +SamplePtr(pointer ptr, const EventDataControlComposite&, const EventDataControl::SlotIndexType)
+  +SamplePtr(pointer ptr, const EventDataControlComposite<>&, const EventDataControl::SlotIndexType)
   +get() const: pointer
   +swap(): void
 }
@@ -213,11 +213,11 @@ class "<<SharedMemory>>\nlola::EventSlotStatus" {
   +IsTimeStampBetween(EventTimeStamp min, EventTimeStamp max): bool
 }
 
-class EventDataControlCompositeImpl<memory::shared::AtomicIndirectorType> {
+class EventDataControlComposite<memory::shared::AtomicIndirectorType> {
   -asil_qm_control_: EventDataControl*
   -asil_b_control_: EventDataControl*
-  +EventDataControlCompositeImpl(asil_qm_control: EventDataControl* const)
-  +EventDataControlCompositeImpl(asil_qm_control: EventDataControl* const, asil_b_control: EventDataControl* const)
+  +EventDataControlComposite(asil_qm_control: EventDataControl* const)
+  +EventDataControlComposite(asil_qm_control: EventDataControl* const, asil_b_control: EventDataControl* const)
   +AllocateNextSlot(): std::optional<EventDataControl::SlotIndexType>
   +EventReady(EventDataControl::SlotIndexType, EventSlotStatus::EventTimeStamp): void
   +Discard(EventDataControl::SlotIndexType): void
@@ -238,7 +238,7 @@ lola::Skeleton *-- SkeletonDataStorage : "1..1"
 lola::Skeleton *-- "<<SharedMemory>>\nlola::SkeletonDataControl" : "1..2"
 "<<SharedMemory>>\nlola::SkeletonDataControl" *-- "<<SharedMemory>>\nlola::EventDataControlImpl" : "0..n"
 lola::SkeletonEvent o-- "EventDataStorage"
-lola::SkeletonEvent *-- EventDataControlCompositeImpl
+lola::SkeletonEvent *-- EventDataControlComposite
 "<<SharedMemory>>\nlola::EventDataControlImpl" ..> "<<SharedMemory>>\nlola::EventSlotStatus"
 SampleAllocateePtr o-- lola::SampleAllocateePtr
 SamplePtr o-- lola::SamplePtr
@@ -246,10 +246,10 @@ lola::ProxyEvent *-- lola::ProxyEventCommon
 lola::ProxyEventCommon *-- lola::SubscriptionStateMachine
 lola::ProxyEventCommon --* lola::SlotCollector
 ProxyEventBindingBase o-- SubscriptionState
-lola::SampleAllocateePtr *-- EventDataControlCompositeImpl
-EventDataControlCompositeImpl o-- "<<SharedMemory>>\nlola::EventDataControlImpl" : "2"
+lola::SampleAllocateePtr *-- EventDataControlComposite
+EventDataControlComposite o-- "<<SharedMemory>>\nlola::EventDataControlImpl" : "2"
 lola::Skeleton ..> lola::ShmPathBuilder : uses
-lola::Skeleton ..> EventDataControlCompositeImpl
+lola::Skeleton ..> EventDataControlComposite
 lola::SubscriptionStateMachine ..> lola::SlotCollector : <<creates>>
 SkeletonEventBinding ..> SampleAllocateePtr
 lola::ProxyEvent ..> lola::SamplePtr
diff --git a/score/mw/com/design/partial_restart/transaction_log_model.puml b/score/mw/com/design/partial_restart/transaction_log_model.puml
index 25343d571..d53ae3a69 100644
--- a/score/mw/com/design/partial_restart/transaction_log_model.puml
+++ b/score/mw/com/design/partial_restart/transaction_log_model.puml
@@ -46,7 +46,7 @@ class "lola::EventDataControlImpl" <<SharedMemory>> {
   +AllocateNextSlot(): std::optional<SlotIndexType>
   +EventReady(SlotIndexType, EventTimestamp): void
   +Discard(SlotIndexType): void
-  +ReferenceNextEvent(lastSearchTime : EventTimestampType, upper_limit : const EventSlotStatus::EventTimeStamp = EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX): std::optional<SlotIndexType>
+  +ReferenceNextEvent(lastSearchTime : EventTimestampType, upper_limit : const EventSlotStatus::EventTimeStamp = EventSlotStatus::TIMESTAMP_MAX): std::optional<SlotIndexType>
   +DereferenceEvent(SlotIndexType eventSlotIndex): void
   +GetNumNewEvents(reference_time : const EventSlotStatus::EventTimeStamp) const : std::size_t
   +<b>GetTransactionLogSet() : TransactionLogSet&</b>
diff --git a/score/mw/com/design/skeleton_proxy/generic_proxy/README.md b/score/mw/com/design/skeleton_proxy/generic_proxy/README.md
index f4babd7d2..cdb42bfb0 100644
--- a/score/mw/com/design/skeleton_proxy/generic_proxy/README.md
+++ b/score/mw/com/design/skeleton_proxy/generic_proxy/README.md
@@ -87,7 +87,7 @@ The map containing the meta-information gets initialized by the skeleton instanc
 the vectors containing the sample slots in
 ```
 template <typename SampleType>
-std::pair<EventDataStorage<SampleType>*, EventDataControlComposite> lola::Skeleton::Register(ElementFqId event_fqn,
+std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>> lola::Skeleton::Register(ElementFqId event_fqn,
    std::size_t number_of_slots)
 ```
 
diff --git a/score/mw/com/design/skeleton_proxy/skeleton_binding_model.puml b/score/mw/com/design/skeleton_proxy/skeleton_binding_model.puml
index ade6b6cac..dff2f8af4 100644
--- a/score/mw/com/design/skeleton_proxy/skeleton_binding_model.puml
+++ b/score/mw/com/design/skeleton_proxy/skeleton_binding_model.puml
@@ -150,7 +150,7 @@ class "lola::Skeleton" as lola_Skeleton {
     +PrepareStopOffer(): void
 
     template <typename SampleType>
-    +Register(ElementFqId, size_t num_slots): std::pair<EventDataStorage<SampleType>*,EventDataControlComposite>
+    +Register(ElementFqId, size_t num_slots): std::pair<EventDataStorage<SampleType>*,EventDataControlComposite<>>
 }
 
 class "lola::SkeletonEvent<SampleType>" as lola_SkeletonEvent {
diff --git a/score/mw/com/design/skeleton_proxy/skeleton_proxy_binding_model.puml b/score/mw/com/design/skeleton_proxy/skeleton_proxy_binding_model.puml
index 37fbe704f..421510d1f 100644
--- a/score/mw/com/design/skeleton_proxy/skeleton_proxy_binding_model.puml
+++ b/score/mw/com/design/skeleton_proxy/skeleton_proxy_binding_model.puml
@@ -35,7 +35,7 @@ class "lola::Skeleton" as LolaSkeleton {
   +PrepareOffer(SkeletonBinding::SkeletonEventBindings&, SkeletonBinding::SkeletonFieldBindings&): ResultBlank
   +PrepareStopOffer(): void
 
-  +template <typename SampleType>\n Register(ElementFqId, size_t num_slots): std::pair<EventDataStorage<SampleType>*, EventDataControlComposite>
+  +template <typename SampleType>\n Register(ElementFqId, size_t num_slots): std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>>
 }
 
 class "SkeletonBindingFactory" {
diff --git a/score/mw/com/impl/bindings/lola/BUILD b/score/mw/com/impl/bindings/lola/BUILD
index 731dddd39..26924a34c 100644
--- a/score/mw/com/impl/bindings/lola/BUILD
+++ b/score/mw/com/impl/bindings/lola/BUILD
@@ -216,24 +216,16 @@ cc_library(
 )
 
 cc_library(
-    name = "shared_data_structures",
-    srcs = [
-        "service_data_control.cpp",
-        "service_data_storage.cpp",
-    ],
-    hdrs = [
-        "service_data_control.h",
-        "service_data_storage.h",
-    ],
+    name = "service_data_storage",
+    srcs = ["service_data_storage.cpp"],
+    hdrs = ["service_data_storage.h"],
     features = COMPILER_WARNING_FEATURES,
     tags = ["FFI"],
     visibility = [
         "//score/mw/com/impl/bindings/lola/test_doubles:__pkg__",
     ],
     deps = [
-        ":application_id_pid_mapping",
         ":element_fq_id",
-        ":event",
         ":event_meta_info",
         ":i_runtime",
         "//score/mw/com/impl:runtime",
@@ -242,6 +234,24 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "service_data_control",
+    srcs = ["service_data_control.cpp"],
+    hdrs = ["service_data_control.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    visibility = [
+        "//score/mw/com/impl/bindings/lola/test_doubles:__pkg__",
+    ],
+    deps = [
+        ":application_id_pid_mapping",
+        ":element_fq_id",
+        ":event_control",
+        ":event_meta_info",
+        "@score_baselibs//score/memory/shared",
+    ],
+)
+
 cc_library(
     name = "skeleton",
     srcs = [
@@ -268,7 +278,8 @@ cc_library(
         ":i_shm_path_builder",
         ":partial_restart_path_builder",
         ":proxy_instance_identifier",
-        ":shared_data_structures",
+        ":service_data_control",
+        ":service_data_storage",
         ":shm_path_builder",
         ":skeleton_instance_identifier",
         ":transaction_log_registration_guard",
@@ -308,14 +319,6 @@ cc_library(
         "proxy_event.cpp",
         "proxy_event_common.cpp",
         "proxy_method.cpp",
-        "slot_collector.cpp",
-        "subscription_helpers.cpp",
-        "subscription_not_subscribed_states.cpp",
-        "subscription_state_base.cpp",
-        "subscription_state_machine.cpp",
-        "subscription_state_machine_states.cpp",
-        "subscription_subscribed_states.cpp",
-        "subscription_subscription_pending_states.cpp",
     ],
     hdrs = [
         "generic_proxy_event.h",
@@ -323,14 +326,6 @@ cc_library(
         "proxy_event.h",
         "proxy_event_common.h",
         "proxy_method.h",
-        "slot_collector.h",
-        "subscription_helpers.h",
-        "subscription_not_subscribed_states.h",
-        "subscription_state_base.h",
-        "subscription_state_machine.h",
-        "subscription_state_machine_states.h",
-        "subscription_subscribed_states.h",
-        "subscription_subscription_pending_states.h",
     ],
     features = COMPILER_WARNING_FEATURES,
     tags = ["FFI"],
@@ -340,8 +335,11 @@ cc_library(
         ":event_control",
         ":event_subscription_control",
         ":proxy_instance_identifier",
-        ":shared_data_structures",
+        ":service_data_control",
+        ":service_data_storage",
         ":shm_path_builder",
+        ":slot_collector",
+        ":subscription_state_machine",
         ":transaction_log_id",
         ":transaction_log_registration_guard",
         ":transaction_log_rollback_executor",
@@ -426,6 +424,54 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "subscription_state_machine",
+    srcs = [
+        "subscription_helpers.cpp",
+        "subscription_not_subscribed_states.cpp",
+        "subscription_state_base.cpp",
+        "subscription_state_machine.cpp",
+        "subscription_state_machine_states.cpp",
+        "subscription_subscribed_states.cpp",
+        "subscription_subscription_pending_states.cpp",
+    ],
+    hdrs = [
+        "subscription_helpers.h",
+        "subscription_not_subscribed_states.h",
+        "subscription_state_base.h",
+        "subscription_state_machine.h",
+        "subscription_state_machine_states.h",
+        "subscription_subscribed_states.h",
+        "subscription_subscription_pending_states.h",
+    ],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    deps = [
+        ":event_control",
+        ":event_data_control",
+        ":i_runtime",
+        ":slot_collector",
+        ":transaction_log_id",
+        ":transaction_log_registration_guard",
+        "//score/mw/com/impl:runtime",
+        "//score/mw/com/impl:scoped_event_receive_handler",
+        "//score/mw/com/impl/bindings/lola/messaging:i_message_passing_service",
+    ],
+)
+
+cc_library(
+    name = "slot_collector",
+    srcs = ["slot_collector.cpp"],
+    hdrs = ["slot_collector.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    deps = [
+        ":event_data_control",
+        ":event_slot_status",
+        ":transaction_log_set",
+    ],
+)
+
 cc_library(
     name = "application_id_pid_mapping",
     srcs = ["application_id_pid_mapping.cpp"],
@@ -689,7 +735,7 @@ cc_library(
     tags = ["FFI"],
     visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
     deps = [
-        ":shared_data_structures",
+        ":service_data_control",
         ":transaction_log_id",
         ":transaction_log_set",
         "//score/mw/com/impl:runtime",
@@ -882,7 +928,7 @@ cc_unit_test(
 )
 
 cc_test(
-    name = "event_data_control_unit_test",
+    name = "event_data_control_test",
     size = "small",
     timeout = "long",
     srcs = [
@@ -907,7 +953,7 @@ cc_test(
 )
 
 cc_gtest_unit_test(
-    name = "event_data_control_composite_unit_test",
+    name = "event_data_control_composite_test",
     srcs = ["event_data_control_composite_test.cpp"],
     features = COMPILER_WARNING_FEATURES,
     deps = [
@@ -1170,7 +1216,7 @@ cc_gtest_unit_test(
         ":element_fq_id",
         ":event_meta_info",
         ":runtime_mock",
-        ":shared_data_structures",
+        ":service_data_storage",
         "//score/mw/com/impl:binding_type",
         "//score/mw/com/impl/test:runtime_mock_guard",
         "@score_baselibs//score/memory/shared:map",
@@ -1213,7 +1259,7 @@ cc_gtest_unit_test(
     ],
     features = COMPILER_WARNING_FEATURES,
     deps = [
-        ":proxy",
+        ":slot_collector",
         "//score/mw/com/impl/bindings/lola/test_doubles",
     ],
 )
@@ -1226,6 +1272,7 @@ cc_gtest_unit_test(
     features = COMPILER_WARNING_FEATURES,
     deps = [
         ":event_data_control_test_resources",
+        ":subscription_state_machine",
         "//score/mw/com/impl/bindings/lola/test:proxy_event_test_resources",
         "//score/mw/com/impl/bindings/lola/test:transaction_log_test_resources",
     ],
@@ -1238,6 +1285,7 @@ cc_gtest_unit_test(
     ],
     features = COMPILER_WARNING_FEATURES,
     deps = [
+        ":subscription_state_machine",
         "//score/mw/com/impl/bindings/lola/test:proxy_event_test_resources",
     ],
 )
@@ -1249,7 +1297,7 @@ cc_gtest_unit_test(
     ],
     features = COMPILER_WARNING_FEATURES,
     deps = [
-        ":proxy",
+        ":subscription_state_machine",
     ],
 )
 
@@ -1381,8 +1429,8 @@ cc_unit_test_suites_for_host_and_qnx(
         ":transaction_log_slot_test",
         ":transaction_log_test",
         ":dynamic_array_bounds_checking_test",
-        ":event_data_control_unit_test",
-        ":event_data_control_composite_unit_test",
+        ":event_data_control_test",
+        ":event_data_control_composite_test",
         ":generic_proxy_event_test",
         ":partial_restart_path_builder_test",
         ":proxy_instance_identifier_test",
diff --git a/score/mw/com/impl/bindings/lola/event_data_control.cpp b/score/mw/com/impl/bindings/lola/event_data_control.cpp
index a384bf0c8..adeb4bfce 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control.cpp
+++ b/score/mw/com/impl/bindings/lola/event_data_control.cpp
@@ -106,7 +106,7 @@ template <template <class> class AtomicIndirectorType>
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
 auto EventDataControlImpl<AtomicIndirectorType>::FindOldestUnusedSlot() noexcept -> ControlSlotIndicator
 {
-    EventSlotStatus::EventTimeStamp oldest_time_stamp{EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX};
+    EventSlotStatus::EventTimeStamp oldest_time_stamp{EventSlotStatus::TIMESTAMP_MAX};
 
     ControlSlotIndicator selected_slot{};
     // Suppress "AUTOSAR C++14 A5-2-2" finding rule. This rule states: "Traditional C-style casts shall not be used".
@@ -342,7 +342,7 @@ std::size_t EventDataControlImpl<AtomicIndirectorType>::GetNumNewEvents(
     {
         // coverity[autosar_cpp14_a5_3_2_violation]
         const EventSlotStatus slot_status{slot.load(std::memory_order_relaxed)};
-        if (slot_status.IsTimeStampBetween(reference_time, EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX))
+        if (slot_status.IsTimeStampBetween(reference_time, EventSlotStatus::TIMESTAMP_MAX))
         {
             // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall not lead to
             // loss.". This is a false positive as the maximum number of slots is std::uint16_t, so there is no case for
diff --git a/score/mw/com/impl/bindings/lola/event_data_control.h b/score/mw/com/impl/bindings/lola/event_data_control.h
index bf30caee4..6828ea89b 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control.h
+++ b/score/mw/com/impl/bindings/lola/event_data_control.h
@@ -46,15 +46,12 @@ class EventDataControlAttorney;
 // coverity[autosar_cpp14_m3_2_3_violation]
 class EventDataControlCompositeAttorney;
 
-namespace detail_event_data_control_composite
-{
 // Suppress The rule AUTOSAR C++14 M3-2-3: "A type, object or function that is used in multiple translation units shall
 // be declared in one and only one file."
 // This is a forward declaration that does not vioalate this rule.
 // coverity[autosar_cpp14_m3_2_3_violation]
 template <template <class> class T>
-class EventDataControlCompositeImpl;
-}  // namespace detail_event_data_control_composite
+class EventDataControlComposite;
 
 namespace detail_event_data_control
 {
@@ -82,6 +79,14 @@ class EventDataControlImpl final
     // coverity[autosar_cpp14_a11_3_1_violation]
     friend class lola::EventDataControlCompositeAttorney;
 
+    template <template <typename> class T>
+    // Suppress "AUTOSAR C++14 A11-3-1", The rule declares: "Friend declarations shall not be used".
+    // In order that users do not depend on implementation details, we only expose on user facing classes the bare
+    // necessary. Thus, we have friend classes that expose internals for our implementation. Design decision for better
+    // encapsulation.
+    // coverity[autosar_cpp14_a11_3_1_violation]
+    friend class lola::EventDataControlComposite;
+
   public:
     using EventControlSlots =
         score::containers::DynamicArray<ControlSlotType,
@@ -157,10 +162,10 @@ class EventDataControlImpl final
     ///         timestamp (are older).
     ///         If no such event exists, an invalid ControlSlotIndicator is returned.
     /// \post DereferenceEvent() is invoked to withdraw read-ownership
-    ControlSlotIndicator ReferenceNextEvent(const EventSlotStatus::EventTimeStamp last_search_time,
-                                            const TransactionLogSet::TransactionLogIndex transaction_log_index,
-                                            const EventSlotStatus::EventTimeStamp upper_limit =
-                                                EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX) noexcept;
+    ControlSlotIndicator ReferenceNextEvent(
+        const EventSlotStatus::EventTimeStamp last_search_time,
+        const TransactionLogSet::TransactionLogIndex transaction_log_index,
+        const EventSlotStatus::EventTimeStamp upper_limit = EventSlotStatus::TIMESTAMP_MAX) noexcept;
 
     /// \brief Returns number/count of events within event slots, which are newer than the given timestamp.
     /// \param reference_time given reference timestamp.
@@ -232,14 +237,6 @@ class EventDataControlImpl final
     static inline std::atomic_uint_fast64_t num_ref_misses{0U};
     static inline std::atomic_uint_fast64_t num_alloc_retries{0U};
     static inline std::atomic_uint_fast64_t num_ref_retries{0U};
-
-    template <template <typename> class T>
-    // Suppress "AUTOSAR C++14 A11-3-1", The rule declares: "Friend declarations shall not be used".
-    // In order that users do not depend on implementation details, we only expose on user facing classes the bare
-    // necessary. Thus, we have friend classes that expose internals for our implementation. Design decision for better
-    // encapsulation.
-    // coverity[autosar_cpp14_a11_3_1_violation]
-    friend class detail_event_data_control_composite::EventDataControlCompositeImpl;
 };
 
 }  // namespace detail_event_data_control
diff --git a/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp b/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp
index f124db121..16d0e0055 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp
+++ b/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp
@@ -11,28 +11,29 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/event_data_control_composite.h"
+
 #include <utility>
 
-namespace score::mw::com::impl::lola::detail_event_data_control_composite
+namespace score::mw::com::impl::lola
 {
 
 namespace
 {
+
 constexpr std::size_t MAX_MULTI_ALLOCATE_RETRY_COUNT{100U};
+
 }
 
 // NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init): all members are initialized in the delegated constructor
 template <template <class> class AtomicIndirectorType>
-EventDataControlCompositeImpl<AtomicIndirectorType>::EventDataControlCompositeImpl(
-    EventDataControl* const asil_qm_control)
-    : EventDataControlCompositeImpl{asil_qm_control, nullptr}
+EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(EventDataControl* const asil_qm_control)
+    : EventDataControlComposite{asil_qm_control, nullptr}
 {
 }
 
 template <template <class> class AtomicIndirectorType>
-EventDataControlCompositeImpl<AtomicIndirectorType>::EventDataControlCompositeImpl(
-    EventDataControl* const asil_qm_control,
-    EventDataControl* const asil_b_control)
+EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(EventDataControl* const asil_qm_control,
+                                                                           EventDataControl* const asil_b_control)
     : asil_qm_control_{asil_qm_control}, asil_b_control_{asil_b_control}, ignore_qm_control_{false}
 {
     CheckForValidDataControls();
@@ -45,10 +46,10 @@ template <template <class> class AtomicIndirectorType>
 // throwing std::bad_optional_access which leds to std::terminate(). This suppression should be removed after fixing
 // [Ticket-173043](broken_link_j/Ticket-173043)
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-auto EventDataControlCompositeImpl<AtomicIndirectorType>::GetNextFreeMultiSlot() const noexcept
+auto EventDataControlComposite<AtomicIndirectorType>::GetNextFreeMultiSlot() const noexcept
     -> ControlSlotCompositeIndicator
 {
-    EventSlotStatus::EventTimeStamp oldest_time_stamp{EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX};
+    EventSlotStatus::EventTimeStamp oldest_time_stamp{EventSlotStatus::TIMESTAMP_MAX};
     score::cpp::optional<SlotIndexType> possible_index{};
     EventDataControl::EventControlSlots::iterator qm_slot_ptr{nullptr};
     EventDataControl::EventControlSlots::iterator asil_b_slot_ptr{nullptr};
@@ -120,8 +121,8 @@ template <template <class> class AtomicIndirectorType>
 // in case the index goes outside the range. As we already do an index check before accessing, so no way for
 // segmentation fault which leds to calling std::terminate().
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-auto EventDataControlCompositeImpl<AtomicIndirectorType>::TryLockSlot(
-    ControlSlotCompositeIndicator slot_indicator) noexcept -> bool
+auto EventDataControlComposite<AtomicIndirectorType>::TryLockSlot(ControlSlotCompositeIndicator slot_indicator) noexcept
+    -> bool
 {
     auto& slot_value_qm = slot_indicator.GetSlotQM();
     auto& slot_value_asil_b = slot_indicator.GetSlotAsilB();
@@ -163,8 +164,7 @@ template <template <class> class AtomicIndirectorType>
 // have a value but as we check before with 'has_value()' so no way for throwing std::bad_optional_access which leds
 // to std::terminate().
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-auto EventDataControlCompositeImpl<AtomicIndirectorType>::AllocateNextMultiSlot() noexcept
-    -> ControlSlotCompositeIndicator
+auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextMultiSlot() noexcept -> ControlSlotCompositeIndicator
 {
     // \todo we should also monitor retry counts in the multi-slot/EventDataControlComposite case, like we are doing in
     //  EventDataControl! Currently we are "blind", if we have retries, because ASIL-QM/ASIL-B consumers do influence
@@ -185,7 +185,7 @@ auto EventDataControlCompositeImpl<AtomicIndirectorType>::AllocateNextMultiSlot(
 }
 
 template <template <class> class AtomicIndirectorType>
-auto EventDataControlCompositeImpl<AtomicIndirectorType>::AllocateNextSlot() noexcept -> ControlSlotCompositeIndicator
+auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcept -> ControlSlotCompositeIndicator
 {
     if (asil_b_control_ == nullptr)
     {
@@ -233,9 +233,9 @@ auto EventDataControlCompositeImpl<AtomicIndirectorType>::AllocateNextSlot() noe
 }
 
 template <template <class> class AtomicIndirectorType>
-auto EventDataControlCompositeImpl<AtomicIndirectorType>::EventReady(
-    ControlSlotCompositeIndicator slot_indicator,
-    EventSlotStatus::EventTimeStamp time_stamp) noexcept -> void
+auto EventDataControlComposite<AtomicIndirectorType>::EventReady(ControlSlotCompositeIndicator slot_indicator,
+                                                                 EventSlotStatus::EventTimeStamp time_stamp) noexcept
+    -> void
 {
     if (asil_b_control_ != nullptr)
     {
@@ -249,7 +249,7 @@ auto EventDataControlCompositeImpl<AtomicIndirectorType>::EventReady(
 }
 
 template <template <class> class AtomicIndirectorType>
-auto EventDataControlCompositeImpl<AtomicIndirectorType>::Discard(ControlSlotCompositeIndicator slot_indicator) -> void
+auto EventDataControlComposite<AtomicIndirectorType>::Discard(ControlSlotCompositeIndicator slot_indicator) -> void
 {
     if (asil_b_control_ != nullptr)
     {
@@ -263,20 +263,19 @@ auto EventDataControlCompositeImpl<AtomicIndirectorType>::Discard(ControlSlotCom
 }
 
 template <template <class> class AtomicIndirectorType>
-bool EventDataControlCompositeImpl<AtomicIndirectorType>::IsQmControlDisconnected() const noexcept
+bool EventDataControlComposite<AtomicIndirectorType>::IsQmControlDisconnected() const noexcept
 {
     return ignore_qm_control_;
 }
 
 template <template <class> class AtomicIndirectorType>
-EventDataControl& EventDataControlCompositeImpl<AtomicIndirectorType>::GetQmEventDataControl() const noexcept
+EventDataControl& EventDataControlComposite<AtomicIndirectorType>::GetQmEventDataControl() const noexcept
 {
     return *asil_qm_control_;
 }
 
 template <template <class> class AtomicIndirectorType>
-std::optional<EventDataControl*>
-EventDataControlCompositeImpl<AtomicIndirectorType>::GetAsilBEventDataControl() noexcept
+std::optional<EventDataControl*> EventDataControlComposite<AtomicIndirectorType>::GetAsilBEventDataControl() noexcept
 {
     if (asil_b_control_ != nullptr)
     {
@@ -286,7 +285,7 @@ EventDataControlCompositeImpl<AtomicIndirectorType>::GetAsilBEventDataControl()
 }
 
 template <template <class> class AtomicIndirectorType>
-EventSlotStatus::EventTimeStamp EventDataControlCompositeImpl<AtomicIndirectorType>::GetEventSlotTimestamp(
+EventSlotStatus::EventTimeStamp EventDataControlComposite<AtomicIndirectorType>::GetEventSlotTimestamp(
     const SlotIndexType slot) const noexcept
 {
     if (asil_b_control_ != nullptr)
@@ -304,7 +303,7 @@ EventSlotStatus::EventTimeStamp EventDataControlCompositeImpl<AtomicIndirectorTy
 }
 
 template <template <class> class AtomicIndirectorType>
-void EventDataControlCompositeImpl<AtomicIndirectorType>::CheckForValidDataControls() const noexcept
+void EventDataControlComposite<AtomicIndirectorType>::CheckForValidDataControls() const noexcept
 {
     if (asil_qm_control_ == nullptr)
     {
@@ -318,7 +317,7 @@ template <template <class> class AtomicIndirectorType>
 // in case the index goes outside the range. As we already do an index check before accessing, so no way for
 // segmentation fault which leds to calling std::terminate().
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-EventSlotStatus::EventTimeStamp EventDataControlCompositeImpl<AtomicIndirectorType>::GetLatestTimestamp() const noexcept
+EventSlotStatus::EventTimeStamp EventDataControlComposite<AtomicIndirectorType>::GetLatestTimestamp() const noexcept
 {
     EventSlotStatus::EventTimeStamp latest_time_stamp{1U};
     EventDataControl* control = (asil_b_control_ != nullptr) ? asil_b_control_ : asil_qm_control_;
@@ -343,7 +342,7 @@ EventSlotStatus::EventTimeStamp EventDataControlCompositeImpl<AtomicIndirectorTy
     return latest_time_stamp;
 }
 
-template class EventDataControlCompositeImpl<memory::shared::AtomicIndirectorReal>;
-template class EventDataControlCompositeImpl<memory::shared::AtomicIndirectorMock>;
+template class EventDataControlComposite<memory::shared::AtomicIndirectorReal>;
+template class EventDataControlComposite<memory::shared::AtomicIndirectorMock>;
 
-}  // namespace score::mw::com::impl::lola::detail_event_data_control_composite
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/event_data_control_composite.h b/score/mw/com/impl/bindings/lola/event_data_control_composite.h
index c052bedf0..920d371b4 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control_composite.h
+++ b/score/mw/com/impl/bindings/lola/event_data_control_composite.h
@@ -10,8 +10,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#ifndef DDAD_SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_COMPOSITE_H_
-#define DDAD_SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_COMPOSITE_H_
+#ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_COMPOSITE_H_
+#define SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_COMPOSITE_H_
 
 #include "score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h"
 #include "score/mw/com/impl/bindings/lola/control_slot_types.h"
@@ -29,9 +29,6 @@ namespace score::mw::com::impl::lola
 
 class EventDataControlCompositeAttorney;
 
-namespace detail_event_data_control_composite
-{
-
 /// \brief Encapsulates multiple EventDataControl instances
 ///
 /// \details Due to the fact that we have multiple EventDataControl instances (one for ASIL, one for QM) we need to
@@ -40,21 +37,20 @@ namespace detail_event_data_control_composite
 /// control structures. Please be aware that the control structures will live in different shared memory segments, thus
 /// it is not possible to store them by value, but rather as pointer.
 template <template <class> class AtomicIndirectorType = memory::shared::AtomicIndirectorReal>
-class EventDataControlCompositeImpl
+class EventDataControlComposite
 {
     // Suppress "AUTOSAR C++14 A11-3-1", The rule declares: "Friend declarations shall not be used".
     // The "EventDataControlCompositeAttorney" class is a helper, which sets the internal state of
-    // "EventDataControlCompositeImpl" accessing private members and used for testing purposes only.
+    // "EventDataControlComposite" accessing private members and used for testing purposes only.
     // coverity[autosar_cpp14_a11_3_1_violation]
     friend class lola::EventDataControlCompositeAttorney;
 
   public:
     /// \brief Constructs a composite which will only manage a single QM control (no ASIL use-case)
-    explicit EventDataControlCompositeImpl(EventDataControl* const asil_qm_control);
+    explicit EventDataControlComposite(EventDataControl* const asil_qm_control);
 
     /// \brief Constructs a composite which will manage QM and ASIL control at the same time
-    explicit EventDataControlCompositeImpl(EventDataControl* const asil_qm_control,
-                                           EventDataControl* const asil_b_control);
+    explicit EventDataControlComposite(EventDataControl* const asil_qm_control, EventDataControl* const asil_b_control);
 
     /// \brief Checks for the oldest unused slot and acquires for writing (thread-safe, wait-free)
     ///
@@ -116,9 +112,6 @@ class EventDataControlCompositeImpl
     void CheckForValidDataControls() const noexcept;
 };
 
-}  // namespace detail_event_data_control_composite
-
-using EventDataControlComposite = detail_event_data_control_composite::EventDataControlCompositeImpl<>;
-
 }  // namespace score::mw::com::impl::lola
-#endif  // DDAD_SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_COMPOSITE_H_
+
+#endif  // SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_COMPOSITE_H_
diff --git a/score/mw/com/impl/bindings/lola/event_data_control_composite_test.cpp b/score/mw/com/impl/bindings/lola/event_data_control_composite_test.cpp
index 3f046d58f..e33cdf0a0 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control_composite_test.cpp
+++ b/score/mw/com/impl/bindings/lola/event_data_control_composite_test.cpp
@@ -96,7 +96,7 @@ class EventDataControlCompositeFixture : public ::testing::Test
         SCORE_LANGUAGE_FUTURECPP_ASSERT(qm_ != nullptr);
 
         auto* const asil_control = asil_ != nullptr ? asil_.get() : nullptr;
-        unit_ = std::make_unique<EventDataControlComposite>(qm_.get(), asil_control);
+        unit_ = std::make_unique<EventDataControlComposite<>>(qm_.get(), asil_control);
         return *this;
     }
 
@@ -108,9 +108,8 @@ class EventDataControlCompositeFixture : public ::testing::Test
         memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(atomic_mock_.get());
 
         auto* const asil_control = asil_ != nullptr ? asil_.get() : nullptr;
-        unit_mock_ = std::make_unique<
-            detail_event_data_control_composite::EventDataControlCompositeImpl<memory::shared::AtomicIndirectorMock>>(
-            qm_.get(), asil_control);
+        unit_mock_ =
+            std::make_unique<EventDataControlComposite<memory::shared::AtomicIndirectorMock>>(qm_.get(), asil_control);
 
         return *this;
     }
@@ -159,12 +158,10 @@ class EventDataControlCompositeFixture : public ::testing::Test
 
     std::unique_ptr<EventDataControl> asil_{nullptr};
     std::unique_ptr<EventDataControl> qm_{nullptr};
-    std::unique_ptr<EventDataControlComposite> unit_{nullptr};
+    std::unique_ptr<EventDataControlComposite<>> unit_{nullptr};
 
     std::unique_ptr<memory::shared::AtomicMock<EventSlotStatus::value_type>> atomic_mock_{nullptr};
-    std::unique_ptr<
-        detail_event_data_control_composite::EventDataControlCompositeImpl<memory::shared::AtomicIndirectorMock>>
-        unit_mock_{nullptr};
+    std::unique_ptr<EventDataControlComposite<memory::shared::AtomicIndirectorMock>> unit_mock_{nullptr};
 
     std::unique_ptr<TransactionLogSet::TransactionLogIndex> transaction_log_index_qm_{nullptr};
     std::unique_ptr<TransactionLogSet::TransactionLogIndex> transaction_log_index_asil_{nullptr};
@@ -479,7 +476,7 @@ TEST_F(EventDataControlCompositeFixture, QmConsumerViolation)
     ReadyAllSlots();
     ASSERT_FALSE(unit_->IsQmControlDisconnected());
     // and a QM consumer, which blocks/references ALL slots
-    auto upper_limit = EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX;
+    auto upper_limit = EventSlotStatus::TIMESTAMP_MAX;
     for (auto counter = 0; counter < 5; ++counter)
     {
         auto slot_indicator = qm_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
@@ -509,7 +506,7 @@ TEST_F(EventDataControlCompositeFixture, AllocationIgnoresQMAfterContractViolati
     ReadyAllSlots();
 
     // and a QM consumer, which blocks/references ALL slots and thus already violated the contract
-    auto upper_limit = EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX;
+    auto upper_limit = EventSlotStatus::TIMESTAMP_MAX;
     for (auto counter = 0; counter < 5; ++counter)
     {
         auto slot_indicator = qm_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
@@ -550,7 +547,7 @@ TEST_F(EventDataControlCompositeFixture, AsilBConsumerViolation)
     ReadyAllSlots();
 
     // and an ASIL-B consumer, which blocks/references ALL slots
-    auto upper_limit = EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX;
+    auto upper_limit = EventSlotStatus::TIMESTAMP_MAX;
     for (auto counter = 0; counter < 5; ++counter)
     {
         auto slot_indicator = asil_->ReferenceNextEvent(0, *transaction_log_index_asil_, upper_limit);
diff --git a/score/mw/com/impl/bindings/lola/event_data_control_test.cpp b/score/mw/com/impl/bindings/lola/event_data_control_test.cpp
index c7ddec4a7..57bb4e510 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control_test.cpp
+++ b/score/mw/com/impl/bindings/lola/event_data_control_test.cpp
@@ -75,11 +75,6 @@ TEST(EventDataControlTest, EventDataControlUsesADynamicArrayToRepresentSlots)
 class EventDataControlFixture : public ::testing::Test
 {
   public:
-    FakeMemoryResource memory_{};
-    std::unique_ptr<memory::shared::AtomicMock<EventSlotStatus::value_type>> atomic_mock_{nullptr};
-    std::unique_ptr<detail_event_data_control::EventDataControlImpl<memory::shared::AtomicIndirectorMock>> unit_mock_{
-        nullptr};
-
     static void SetUpTestSuite()
     {
         // we are annotating this requirement coverage for SSR-6225206 on test-suite level, as all
@@ -91,22 +86,48 @@ class EventDataControlFixture : public ::testing::Test
         RecordProperty("DerivationTechnique", "Analysis of requirements");
     }
 
-    EventDataControlFixture& WithMockedEventDataControl()
+    void TearDown() override
+    {
+        memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(nullptr);
+    }
+
+    EventDataControlFixture& GivenARealEventDataControl(
+        const SlotIndexType max_slots,
+        const LolaEventInstanceDeployment::SubscriberCountType max_subscribers)
+    {
+        unit_ = std::make_unique<EventDataControl>(max_slots, memory_, max_subscribers);
+
+        return *this;
+    }
+
+    EventDataControlFixture& GivenAMockedEventDataControl(
+        const SlotIndexType max_slots,
+        const LolaEventInstanceDeployment::SubscriberCountType max_subscribers)
     {
         atomic_mock_ = std::make_unique<memory::shared::AtomicMock<EventSlotStatus::value_type>>();
         memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(atomic_mock_.get());
 
         unit_mock_ =
             std::make_unique<detail_event_data_control::EventDataControlImpl<memory::shared::AtomicIndirectorMock>>(
-                kMaxSlots, memory_, kMaxSubscribers);
+                max_slots, memory_, max_subscribers);
 
         return *this;
     }
 
-    void TearDown() override
+    EventDataControlFixture& WithAnAllocatedSlot(EventSlotStatus::EventTimeStamp timestamp = 1)
     {
-        memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(nullptr);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(unit_ != nullptr);
+        auto slot = unit_->AllocateNextSlot();
+        EXPECT_TRUE(slot.IsValid());
+        unit_->EventReady(slot, timestamp);
+        return *this;
     }
+
+    FakeMemoryResource memory_{};
+    std::unique_ptr<memory::shared::AtomicMock<EventSlotStatus::value_type>> atomic_mock_{nullptr};
+    std::unique_ptr<detail_event_data_control::EventDataControlImpl<memory::shared::AtomicIndirectorMock>> unit_mock_{
+        nullptr};
+    std::unique_ptr<EventDataControl> unit_{nullptr};
 };
 
 TEST_F(EventDataControlFixture, CanAllocateOneSlotWithoutContention)
@@ -118,10 +139,10 @@ TEST_F(EventDataControlFixture, CanAllocateOneSlotWithoutContention)
     RecordProperty("DerivationTechnique", "Analysis of requirements");
 
     // Given an initialized EventDataControl structure
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
 
     // When allocating a slot
-    auto slot = unit.AllocateNextSlot();
+    auto slot = unit_->AllocateNextSlot();
 
     EXPECT_TRUE(slot.IsValid());
     // The expected (first) slot is returned
@@ -136,8 +157,7 @@ TEST_F(EventDataControlFixture, CanAllocateOneSlotWhenReferenceCountChanges)
     RecordProperty("Priority", "1");
     RecordProperty("DerivationTechnique", "Analysis of requirements");
 
-    // Given an initialized EventDataControl structure
-    score::cpp::ignore = WithMockedEventDataControl();
+    score::cpp::ignore = GivenAMockedEventDataControl(kMaxSlots, kMaxSubscribers);
 
     // And an atomic mimicking two relevant slots where ...
     EXPECT_CALL(*atomic_mock_, load(_))
@@ -177,11 +197,11 @@ TEST_F(EventDataControlFixture, CanAllocateOneSlotWhenReferenceCountChanges)
 TEST_F(EventDataControlFixture, CanAllocateMultipleSlotWithoutContention)
 {
     // Given an initialized EventDataControl structure where already a slot is allocated
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
-    unit.AllocateNextSlot();
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
+    unit_->AllocateNextSlot();
 
     // When allocating a slot
-    const auto slot = unit.AllocateNextSlot();
+    const auto slot = unit_->AllocateNextSlot();
 
     // Then the second possible slot is returned
     EXPECT_EQ(slot.GetIndex(), 1);
@@ -190,15 +210,15 @@ TEST_F(EventDataControlFixture, CanAllocateMultipleSlotWithoutContention)
 TEST_F(EventDataControlFixture, DiscardedElementOnWritingWillBeInvalid)
 {
     // Given an initialized EventDataControl structure where already a slot is allocated
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
-    auto slot = unit.AllocateNextSlot();
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
+    auto slot = unit_->AllocateNextSlot();
 
     // When discarding that slot
-    unit.Discard(slot);
+    unit_->Discard(slot);
 
     // Then the slot is marked as invalid
     // either accessed via EventDataControl array-elem-access-op
-    EXPECT_TRUE(unit[slot.GetIndex()].IsInvalid());
+    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInvalid());
     // or via raw-pointer
     EXPECT_TRUE(EventSlotStatus(slot.GetSlot().load()).IsInvalid());
 }
@@ -206,29 +226,29 @@ TEST_F(EventDataControlFixture, DiscardedElementOnWritingWillBeInvalid)
 TEST_F(EventDataControlFixture, DiscardedElementAfterWritingIsNotTouched)
 {
     // Given an initialized EventDataControl structure where already a slot is written
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
-    const auto slot = unit.AllocateNextSlot();
-    unit.EventReady(slot, 0x42);
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
+    const auto slot = unit_->AllocateNextSlot();
+    unit_->EventReady(slot, 0x42);
 
     // When discarding that slot
-    unit.Discard(slot);
+    unit_->Discard(slot);
 
     // Then the slot is not touched
-    EXPECT_EQ(unit[slot.GetIndex()].GetTimeStamp(), 0x42);
-    EXPECT_EQ(unit[slot.GetIndex()].GetReferenceCount(), 0);
+    EXPECT_EQ((*unit_)[slot.GetIndex()].GetTimeStamp(), 0x42);
+    EXPECT_EQ((*unit_)[slot.GetIndex()].GetReferenceCount(), 0);
 }
 
 TEST_F(EventDataControlFixture, CanNotAllocateSlotIfAllSlotsAllocated)
 {
     // Given an initialized EventDataControl structure where all slots are allocated
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
     for (auto counter = 0; counter < 5; ++counter)
     {
-        unit.AllocateNextSlot();
+        unit_->AllocateNextSlot();
     }
 
     // When trying to allocate another slot
-    const auto slot = unit.AllocateNextSlot();
+    const auto slot = unit_->AllocateNextSlot();
 
     // Then this is not possible
     EXPECT_FALSE(slot.IsValid());
@@ -237,16 +257,16 @@ TEST_F(EventDataControlFixture, CanNotAllocateSlotIfAllSlotsAllocated)
 TEST_F(EventDataControlFixture, CanAllocateSlotAfterOneSlotReady)
 {
     // Given an initialized EventDataControl structure where all slots are allocated
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
     std::array<ControlSlotIndicator, 5U> slot_indicators{};
     for (auto counter = 0U; counter < 5U; ++counter)
     {
-        slot_indicators[counter] = unit.AllocateNextSlot();
+        slot_indicators[counter] = unit_->AllocateNextSlot();
     }
 
     // When trying freeing one slot and trying to allocate another one
-    unit.EventReady(slot_indicators[3], 1);
-    const auto slot = unit.AllocateNextSlot();
+    unit_->EventReady(slot_indicators[3], 1);
+    const auto slot = unit_->AllocateNextSlot();
 
     // Then the freed slot is allocated
     EXPECT_EQ(slot.GetIndex(), 3);
@@ -255,17 +275,17 @@ TEST_F(EventDataControlFixture, CanAllocateSlotAfterOneSlotReady)
 TEST_F(EventDataControlFixture, CanAllocateOldestSlotAfterOneSlotReady)
 {
     // Given an initialized EventDataControl structure where all slots are allocated
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
     std::array<ControlSlotIndicator, 5U> slot_indicators{};
     for (auto counter = 0U; counter < 5U; ++counter)
     {
-        slot_indicators[counter] = unit.AllocateNextSlot();
+        slot_indicators[counter] = unit_->AllocateNextSlot();
     }
 
     // When trying freeing multiple slots and trying to allocate another one
-    unit.EventReady(slot_indicators[4], 3);
-    unit.EventReady(slot_indicators[2], 2);
-    const auto slot = unit.AllocateNextSlot();
+    unit_->EventReady(slot_indicators[4], 3);
+    unit_->EventReady(slot_indicators[2], 2);
+    const auto slot = unit_->AllocateNextSlot();
 
     // Then the oldest (lowest timestamp) slot is allocated
     EXPECT_EQ(slot.GetIndex(), 2);
@@ -278,10 +298,10 @@ TEST_F(EventDataControlFixture, CanAllocateOldestSlotAfterOneSlotReady)
 TEST_F(EventDataControlFixture, MultithreadedSlotAllocationDeallocation)
 {
     // Given an empty EventDataControl
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
 
     std::atomic<EventSlotStatus::EventTimeStamp> time_stamp{1};
-    auto fuzzer = [&unit, &time_stamp]() {
+    auto fuzzer = [this, &time_stamp]() {
         // Worker that alternates between slot allocation and deallocation, ensuring an increasing time stamp
         std::vector<ControlSlotIndicator> allocated_events{};
         bool allocate{false};
@@ -289,7 +309,7 @@ TEST_F(EventDataControlFixture, MultithreadedSlotAllocationDeallocation)
         {
             if ((allocate = !allocate))
             {
-                const auto slot = unit.AllocateNextSlot();
+                const auto slot = unit_->AllocateNextSlot();
                 if (slot.IsValid())
                 {
                     allocated_events.push_back(slot);
@@ -300,7 +320,7 @@ TEST_F(EventDataControlFixture, MultithreadedSlotAllocationDeallocation)
                 if (!allocated_events.empty())
                 {
                     const auto index = RandomNumberBetween(0, allocated_events.size() - 1);
-                    unit.EventReady(allocated_events[index], ++time_stamp);
+                    unit_->EventReady(allocated_events[index], ++time_stamp);
                 }
             }
         }
@@ -324,10 +344,11 @@ TEST_F(EventDataControlFixture, MultithreadedSlotAllocationDeallocation)
 TEST_F(EventDataControlFixture, RegisterProxyElementReturnsValidTransactionLogIndex)
 {
     // Given a EventDataControlUnit
-    EventDataControl unit{1, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(1, kMaxSubscribers);
 
     // When registering the proxy with the TransactionLogSet
-    const auto transaction_log_index_result = unit.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId);
+    const auto transaction_log_index_result =
+        unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId);
 
     // Then we get a valid transaction log index
     ASSERT_TRUE(transaction_log_index_result.has_value());
@@ -337,18 +358,17 @@ TEST_F(EventDataControlFixture, RegisterProxyElementReturnsValidTransactionLogIn
 TEST_F(EventDataControlFixture, FindNextSlotBlocksAllocation)
 {
     // Given a EventDataControlUnit with one ready slot
-    EventDataControl unit{1, memory_, kMaxSubscribers};
-    auto slot = unit.AllocateNextSlot();
-    unit.EventReady(slot, 1);
+    GivenARealEventDataControl(1, kMaxSubscribers).WithAnAllocatedSlot(1);
 
-    const auto transaction_log_index = unit.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+    const auto transaction_log_index =
+        unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     // When finding the next slot
-    auto event = unit.ReferenceNextEvent(0, transaction_log_index);
+    auto event = unit_->ReferenceNextEvent(0, transaction_log_index);
     ASSERT_TRUE(event.IsValid());
 
     // Then we cannot allocate the slot again
-    ASSERT_FALSE(unit.AllocateNextSlot().IsValid());
+    ASSERT_FALSE(unit_->AllocateNextSlot().IsValid());
 }
 
 // Re-enable when the test is fixed in Ticket-128552
@@ -357,23 +377,20 @@ TEST_F(EventDataControlFixture, DISABLED_MultipleReceiverRefCountCheck)
     const std::size_t max_subscribers{10U};
 
     // Given an EventDataControl with one ready slot
-    EventDataControl unit{1, memory_, max_subscribers};
-    auto slot = unit.AllocateNextSlot();
-    unit.EventReady(slot, 1);
+    GivenARealEventDataControl(1, kMaxSubscribers).WithAnAllocatedSlot(1);
 
-    auto receiver_tester = [&unit]() {
+    auto receiver_tester = [this]() {
         const auto transaction_log_index =
-            unit.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+            unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
         for (auto counter = 0U; counter < 1000U; counter++)
         {
             // We can increase the ref-count
-            auto receive_slot =
-                unit.ReferenceNextEvent(0, transaction_log_index, EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX);
+            auto receive_slot = unit_->ReferenceNextEvent(0, transaction_log_index, EventSlotStatus::TIMESTAMP_MAX);
             ASSERT_TRUE(receive_slot.IsValid());
-            EXPECT_EQ(unit[receive_slot.GetIndex()].GetTimeStamp(), 1);
+            EXPECT_EQ((*unit_)[receive_slot.GetIndex()].GetTimeStamp(), 1);
 
             // and decrease the ref-count
-            unit.DereferenceEvent(receive_slot, transaction_log_index);
+            unit_->DereferenceEvent(receive_slot, transaction_log_index);
         }
     };
 
@@ -389,31 +406,31 @@ TEST_F(EventDataControlFixture, DISABLED_MultipleReceiverRefCountCheck)
     }
 
     // Then the reference count is zero and we can overwrite the slot if no memory corruption or race occurred
-    ASSERT_TRUE(unit.AllocateNextSlot().IsValid());
+    ASSERT_TRUE(unit_->AllocateNextSlot().IsValid());
 }
 
 TEST_F(EventDataControlFixture, FailingToUpdateSlotValueCausesReferenceNextEventToReturnNull)
 {
     using namespace score::memory::shared;
 
-    AtomicMock<EventSlotStatus::value_type> atomic_mock;
-    AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(&atomic_mock);
-
     constexpr auto max_reference_retries{100U};
 
+    GivenAMockedEventDataControl(1, kMaxSubscribers);
+
     // Given the operation to update the slot value fails max_reference_retries times
-    EXPECT_CALL(atomic_mock, compare_exchange_weak(_, _, _)).Times(max_reference_retries).WillRepeatedly(Return(false));
+    EXPECT_CALL(*atomic_mock_, compare_exchange_weak(_, _, _))
+        .Times(max_reference_retries)
+        .WillRepeatedly(Return(false));
 
     // and a EventDataControlUnit with one ready slot
-    detail_event_data_control::EventDataControlImpl<AtomicIndirectorMock> unit_mock{1, memory_, kMaxSubscribers};
-    auto slot = unit_mock.AllocateNextSlot();
-    unit_mock.EventReady(slot, 1);
+    auto slot = unit_mock_->AllocateNextSlot();
+    unit_mock_->EventReady(slot, 1);
 
     const auto transaction_log_index =
-        unit_mock.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+        unit_mock_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     // When finding the next slot
-    auto event = unit_mock.ReferenceNextEvent(0, transaction_log_index);
+    auto event = unit_mock_->ReferenceNextEvent(0, transaction_log_index);
 
     // No event will be found
     ASSERT_FALSE(event.IsValid());
@@ -422,44 +439,40 @@ TEST_F(EventDataControlFixture, FailingToUpdateSlotValueCausesReferenceNextEvent
 TEST_F(EventDataControlFixture, GetNumNewEvents_Zero)
 {
     // Given an EventDataControl with one ready slot
-    EventDataControl unit{1, memory_, kMaxSubscribers};
-    auto slot = unit.AllocateNextSlot();
-    unit.EventReady(slot, 1);
+    GivenARealEventDataControl(1, kMaxSubscribers);
+    auto slot = unit_->AllocateNextSlot();
+    unit_->EventReady(slot, 1);
 
     // When checking for new samples since timestamp 1 expect, that 0 is returned.
-    EXPECT_EQ(unit.GetNumNewEvents(1), 0);
+    EXPECT_EQ(unit_->GetNumNewEvents(1), 0);
 }
 
 TEST_F(EventDataControlFixture, GetNumNewEvents_One)
 {
     // Given an EventDataControl with one ready slot
-    EventDataControl unit{1, memory_, kMaxSubscribers};
-    auto slot = unit.AllocateNextSlot();
-    unit.EventReady(slot, 1);
+    GivenARealEventDataControl(1, kMaxSubscribers).WithAnAllocatedSlot(1);
 
     // When checking for new samples since start (timestamp 0) expect, that 1 is returned.
-    EXPECT_EQ(unit.GetNumNewEvents(0), 1);
+    EXPECT_EQ(unit_->GetNumNewEvents(0), 1);
 }
 
 TEST_F(EventDataControlFixture, GetNumNewEvents_Many)
 {
     // Given an EventDataControl with 6 ready slots
-    EventDataControl unit{6, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(6, kMaxSubscribers);
     for (unsigned int i = 1; i <= 6; i++)
     {
-        auto slot = unit.AllocateNextSlot();
-        ASSERT_TRUE(slot.IsValid());
-        unit.EventReady(slot, i);
+        WithAnAllocatedSlot(i);
     }
 
     // When checking for new samples since timestamp 0 to 6 expect, that 6 up to 0 is returned.
-    EXPECT_EQ(unit.GetNumNewEvents(0), 6);
-    EXPECT_EQ(unit.GetNumNewEvents(1), 5);
-    EXPECT_EQ(unit.GetNumNewEvents(2), 4);
-    EXPECT_EQ(unit.GetNumNewEvents(3), 3);
-    EXPECT_EQ(unit.GetNumNewEvents(4), 2);
-    EXPECT_EQ(unit.GetNumNewEvents(5), 1);
-    EXPECT_EQ(unit.GetNumNewEvents(6), 0);
+    EXPECT_EQ(unit_->GetNumNewEvents(0), 6);
+    EXPECT_EQ(unit_->GetNumNewEvents(1), 5);
+    EXPECT_EQ(unit_->GetNumNewEvents(2), 4);
+    EXPECT_EQ(unit_->GetNumNewEvents(3), 3);
+    EXPECT_EQ(unit_->GetNumNewEvents(4), 2);
+    EXPECT_EQ(unit_->GetNumNewEvents(5), 1);
+    EXPECT_EQ(unit_->GetNumNewEvents(6), 0);
 }
 
 using EventDataControlReferenceSpecificEventFixture = EventDataControlFixture;
@@ -470,22 +483,21 @@ TEST_F(EventDataControlReferenceSpecificEventFixture, ReferenceSpecificEvents)
     const std::size_t subscription_slots{6U};
 
     // Given an EventDataControl with 6 ready slots
-    EventDataControl unit{max_number_slots, memory_, kMaxSubscribers};
+    GivenARealEventDataControl(max_number_slots, kMaxSubscribers);
     for (unsigned int i = 0; i < 6; i++)
     {
-        auto slot = unit.AllocateNextSlot();
-        ASSERT_TRUE(slot.IsValid());
-        unit.EventReady(slot, i + 1);
+        WithAnAllocatedSlot(i + 1);
     }
 
-    const auto transaction_log_index = unit.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+    const auto transaction_log_index =
+        unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     // When explicitly referencing (ref-count-incrementing) each of them by index this is successful
     for (SlotIndexType i = 0; i < subscription_slots; i++)
     {
-        EXPECT_EQ(unit[i].GetReferenceCount(), 0U);
-        unit.ReferenceSpecificEvent(i, transaction_log_index);
-        EXPECT_EQ(unit[i].GetReferenceCount(), 1U);
+        EXPECT_EQ((*unit_)[i].GetReferenceCount(), 0U);
+        unit_->ReferenceSpecificEvent(i, transaction_log_index);
+        EXPECT_EQ((*unit_)[i].GetReferenceCount(), 1U);
     }
 }
 
@@ -493,54 +505,54 @@ using EventDataControlReferenceSpecificEventDeathTest = EventDataControlReferenc
 TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInvalidTerminates)
 {
     // Given an EventDataControl with one (initially invalid) slot
-    EventDataControl unit{1, memory_, kMaxSubscribers};
-    EXPECT_TRUE(unit[0].IsInvalid());
+    GivenARealEventDataControl(1, kMaxSubscribers);
+    EXPECT_TRUE((*unit_)[0].IsInvalid());
 
-    const auto transaction_log_index = unit.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+    const auto transaction_log_index =
+        unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     // When explicitly referencing (ref-count-incrementing) it
     // Then the program terminates
-    EXPECT_DEATH(unit.ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
+    EXPECT_DEATH(unit_->ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
 }
 
 TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInWritingTerminates)
 {
     // Given an EventDataControl with one in_writing slot
-    EventDataControl unit{1, memory_, kMaxSubscribers};
-    auto slot = unit.AllocateNextSlot();
+    GivenARealEventDataControl(1, kMaxSubscribers);
+    auto slot = unit_->AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
-    EXPECT_TRUE(unit[slot.GetIndex()].IsInWriting());
+    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInWriting());
 
-    const auto transaction_log_index = unit.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+    const auto transaction_log_index =
+        unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     // When explicitly referencing (ref-count-incrementing) it
     // Then the program terminates
-    EXPECT_DEATH(unit.ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
+    EXPECT_DEATH(unit_->ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
 }
 
 TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_ReferenceCountOverFlowsTerminates)
 {
-    memory::shared::AtomicMock<EventSlotStatus::value_type> atomic_mock;
-    memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(&atomic_mock);
+    GivenAMockedEventDataControl(1, kMaxSubscribers);
 
     // Expecting that incrementing the current reference count overflows (i.e. the previous value returned by fetch_add
     // was already the max possible value)
     EventSlotStatus event_slot_status_in_writing{};
     event_slot_status_in_writing.SetReferenceCount(kSlotIsInWriting);
-    ON_CALL(atomic_mock, fetch_add(_, _))
+    ON_CALL(*atomic_mock_, fetch_add(_, _))
         .WillByDefault(Return(static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing)));
 
-    // Given an EventDataControl with one slot
-    detail_event_data_control::EventDataControlImpl<memory::shared::AtomicIndirectorMock> unit{
-        1, memory_, kMaxSubscribers};
-    auto slot = unit.AllocateNextSlot();
+    // and given one slot has been allocated
+    auto slot = unit_mock_->AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
 
-    const auto transaction_log_index = unit.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+    const auto transaction_log_index =
+        unit_mock_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     // When explicitly referencing (ref-count-incrementing) it which would lead to the ref count overflowing
     // Then the program terminates
-    EXPECT_DEATH(unit.ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
+    EXPECT_DEATH(unit_mock_->ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
 }
 
 TEST_F(EventDataControlFixture, AllocatedSlotsCanBeCleanedUp)
@@ -548,40 +560,35 @@ TEST_F(EventDataControlFixture, AllocatedSlotsCanBeCleanedUp)
     RecordProperty("Description", "Tests that all allocated slots can be cleaned up at once.");
 
     // Given an initialized EventDataControl structure, with allocated slots
-    EventDataControl unit{kMaxSlots, memory_, kMaxSubscribers};
-    const auto first_slot = unit.AllocateNextSlot();
-    const auto second_slot = unit.AllocateNextSlot();
+    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
+    const auto first_slot = unit_->AllocateNextSlot();
+    const auto second_slot = unit_->AllocateNextSlot();
 
     // When cleaning up allocations
-    unit.RemoveAllocationsForWriting();
+    unit_->RemoveAllocationsForWriting();
 
     // Then the allocated slots are no longer in writing
-    EXPECT_FALSE(unit[first_slot.GetIndex()].IsInWriting());
-    EXPECT_FALSE(unit[second_slot.GetIndex()].IsInWriting());
+    EXPECT_FALSE((*unit_)[first_slot.GetIndex()].IsInWriting());
+    EXPECT_FALSE((*unit_)[second_slot.GetIndex()].IsInWriting());
 }
 
 using EventDataControlDeathTest = EventDataControlFixture;
 TEST_F(EventDataControlDeathTest, FailingToCleanUpSlotDueToOtherThreadModifyingAtomicTerminates)
 {
-    memory::shared::AtomicMock<EventSlotStatus::value_type> atomic_mock;
-    memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(&atomic_mock);
+    GivenAMockedEventDataControl(kMaxSlots, kMaxSubscribers);
 
-    // Given that load returns that the slot is in writing
+    // and given that load returns that the slot is in writing
     EventSlotStatus event_slot_status_in_writing{};
     event_slot_status_in_writing.SetReferenceCount(kSlotIsInWriting);
-    ON_CALL(atomic_mock, load(_))
+    ON_CALL(*atomic_mock_, load(_))
         .WillByDefault(Return(static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing)));
 
     // and that compare_exchange_weak returns false due to another thread modifying the atomic concurrently
-    ON_CALL(atomic_mock, compare_exchange_weak(_, _, _)).WillByDefault(Return(false));
-
-    // and given an initialized EventDataControl structure, with a single allocated slot
-    detail_event_data_control::EventDataControlImpl<memory::shared::AtomicIndirectorMock> unit{
-        kMaxSlots, memory_, kMaxSubscribers};
+    ON_CALL(*atomic_mock_, compare_exchange_weak(_, _, _)).WillByDefault(Return(false));
 
     // When cleaning up allocations
     // Then the program terminates
-    EXPECT_DEATH(unit.RemoveAllocationsForWriting(), ".*");
+    EXPECT_DEATH(unit_mock_->RemoveAllocationsForWriting(), ".*");
 }
 
 struct MultiSenderMultiReceiverParams
@@ -725,7 +732,7 @@ TEST_P(MultiSenderMultiReceiverTest, DISABLED_MultiSenderMultiReceiverMaxReceive
 
         for (std::size_t counter = 0; counter < params.num_actions_per_receiver; ++counter)
         {
-            EventSlotStatus::EventTimeStamp highest_ts{EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX};
+            EventSlotStatus::EventTimeStamp highest_ts{EventSlotStatus::TIMESTAMP_MAX};
             std::optional<SlotIndexType> slot_last;
             std::size_t counter1 = 0;
             while (counter1 <= params.max_referenced_samples_per_receiver &&
diff --git a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp
index 6c70c8131..346f15d10 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp
+++ b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp
@@ -18,7 +18,7 @@ namespace score::mw::com::impl::lola
 {
 
 EventDataControlCompositeAttorney::EventDataControlCompositeAttorney(
-    EventDataControlComposite& event_data_control_composite) noexcept
+    EventDataControlComposite<>& event_data_control_composite) noexcept
     : event_data_control_composite_{event_data_control_composite}
 {
 }
diff --git a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h
index c8b9c5d21..08d0c2c0a 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h
+++ b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h
@@ -24,7 +24,7 @@ namespace score::mw::com::impl::lola
 class EventDataControlCompositeAttorney
 {
   public:
-    EventDataControlCompositeAttorney(EventDataControlComposite& event_data_control_composite) noexcept;
+    EventDataControlCompositeAttorney(EventDataControlComposite<>& event_data_control_composite) noexcept;
 
     /// \brief Prepares the underlying EventDataControlComposite (its contained EventDataControls) in a way, that the
     ///        next call to AllocateNextSlot() will return the given expected_result
@@ -42,7 +42,7 @@ class EventDataControlCompositeAttorney
         const SlotIndexType slot_index) const noexcept;
 
   private:
-    EventDataControlComposite& event_data_control_composite_;
+    EventDataControlComposite<>& event_data_control_composite_;
 };
 
 class EventDataControlAttorney
@@ -64,10 +64,10 @@ class EventDataControlAttorney
     /// \param expected_result to be expected result for ReferenceNextEvent()
     /// \param last_search_time see ReferenceNextEvent()
     /// \param upper_limit see ReferenceNextEvent()
-    void PrepareReferenceNextEvent(const score::cpp::optional<SlotIndexType> expected_result,
-                                   const EventSlotStatus::EventTimeStamp last_search_time,
-                                   const EventSlotStatus::EventTimeStamp upper_limit =
-                                       EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX) noexcept;
+    void PrepareReferenceNextEvent(
+        const score::cpp::optional<SlotIndexType> expected_result,
+        const EventSlotStatus::EventTimeStamp last_search_time,
+        const EventSlotStatus::EventTimeStamp upper_limit = EventSlotStatus::TIMESTAMP_MAX) noexcept;
 
     /// \brief Prepares the underlying EventDataControl in a way, that the next call to GetNumNewEvents() will return
     /// the given expected_result
diff --git a/score/mw/com/impl/bindings/lola/event_slot_status.h b/score/mw/com/impl/bindings/lola/event_slot_status.h
index 6c44acdc3..719583a37 100644
--- a/score/mw/com/impl/bindings/lola/event_slot_status.h
+++ b/score/mw/com/impl/bindings/lola/event_slot_status.h
@@ -45,7 +45,7 @@ class EventSlotStatus final
     // variables being given values that are not subsequently used"
     // Variable is used in EventDataControlImpl.
     // coverity[autosar_cpp14_a0_1_1_violation : FALSE]
-    static constexpr EventTimeStamp TIMESTSCORE_LANGUAGE_FUTURECPP_MAX = std::numeric_limits<EventTimeStamp>::max();
+    static constexpr EventTimeStamp TIMESTAMP_MAX = std::numeric_limits<EventTimeStamp>::max();
 
     /// \brief If default constructed, SlotStatus is invalid
     EventSlotStatus() noexcept = default;
diff --git a/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h b/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h
index 3ac3dcda3..4bae2c9a6 100644
--- a/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h
+++ b/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h
@@ -76,7 +76,7 @@ class SampleAllocateePtr
     /// \param event_data_ctrl event data control structure, which manages the underlying event/sample in shmem.
     /// \param slot_index index of event slot
     explicit SampleAllocateePtr(pointer ptr,
-                                const EventDataControlComposite& event_data_ctrl,
+                                const EventDataControlComposite<>& event_data_ctrl,
                                 ControlSlotCompositeIndicator slot_indicator) noexcept
         : managed_object_{ptr}, event_slot_indicator_{slot_indicator}, event_data_control_{event_data_ctrl}
     {
@@ -186,7 +186,7 @@ class SampleAllocateePtr
 
     pointer managed_object_;
     ControlSlotCompositeIndicator event_slot_indicator_;
-    std::optional<EventDataControlComposite> event_data_control_;
+    std::optional<EventDataControlComposite<>> event_data_control_;
 };
 
 /// \brief Specializes the std::swap algorithm for SampleAllocateePtr. Swaps the contents of lhs and rhs. Calls
@@ -204,7 +204,7 @@ class SampleAllocateePtrView
   public:
     explicit SampleAllocateePtrView(const SampleAllocateePtr<SampleType>& ptr) : ptr_{ptr} {}
 
-    const std::optional<EventDataControlComposite>& GetEventDataControlComposite() const noexcept
+    const std::optional<EventDataControlComposite<>>& GetEventDataControlComposite() const noexcept
     {
         return ptr_.event_data_control_;
     }
@@ -225,7 +225,7 @@ class SampleAllocateePtrMutableView
   public:
     explicit SampleAllocateePtrMutableView(SampleAllocateePtr<SampleType>& ptr) : ptr_{ptr} {}
 
-    const std::optional<EventDataControlComposite>& GetEventDataControlComposite() const noexcept
+    const std::optional<EventDataControlComposite<>>& GetEventDataControlComposite() const noexcept
     {
         return ptr_.event_data_control_;
     }
diff --git a/score/mw/com/impl/bindings/lola/sample_allocatee_ptr_test.cpp b/score/mw/com/impl/bindings/lola/sample_allocatee_ptr_test.cpp
index 4319b19d2..327700989 100644
--- a/score/mw/com/impl/bindings/lola/sample_allocatee_ptr_test.cpp
+++ b/score/mw/com/impl/bindings/lola/sample_allocatee_ptr_test.cpp
@@ -39,7 +39,7 @@ class SampleAllocateePtrFixture : public ::testing::Test
   public:
     FakeMemoryResource memory_{};
     EventDataControl control_block_{kMaxSlots, memory_, kMaxSubscribers};
-    EventDataControlComposite control_composite_{&control_block_};
+    EventDataControlComposite<> control_composite_{&control_block_};
 };
 
 TEST_F(SampleAllocateePtrFixture, PtrContainingInvalidSlotIsNotDestroyingAnything)
diff --git a/score/mw/com/impl/bindings/lola/service_data_control.h b/score/mw/com/impl/bindings/lola/service_data_control.h
index 20b2246dd..cb47a9b76 100644
--- a/score/mw/com/impl/bindings/lola/service_data_control.h
+++ b/score/mw/com/impl/bindings/lola/service_data_control.h
@@ -13,13 +13,14 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_DATA_CONTROL_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_DATA_CONTROL_H
 
-#include "score/memory/shared/map.h"
-#include "score/memory/shared/memory_resource_proxy.h"
-#include "score/memory/shared/polymorphic_offset_ptr_allocator.h"
 #include "score/mw/com/impl/bindings/lola/application_id_pid_mapping.h"
 #include "score/mw/com/impl/bindings/lola/element_fq_id.h"
 #include "score/mw/com/impl/bindings/lola/event_control.h"
 
+#include "score/memory/shared/map.h"
+#include "score/memory/shared/memory_resource_proxy.h"
+#include "score/memory/shared/polymorphic_offset_ptr_allocator.h"
+
 namespace score::mw::com::impl::lola
 {
 class ServiceDataControl
diff --git a/score/mw/com/impl/bindings/lola/skeleton.h b/score/mw/com/impl/bindings/lola/skeleton.h
index 05ceb9177..a6f3acf1c 100644
--- a/score/mw/com/impl/bindings/lola/skeleton.h
+++ b/score/mw/com/impl/bindings/lola/skeleton.h
@@ -120,7 +120,7 @@ class Skeleton final : public SkeletonBinding
     ///         optionally for ASIL B) and an EventDataStorage which will be returned. If PrepareOffer opened the shared
     ///         memory, then the opened event data from the existing shared memory will be returned.
     template <typename SampleType>
-    std::pair<EventDataStorage<SampleType>*, EventDataControlComposite> Register(
+    std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>> Register(
         const ElementFqId element_fq_id,
         SkeletonEventProperties element_properties);
 
@@ -174,11 +174,11 @@ class Skeleton final : public SkeletonBinding
                                           const std::shared_ptr<score::memory::shared::ManagedMemoryResource>& memory);
 
     template <typename SampleType>
-    std::pair<EventDataStorage<SampleType>*, EventDataControlComposite> OpenEventDataFromOpenedSharedMemory(
+    std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>> OpenEventDataFromOpenedSharedMemory(
         const ElementFqId element_fq_id);
 
     template <typename SampleType>
-    std::pair<EventDataStorage<SampleType>*, EventDataControlComposite> CreateEventDataFromOpenedSharedMemory(
+    std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>> CreateEventDataFromOpenedSharedMemory(
         const ElementFqId element_fq_id,
         const SkeletonEventProperties& element_properties);
 
@@ -303,7 +303,7 @@ bool HasAsilBSupport(const InstanceIdentifier& identifier);
 
 template <typename SampleType>
 auto Skeleton::Register(const ElementFqId element_fq_id, SkeletonEventProperties element_properties)
-    -> std::pair<EventDataStorage<SampleType>*, EventDataControlComposite>
+    -> std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>>
 {
     // If the skeleton previously crashed and there are active proxies connected to the old shared memory, then we
     // re-open that shared memory in PrepareOffer(). In that case, we should retrieved the EventDataControl and
@@ -347,7 +347,7 @@ template <typename SampleType>
 // coverity[autosar_cpp14_m3_2_2_violation]
 // coverity[autosar_cpp14_a15_5_3_violation]
 auto Skeleton::OpenEventDataFromOpenedSharedMemory(const ElementFqId element_fq_id)
-    -> std::pair<EventDataStorage<SampleType>*, EventDataControlComposite>
+    -> std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>>
 {
     // Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be
     // called implicitly". This is a false positive, std::less which is used by std::map::find could throw an exception
@@ -414,7 +414,7 @@ template <typename SampleType>
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
 auto Skeleton::CreateEventDataFromOpenedSharedMemory(const ElementFqId element_fq_id,
                                                      const SkeletonEventProperties& element_properties)
-    -> std::pair<EventDataStorage<SampleType>*, EventDataControlComposite>
+    -> std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>>
 {
     auto* typed_event_data_storage_ptr = storage_resource_->construct<EventDataStorage<SampleType>>(
         element_properties.number_of_slots,
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event.h b/score/mw/com/impl/bindings/lola/skeleton_event.h
index c0bca4719..ede284e6b 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event.h
+++ b/score/mw/com/impl/bindings/lola/skeleton_event.h
@@ -117,7 +117,7 @@ class SkeletonEvent final : public SkeletonEventBinding<SampleType>
     const std::string_view event_name_;
     const SkeletonEventProperties event_properties_;
     EventDataStorage<SampleType>* event_data_storage_;
-    std::optional<EventDataControlComposite> event_data_control_composite_;
+    std::optional<EventDataControlComposite<>> event_data_control_composite_;
     EventSlotStatus::EventTimeStamp current_timestamp_;
     bool qm_disconnect_;
     impl::tracing::SkeletonEventTracingData skeleton_event_tracing_data_;
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp
index 37011e95c..6da435b61 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp
@@ -50,7 +50,7 @@ class SkeletonEventAttorney
         skeleton_event_.qm_disconnect_ = qm_disconnect_value;
     }
 
-    std::optional<EventDataControlComposite>& GetEventDataControlComposite()
+    std::optional<EventDataControlComposite<>>& GetEventDataControlComposite()
     {
         return skeleton_event_.event_data_control_composite_;
     }
diff --git a/score/mw/com/impl/bindings/lola/skeleton_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_test.cpp
index 2b8a08087..642b23f80 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_test.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_test.cpp
@@ -58,6 +58,18 @@ const memory::shared::ISharedMemoryResource::FileDescriptor kDummyShmObjectFileD
 class SkeletonTestMockedSharedMemoryFixture : public SkeletonMockedMemoryFixture
 {
   protected:
+    SkeletonTestMockedSharedMemoryFixture() : SkeletonMockedMemoryFixture()
+    {
+        // Default behaviour for get the usable base addresses of the mocked memory resources using the constructed
+        // ServiceDataControl / Storage created above.
+        ON_CALL(*control_qm_shared_memory_resource_mock_, getUsableBaseAddress())
+            .WillByDefault(Return(static_cast<void*>(&existing_service_data_control_qm_)));
+        ON_CALL(*control_asil_b_shared_memory_resource_mock_, getUsableBaseAddress())
+            .WillByDefault(Return(static_cast<void*>(&existing_service_data_control_b_)));
+        ON_CALL(*data_shared_memory_resource_mock_, getUsableBaseAddress())
+            .WillByDefault(Return(static_cast<void*>(&existing_service_data_storage_)));
+    }
+
     const LolaServiceTypeDeployment* GetLolaServiceTypeDeployment(const ServiceTypeDeployment& service_type_deployment)
     {
         const auto* const lola_service_type_deployment =
@@ -79,6 +91,13 @@ class SkeletonTestMockedSharedMemoryFixture : public SkeletonMockedMemoryFixture
         return *this;
     }
 
+    ServiceDataControl existing_service_data_control_qm_{
+        CreateServiceDataControlWithEvent(test::kDummyElementFqId, QualityType::kASIL_QM)};
+    ServiceDataControl existing_service_data_control_b_{
+        CreateServiceDataControlWithEvent(test::kDummyElementFqId, QualityType::kASIL_B)};
+    ServiceDataStorage existing_service_data_storage_{
+        CreateServiceDataStorageWithEvent<test::TestSampleType>(test::kDummyElementFqId)};
+
     const ElementFqId fooo_method_fq_id_{10U, test::kFooMethodId, 3U, ServiceElementType::METHOD};
     const ElementFqId dumb_method_fq_id_{1U, test::kDumbMethodId, 2U, ServiceElementType::METHOD};
 
@@ -364,11 +383,10 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferFailsIfOpeningServiceUsageMarker
 
 TEST_F(SkeletonPrepareOfferFixture, PrepareOfferOpensAndCleansExistingSharedMemoryIfFLockingServiceUsageMarkerFilefails)
 {
-    SCORE_LANGUAGE_FUTURECPP_ASSERT(service_data_control_qm_ != nullptr);
-    SCORE_LANGUAGE_FUTURECPP_ASSERT(service_data_control_asil_b_ != nullptr);
-    auto& event_control_qm = GetEventControlFromServiceDataControl(test::kDummyElementFqId, *service_data_control_qm_);
+    auto& event_control_qm =
+        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_);
     auto& event_control_asil_b =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, *service_data_control_asil_b_);
+        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_b_);
 
     // Given a Skeleton constructed from a valid identifier referencing an ASIL-B deployment
     InitialiseSkeleton(GetValidASILInstanceIdentifier());
@@ -461,7 +479,7 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferWillUpdateThePidInTheDataSegment
     EXPECT_TRUE(skeleton_->PrepareOffer(events_, fields_, std::move(kEmptyRegisterShmObjectTraceCallback)).has_value());
 
     // and the ServiceDataStorage contains the PID returned by the lola runtime
-    EXPECT_EQ(service_data_storage_->skeleton_pid_, pid);
+    EXPECT_EQ(existing_service_data_storage_.skeleton_pid_, pid);
 }
 
 TEST_F(SkeletonPrepareOfferFixture, PrepareOfferWillCallRegisterShmObjectTraceCallbackWhenOpeningSharedMemory)
@@ -812,11 +830,12 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RegisterWillOpenEventDataIfShmRegio
 
     // Then the Register call should return pointers to the opened control and data sections in the opened shared
     // memory region
-    auto& event_control_qm = GetEventControlFromServiceDataControl(test::kDummyElementFqId, *service_data_control_qm_);
+    auto& event_control_qm =
+        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_);
     auto& event_control_asil_b =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, *service_data_control_asil_b_);
-    auto& event_data_storage =
-        GetEventStorageFromServiceDataStorage<test::TestSampleType>(test::kDummyElementFqId, *service_data_storage_);
+        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_b_);
+    auto& event_data_storage = GetEventStorageFromServiceDataStorage<test::TestSampleType>(
+        test::kDummyElementFqId, existing_service_data_storage_);
 
     EXPECT_EQ(&event_data_control_composite.GetQmEventDataControl(), &event_control_qm.data_control);
     ASSERT_TRUE(event_data_control_composite.GetAsilBEventDataControl().has_value());
@@ -828,7 +847,7 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RollbackWillBeCalledIfShmRegionWasO
 {
     // Given a QM ServiceDataControl which contains a TransactionLogSet with valid transactions
     auto& event_data_control_qm =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, *service_data_control_qm_).data_control;
+        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_).data_control;
     InsertSkeletonTransactionLogWithValidTransactions(event_data_control_qm);
     EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm));
 
@@ -867,7 +886,7 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RollbackWillOnlyBeCalledOnQmControl
 
     // Given an Asil B ServiceDataControl which contains a TransactionLogSet with valid transactions
     auto& event_data_control_asil_b =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, *service_data_control_asil_b_).data_control;
+        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_b_).data_control;
     InsertSkeletonTransactionLogWithValidTransactions(event_data_control_asil_b);
     EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_asil_b));
 
@@ -906,7 +925,7 @@ TEST_P(SkeletonRegisterParamaterisedFixture, TracingWillBeDisabledAndTransaction
 
     // Given a QM ServiceDataControl which contains a TransactionLogSet with invalid transactions
     auto& event_data_control_qm =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, *service_data_control_qm_).data_control;
+        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_).data_control;
     InsertSkeletonTransactionLogWithInvalidTransactions(event_data_control_qm);
     EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm));
 
diff --git a/score/mw/com/impl/bindings/lola/slot_collector.cpp b/score/mw/com/impl/bindings/lola/slot_collector.cpp
index f85977aed..03c3f3885 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_collector.cpp
@@ -57,7 +57,7 @@ SlotCollector::SlotIndicators SlotCollector::GetNewSamplesSlotIndices(const std:
 
 SlotCollector::SlotIndicatorVector::iterator SlotCollector::CollectSlots(const std::size_t max_count) noexcept
 {
-    EventSlotStatus::EventTimeStamp current_highest = EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX;
+    EventSlotStatus::EventTimeStamp current_highest = EventSlotStatus::TIMESTAMP_MAX;
     auto collected_slot = collected_slots_.begin();
 
     // Defensive programming: We check in the constructor that collected_slots_ must not be empty
diff --git a/score/mw/com/impl/bindings/lola/slot_collector.h b/score/mw/com/impl/bindings/lola/slot_collector.h
index 42463e26c..691fc3687 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector.h
+++ b/score/mw/com/impl/bindings/lola/slot_collector.h
@@ -13,14 +13,10 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_CLIENT_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_CLIENT_H
 
-#include "score/mw/com/impl/bindings/lola/element_fq_id.h"
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
-#include "score/mw/com/impl/bindings/lola/proxy.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
 
-#include "score/mw/com/impl/com_error.h"
-
 #include <functional>
 #include <vector>
 
diff --git a/score/mw/com/impl/bindings/lola/subscription_helpers.cpp b/score/mw/com/impl/bindings/lola/subscription_helpers.cpp
index 2cfac6468..559f36300 100644
--- a/score/mw/com/impl/bindings/lola/subscription_helpers.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_helpers.cpp
@@ -15,11 +15,8 @@
 #include "score/mw/com/impl/bindings/lola/i_runtime.h"
 #include "score/mw/com/impl/runtime.h"
 
-#include "score/mw/log/logging.h"
-
 #include <score/assert.hpp>
 
-#include <exception>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/score/mw/com/impl/bindings/lola/subscription_helpers.h b/score/mw/com/impl/bindings/lola/subscription_helpers.h
index 8b138c431..22ac30dc3 100644
--- a/score/mw/com/impl/bindings/lola/subscription_helpers.h
+++ b/score/mw/com/impl/bindings/lola/subscription_helpers.h
@@ -21,7 +21,6 @@
 #include <score/callback.hpp>
 #include <score/optional.hpp>
 
-#include <cstddef>
 #include <string>
 
 namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h
index 9c739e7ca..e13f128ed 100644
--- a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h
+++ b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h
@@ -13,15 +13,12 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_NOT_SUBSCRIBED_STATES_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_NOT_SUBSCRIBED_STATES_H
 
-#include "score/mw/com/impl/bindings/lola/messaging/i_message_passing_service.h"
 #include "score/mw/com/impl/bindings/lola/subscription_state_base.h"
 #include "score/mw/com/impl/scoped_event_receive_handler.h"
 
 #include <score/optional.hpp>
 
 #include <cstddef>
-#include <exception>
-#include <mutex>
 
 namespace score::mw::com::impl::lola
 {
diff --git a/score/mw/com/impl/bindings/lola/subscription_state_base.h b/score/mw/com/impl/bindings/lola/subscription_state_base.h
index fbd46351c..77ba146cd 100644
--- a/score/mw/com/impl/bindings/lola/subscription_state_base.h
+++ b/score/mw/com/impl/bindings/lola/subscription_state_base.h
@@ -13,12 +13,8 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_SUBSCRIPTION_STATE_BASE_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_SUBSCRIPTION_STATE_BASE_H
 
-#include "score/mw/com/impl/bindings/lola/messaging/i_message_passing_service.h"
 #include "score/mw/com/impl/bindings/lola/slot_collector.h"
-#include "score/mw/com/impl/bindings/lola/subscription_state_machine_states.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
-#include "score/mw/com/impl/com_error.h"
-#include "score/mw/com/impl/proxy_event_binding.h"
 #include "score/mw/com/impl/scoped_event_receive_handler.h"
 
 #include "score/result/result.h"
@@ -26,8 +22,6 @@
 #include <score/optional.hpp>
 
 #include <cstddef>
-#include <functional>
-#include <mutex>
 
 namespace score::mw::com::impl::lola
 {
diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp b/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp
index 57049c913..325f0e6e0 100644
--- a/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp
@@ -12,7 +12,6 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/subscription_state_machine.h"
 
-#include "score/mw/com/impl/bindings/lola/proxy.h"
 #include "score/mw/com/impl/bindings/lola/slot_collector.h"
 
 #include "score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h"
diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine.h b/score/mw/com/impl/bindings/lola/subscription_state_machine.h
index a814dbc10..0c8108f24 100644
--- a/score/mw/com/impl/bindings/lola/subscription_state_machine.h
+++ b/score/mw/com/impl/bindings/lola/subscription_state_machine.h
@@ -14,8 +14,6 @@
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_STATE_MACHINE_H
 
 #include "score/mw/com/impl/bindings/lola/event_control.h"
-#include "score/mw/com/impl/bindings/lola/event_subscription_control.h"
-#include "score/mw/com/impl/bindings/lola/messaging/i_message_passing_service.h"
 #include "score/mw/com/impl/bindings/lola/slot_collector.h"
 #include "score/mw/com/impl/bindings/lola/subscription_helpers.h"
 #include "score/mw/com/impl/bindings/lola/subscription_state_base.h"
@@ -33,8 +31,6 @@
 #include <cstdint>
 #include <memory>
 #include <mutex>
-#include <queue>
-#include <utility>
 
 namespace score::mw::com::impl::lola
 {
diff --git a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp
index 9c70bc0df..0bfd78c80 100644
--- a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp
@@ -20,7 +20,6 @@
 
 #include <score/assert.hpp>
 
-#include <exception>
 #include <utility>
 
 namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h
index a2543dc8f..6fef653bb 100644
--- a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h
+++ b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h
@@ -13,14 +13,12 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_SUBSCRIBED_STATES_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_SUBSCRIBED_STATES_H
 
-#include "score/mw/com/impl/bindings/lola/messaging/i_message_passing_service.h"
 #include "score/mw/com/impl/bindings/lola/subscription_state_base.h"
 #include "score/mw/com/impl/scoped_event_receive_handler.h"
 
 #include <score/optional.hpp>
 
 #include <cstddef>
-#include <mutex>
 
 namespace score::mw::com::impl::lola
 {
diff --git a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp
index 55d4239f2..e83156a7e 100644
--- a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp
@@ -22,7 +22,6 @@
 
 #include <exception>
 #include <memory>
-#include <sstream>
 #include <utility>
 
 namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h
index da16623b9..065e0b577 100644
--- a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h
+++ b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h
@@ -13,14 +13,12 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_SUBSCRIPTION_PENDING_STATES_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_SUBSCRIPTION_PENDING_STATES_H
 
-#include "score/mw/com/impl/bindings/lola/messaging/i_message_passing_service.h"
 #include "score/mw/com/impl/bindings/lola/subscription_state_base.h"
 #include "score/mw/com/impl/scoped_event_receive_handler.h"
 
 #include <score/optional.hpp>
 
 #include <cstddef>
-#include <mutex>
 
 namespace score::mw::com::impl::lola
 {
diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_event_component_test.cpp b/score/mw/com/impl/bindings/lola/test/skeleton_event_component_test.cpp
index df845aa82..395bbb250 100644
--- a/score/mw/com/impl/bindings/lola/test/skeleton_event_component_test.cpp
+++ b/score/mw/com/impl/bindings/lola/test/skeleton_event_component_test.cpp
@@ -47,7 +47,7 @@ class SkeletonEventAttorney
     {
     }
 
-    EventDataControlComposite& GetEventDataControlComposite()
+    EventDataControlComposite<>& GetEventDataControlComposite()
     {
         SCORE_LANGUAGE_FUTURECPP_ASSERT_DBG(skeleton_event_.event_data_control_composite_.has_value());
         return skeleton_event_.event_data_control_composite_.value();
diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp
index abaaf7fdd..3cf9a9889 100644
--- a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp
+++ b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp
@@ -221,23 +221,6 @@ SkeletonMockedMemoryFixture::SkeletonMockedMemoryFixture()
             }));
     ON_CALL(shared_memory_factory_mock_, Open(test::kDataChannelPath, true, _))
         .WillByDefault(Return(data_shared_memory_resource_mock_));
-
-    // Construct ServiceDataControl / Storage using mocked memory resources
-    service_data_control_qm_ = std::make_unique<ServiceDataControl>(
-        CreateServiceDataControlWithEvent(test::kDummyElementFqId, QualityType::kASIL_QM));
-    service_data_control_asil_b_ = std::make_unique<ServiceDataControl>(
-        CreateServiceDataControlWithEvent(test::kDummyElementFqId, QualityType::kASIL_B));
-    service_data_storage_ = std::make_unique<ServiceDataStorage>(
-        CreateServiceDataStorageWithEvent<test::TestSampleType>(test::kDummyElementFqId));
-
-    // Default behaviour for get the usable base addresses of the mocked memory resources using the constructed
-    // ServiceDataControl / Storage created above.
-    ON_CALL(*control_qm_shared_memory_resource_mock_, getUsableBaseAddress())
-        .WillByDefault(Return(static_cast<void*>(service_data_control_qm_.get())));
-    ON_CALL(*control_asil_b_shared_memory_resource_mock_, getUsableBaseAddress())
-        .WillByDefault(Return(static_cast<void*>(service_data_control_asil_b_.get())));
-    ON_CALL(*data_shared_memory_resource_mock_, getUsableBaseAddress())
-        .WillByDefault(Return(static_cast<void*>(service_data_storage_.get())));
 }
 
 SkeletonMockedMemoryFixture::~SkeletonMockedMemoryFixture()
diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h
index 4d680f124..e6ff5b47b 100644
--- a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h
+++ b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h
@@ -481,12 +481,6 @@ class SkeletonMockedMemoryFixture : public ::testing::Test
             std::make_shared<::testing::NiceMock<memory::shared::SharedMemoryResourceHeapAllocatorMock>>(
                 test::kDataMemoryResourceId)};
 
-    // Since these objects rely on the default behaviour of some mocks (e.g. the mocked lola Runtime), we create them
-    // after setting the default mock behaviours in the body of the constructor.
-    std::unique_ptr<ServiceDataControl> service_data_control_qm_{nullptr};
-    std::unique_ptr<ServiceDataControl> service_data_control_asil_b_{nullptr};
-    std::unique_ptr<ServiceDataStorage> service_data_storage_{nullptr};
-
     std::unique_ptr<Skeleton> skeleton_{nullptr};
 };
 
diff --git a/score/mw/com/impl/bindings/lola/test_doubles/BUILD b/score/mw/com/impl/bindings/lola/test_doubles/BUILD
index a52f778ae..ca816a94d 100644
--- a/score/mw/com/impl/bindings/lola/test_doubles/BUILD
+++ b/score/mw/com/impl/bindings/lola/test_doubles/BUILD
@@ -43,7 +43,8 @@ cc_library(
     deps = [
         ":fake_memory_resource",
         "//score/mw/com/impl/bindings/lola:event",
-        "//score/mw/com/impl/bindings/lola:shared_data_structures",
+        "//score/mw/com/impl/bindings/lola:service_data_control",
+        "//score/mw/com/impl/bindings/lola:service_data_storage",
         "//score/mw/com/impl/bindings/lola:skeleton",
         "@score_baselibs//score/memory/shared",
         "@score_baselibs//score/memory/shared:shared_memory_resource_heap_allocator_mock",
diff --git a/score/mw/com/impl/plumbing/rust/sample_allocatee_ptr.rs b/score/mw/com/impl/plumbing/rust/sample_allocatee_ptr.rs
index bd89e2369..249de4efa 100644
--- a/score/mw/com/impl/plumbing/rust/sample_allocatee_ptr.rs
+++ b/score/mw/com/impl/plumbing/rust/sample_allocatee_ptr.rs
@@ -37,7 +37,7 @@ struct EventDataControlComposite {
 struct LolaSampleAllocateePtrBinding<T> {
     _managed_object: *mut T,
     _event_slot_indicator: ControlSlotCompositeIndicator,
-    _event_data_control: CxxOptional<EventDataControlComposite>,
+    _event_data_control: CxxOptional<EventDataControlComposite<>>,
 }
 
 #[repr(C)]
diff --git a/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.cpp b/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.cpp
index 58cb5e593..d5e3a4e48 100644
--- a/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.cpp
+++ b/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.cpp
@@ -86,8 +86,8 @@ SizeInfo TestSizeProvider::GetControlSlotCompositeIndicatorSize() noexcept
 
 SizeInfo TestSizeProvider::GetEventDataControlCompositeSize() noexcept
 {
-    return {sizeof(score::mw::com::impl::lola::EventDataControlComposite),
-            alignof(score::mw::com::impl::lola::EventDataControlComposite)};
+    return {sizeof(score::mw::com::impl::lola::EventDataControlComposite<>),
+            alignof(score::mw::com::impl::lola::EventDataControlComposite<>)};
 }
 
 SizeInfo TestSizeProvider::GetStdUniquePtrSize() noexcept
diff --git a/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp b/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
index 3865eb002..b7cb4d1c0 100644
--- a/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
+++ b/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
@@ -50,7 +50,7 @@ class SampleAllocateePtrFixture : public ::testing::Test
     std::uint8_t value_{0x42};
     lola::FakeMemoryResource fake_memory_resource_{};
     lola::EventDataControl event_data_ctrl_qm_{0, fake_memory_resource_, 1U};
-    lola::EventDataControlComposite event_data_ctrl_{&event_data_ctrl_qm_};
+    lola::EventDataControlComposite<> event_data_ctrl_{&event_data_ctrl_qm_};
     lola::SlotIndexType event_data_slot_index_{std::numeric_limits<lola::SlotIndexType>::max()};
     lola::SampleAllocateePtr<std::uint8_t> lola_allocatee_ptr_{&value_, event_data_ctrl_, {}};
     SampleAllocateePtr<std::uint8_t> valid_unit_{MakeSampleAllocateePtr(std::move(lola_allocatee_ptr_))};