From 3743e108084943d2d041257ba9e5606d3190354e Mon Sep 17 00:00:00 2001
From: Brendan Emery <brendan.be.emery@bmw.de>
Date: Thu, 12 Mar 2026 18:48:27 +0100
Subject: [PATCH 1/3] lola: Add Service/Event/EventData Control Local structs

This commit splits up ServiceDataControl, EventDataControl and
EventControl into a data class (ServiceDataControl, EventDataControl and
EventControl) which contains the data that is placed in shared memory
and behaviour "view" classes (ServiceDataControlLocalView,
EventDataControlLocalView and EventControlLocalView) which contain behaviour
for interacting with the data via process local raw pointers which avoid
performance overhead of interacting with data directly in shared memory
(due to performance overhead of dealing with OffsetPtrs).
---
 score/mw/com/impl/bindings/lola/BUILD         | 163 +++-
 .../impl/bindings/lola/event_data_control.cpp | 442 ----------
 .../impl/bindings/lola/event_data_control.h   | 218 +----
 .../lola/event_data_control_composite.cpp     |  80 +-
 .../lola/event_data_control_composite.h       |  31 +-
 .../event_data_control_composite_test.cpp     | 132 ++-
 .../bindings/lola/event_data_control_test.cpp | 760 +-----------------
 .../event_data_control_test_resources.cpp     |  14 +-
 .../bindings/lola/generic_skeleton_event.cpp  |   2 +-
 .../bindings/lola/generic_skeleton_event.h    |   2 +
 .../lola/methods/method_resource_map.h        |   2 +-
 score/mw/com/impl/bindings/lola/proxy.cpp     |  24 +-
 score/mw/com/impl/bindings/lola/proxy.h       |  10 +-
 .../impl/bindings/lola/proxy_event_common.cpp |   4 +-
 .../impl/bindings/lola/proxy_event_common.h   |   7 +-
 .../lola/proxy_event_control_local_view.cpp   |  24 +
 .../lola/proxy_event_control_local_view.h     |  42 +
 .../proxy_event_data_control_local_view.cpp   | 268 ++++++
 .../proxy_event_data_control_local_view.h     | 180 +++++
 ...oxy_event_data_control_local_view_test.cpp | 548 +++++++++++++
 .../impl/bindings/lola/proxy_event_test.cpp   |   2 +-
 .../proxy_service_data_control_local_view.cpp |  13 +
 .../proxy_service_data_control_local_view.h   |  83 ++
 ...y_service_data_control_local_view_test.cpp | 147 ++++
 .../mw/com/impl/bindings/lola/proxy_test.cpp  |  16 +-
 .../impl/bindings/lola/sample_allocatee_ptr.h |   5 +
 .../lola/sample_allocatee_ptr_test.cpp        |  52 +-
 score/mw/com/impl/bindings/lola/sample_ptr.h  |   8 +-
 .../impl/bindings/lola/sample_ptr_test.cpp    |  74 +-
 .../impl/bindings/lola/service_data_control.h |   1 -
 score/mw/com/impl/bindings/lola/skeleton.cpp  | 173 ++--
 score/mw/com/impl/bindings/lola/skeleton.h    |  57 +-
 .../com/impl/bindings/lola/skeleton_event.h   |   4 +-
 .../bindings/lola/skeleton_event_common.cpp   |   4 +-
 .../skeleton_event_control_local_view.cpp     |  23 +
 .../lola/skeleton_event_control_local_view.h  |  38 +
 ...skeleton_event_data_control_local_view.cpp | 304 +++++++
 .../skeleton_event_data_control_local_view.h  | 178 ++++
 ...ton_event_data_control_local_view_test.cpp | 447 ++++++++++
 .../lola/skeleton_event_tracing_test.cpp      |  23 +-
 ...eleton_service_data_control_local_view.cpp |  13 +
 ...skeleton_service_data_control_local_view.h |  66 ++
 ...n_service_data_control_local_view_test.cpp | 147 ++++
 .../com/impl/bindings/lola/skeleton_test.cpp  |  78 +-
 .../com/impl/bindings/lola/slot_collector.cpp |   8 +-
 .../com/impl/bindings/lola/slot_collector.h   |   7 +-
 .../bindings/lola/slot_collector_test.cpp     |  45 +-
 .../impl/bindings/lola/slot_decrementer.cpp   |  16 +-
 .../com/impl/bindings/lola/slot_decrementer.h |   7 +-
 .../bindings/lola/slot_decrementer_test.cpp   |  20 +-
 .../subscription_not_subscribed_states.cpp    |  19 +-
 .../lola/subscription_state_machine.cpp       |   4 +-
 .../lola/subscription_state_machine.h         |   6 +-
 ...subscription_state_machine_events_test.cpp |   6 +-
 ...ubscription_state_machine_methods_test.cpp |   2 +-
 score/mw/com/impl/bindings/lola/test/BUILD    |   1 +
 .../lola/test/proxy_event_test_resources.cpp  |  15 +-
 .../lola/test/proxy_event_test_resources.h    |   8 +-
 .../lola/test/skeleton_component_test.cpp     |   2 +
 .../test/skeleton_event_component_test.cpp    |  17 +-
 .../test/skeleton_event_test_resources.cpp    |  16 +-
 .../lola/test/skeleton_test_resources.cpp     |  12 +
 .../lola/test/skeleton_test_resources.h       |   9 +-
 .../test/transaction_log_test_resources.cpp   |  46 +-
 .../test/transaction_log_test_resources.h     |  18 +-
 .../transaction_log_registration_guard.cpp    |  26 +-
 .../lola/transaction_log_registration_guard.h |  17 +-
 ...ransaction_log_registration_guard_test.cpp |  53 +-
 .../transaction_log_rollback_executor.cpp     |  23 +-
 .../lola/transaction_log_rollback_executor.h  |  12 +-
 ...transaction_log_rollback_executor_test.cpp |  18 +-
 ...proxy_event_field_binding_factory_test.cpp |   2 +-
 .../plumbing/sample_allocatee_ptr_test.cpp    |   6 +-
 .../com/impl/tracing/skeleton_event_tracing.h |   9 +-
 74 files changed, 3455 insertions(+), 1904 deletions(-)
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_event_control_local_view.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_event_control_local_view.h
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h
 create mode 100644 score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view_test.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.cpp
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h
 create mode 100644 score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view_test.cpp

diff --git a/score/mw/com/impl/bindings/lola/BUILD b/score/mw/com/impl/bindings/lola/BUILD
index 0b8ae1b55..c56230618 100644
--- a/score/mw/com/impl/bindings/lola/BUILD
+++ b/score/mw/com/impl/bindings/lola/BUILD
@@ -236,7 +236,6 @@ cc_library(
         ":application_id_pid_mapping",
         ":element_fq_id",
         ":event_control",
-        ":event_meta_info",
         "@score_baselibs//score/memory/shared",
     ],
 )
@@ -264,6 +263,33 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "skeleton_service_data_control_local_view",
+    srcs = ["skeleton_service_data_control_local_view.cpp"],
+    hdrs = ["skeleton_service_data_control_local_view.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    deps = [
+        ":element_fq_id",
+        ":service_data_control",
+        ":skeleton_event_control_local_view",
+    ],
+)
+
+cc_library(
+    name = "proxy_service_data_control_local_view",
+    srcs = ["proxy_service_data_control_local_view.cpp"],
+    hdrs = ["proxy_service_data_control_local_view.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    deps = [
+        ":application_id_pid_mapping",
+        ":element_fq_id",
+        ":proxy_event_control_local_view",
+        ":service_data_control",
+    ],
+)
+
 cc_library(
     name = "skeleton",
     srcs = [
@@ -292,10 +318,12 @@ cc_library(
         ":i_shm_path_builder",
         ":partial_restart_path_builder",
         ":proxy_instance_identifier",
+        ":proxy_service_data_control_local_view",
         ":service_data_control",
         ":service_data_storage",
         ":shm_path_builder",
         ":skeleton_instance_identifier",
+        ":skeleton_service_data_control_local_view",
         ":transaction_log_registration_guard",
         ":type_erased_sample_ptrs_guard",
         "//score/mw/com/impl:error",
@@ -350,7 +378,9 @@ cc_library(
         ":event",
         ":event_control",
         ":event_subscription_control",
+        ":proxy_event_control_local_view",
         ":proxy_instance_identifier",
+        ":proxy_service_data_control_local_view",
         ":service_data_control",
         ":service_data_storage",
         ":shm_path_builder",
@@ -420,7 +450,7 @@ cc_library(
         "//score/mw/com/impl:__subpackages__",
     ],
     deps = [
-        ":event_data_control",
+        ":proxy_event_data_control_local_view",
         ":slot_decrementer",
     ],
 )
@@ -435,7 +465,7 @@ cc_library(
         "//score/mw/com/impl:__subpackages__",
     ],
     deps = [
-        ":event_data_control",
+        ":proxy_event_data_control_local_view",
         ":transaction_log_set",
     ],
 )
@@ -463,9 +493,9 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     tags = ["FFI"],
     deps = [
-        ":event_control",
-        ":event_data_control",
         ":i_runtime",
+        ":proxy_event_control_local_view",
+        ":proxy_event_data_control_local_view",
         ":slot_collector",
         ":transaction_log_id",
         ":transaction_log_registration_guard",
@@ -482,8 +512,8 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     tags = ["FFI"],
     deps = [
-        ":event_data_control",
         ":event_slot_status",
+        ":proxy_event_data_control_local_view",
         ":transaction_log_set",
     ],
 )
@@ -569,6 +599,40 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "skeleton_event_data_control_local_view",
+    srcs = ["skeleton_event_data_control_local_view.cpp"],
+    hdrs = ["skeleton_event_data_control_local_view.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
+    deps = [
+        ":control_slot_indicator",
+        ":control_slot_types",
+        ":event_data_control",
+        ":event_slot_status",
+        ":transaction_log_set",
+        "@score_baselibs//score/memory/shared:atomic_indirector",
+    ],
+)
+
+cc_library(
+    name = "proxy_event_data_control_local_view",
+    srcs = ["proxy_event_data_control_local_view.cpp"],
+    hdrs = ["proxy_event_data_control_local_view.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
+    deps = [
+        ":control_slot_indicator",
+        ":control_slot_types",
+        ":event_data_control",
+        ":event_slot_status",
+        ":transaction_log_set",
+        "@score_baselibs//score/memory/shared:atomic_indirector",
+    ],
+)
+
 cc_library(
     name = "control_slot_types",
     srcs = ["control_slot_types.cpp"],
@@ -597,6 +661,33 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "skeleton_event_control_local_view",
+    srcs = ["skeleton_event_control_local_view.cpp"],
+    hdrs = ["skeleton_event_control_local_view.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
+    deps = [
+        ":event_control",
+        ":skeleton_event_data_control_local_view",
+    ],
+)
+
+cc_library(
+    name = "proxy_event_control_local_view",
+    srcs = ["proxy_event_control_local_view.cpp"],
+    hdrs = ["proxy_event_control_local_view.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
+    deps = [
+        ":event_control",
+        ":event_data_control",
+        ":proxy_event_data_control_local_view",
+    ],
+)
+
 cc_library(
     name = "event_subscription_control",
     srcs = ["event_subscription_control.cpp"],
@@ -638,6 +729,8 @@ cc_library(
         ":control_slot_types",
         ":event_data_control",
         ":event_slot_status",
+        ":proxy_event_data_control_local_view",
+        ":skeleton_event_data_control_local_view",
         "@score_baselibs//score/memory/shared:atomic_indirector",
     ],
 )
@@ -751,7 +844,7 @@ cc_library(
     tags = ["FFI"],
     visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
     deps = [
-        ":service_data_control",
+        ":proxy_service_data_control_local_view",
         ":transaction_log_id",
         ":transaction_log_set",
         "//score/mw/com/impl:runtime",
@@ -773,8 +866,10 @@ cc_library(
     tags = ["FFI"],
     visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
     deps = [
-        ":event_data_control",
+        ":proxy_event_data_control_local_view",
+        ":skeleton_event_data_control_local_view",
         ":transaction_log_id",
+        ":transaction_log_set",
         "@score_baselibs//score/result",
     ],
 )
@@ -943,28 +1038,58 @@ cc_unit_test(
     ],
 )
 
-cc_test(
+cc_gtest_unit_test(
     name = "event_data_control_test",
+    srcs = ["event_data_control_test.cpp"],
+    features = COMPILER_WARNING_FEATURES,
+    deps = [
+        ":event_data_control",
+        ":event_slot_status",
+        "@score_baselibs//score/containers:dynamic_array",
+    ],
+)
+
+cc_test(
+    name = "skeleton_event_data_control_local_view_test",
     size = "small",
     timeout = "long",
     srcs = [
-        "event_data_control_test.cpp",
+        "skeleton_event_data_control_local_view_test.cpp",
     ],
     features = COMPILER_WARNING_FEATURES + [
         "aborts_upon_exception",
     ],
     tags = ["unit"],
     deps = [
-        "//score/mw/com/impl:instance_specifier",
+        ":skeleton_event_data_control_local_view",
+        "//score/mw/com/impl/bindings/lola:event_data_control",
+        "//score/mw/com/impl/bindings/lola:event_slot_status",
+        "//score/mw/com/impl/bindings/lola/test_doubles:fake_memory_resource",
+        "@googletest//:gtest_main",
+        "@score_baselibs//score/language/safecpp/coverage_termination_handler",
+        "@score_baselibs//score/memory/shared:atomic_indirector_mock_binding",
+    ],
+)
+
+cc_test(
+    name = "proxy_event_data_control_local_view_test",
+    size = "small",
+    timeout = "long",
+    srcs = [
+        "proxy_event_data_control_local_view_test.cpp",
+    ],
+    features = COMPILER_WARNING_FEATURES + [
+        "aborts_upon_exception",
+    ],
+    tags = ["unit"],
+    deps = [
+        ":proxy_event_data_control_local_view",
+        ":skeleton_event_data_control_local_view",
         "//score/mw/com/impl/bindings/lola:event_data_control",
-        "//score/mw/com/impl/bindings/lola:event_data_control_composite",
         "//score/mw/com/impl/bindings/lola/test_doubles:fake_memory_resource",
         "@googletest//:gtest_main",
-        "@score_baselibs//score/containers:dynamic_array",
-        "@score_baselibs//score/language/futurecpp",
         "@score_baselibs//score/language/safecpp/coverage_termination_handler",
         "@score_baselibs//score/memory/shared:atomic_indirector_mock_binding",
-        "@score_baselibs//score/memory/shared:new_delete_delegate_resource",
     ],
 )
 
@@ -973,6 +1098,8 @@ cc_gtest_unit_test(
     srcs = ["event_data_control_composite_test.cpp"],
     features = COMPILER_WARNING_FEATURES,
     deps = [
+        ":proxy_event_data_control_local_view",
+        ":skeleton_event_data_control_local_view",
         "//score/mw/com/impl:instance_specifier",
         "//score/mw/com/impl/bindings/lola:event_data_control",
         "//score/mw/com/impl/bindings/lola:event_data_control_composite",
@@ -1082,6 +1209,8 @@ cc_gtest_unit_test(
     features = COMPILER_WARNING_FEATURES,
     deps = [
         ":event_data_control",
+        ":proxy_event_data_control_local_view",
+        ":skeleton_event_data_control_local_view",
         ":slot_decrementer",
         "//score/mw/com/impl/bindings/lola/test_doubles:fake_memory_resource",
     ],
@@ -1275,6 +1404,8 @@ cc_gtest_unit_test(
     ],
     features = COMPILER_WARNING_FEATURES,
     deps = [
+        ":proxy_event_data_control_local_view",
+        ":skeleton_event_data_control_local_view",
         ":slot_collector",
         "//score/mw/com/impl/bindings/lola/test_doubles",
     ],
@@ -1447,6 +1578,8 @@ cc_unit_test_suites_for_host_and_qnx(
         ":dynamic_array_bounds_checking_test",
         ":event_data_control_test",
         ":event_data_control_composite_test",
+        ":proxy_event_data_control_local_view_test",
+        ":skeleton_event_data_control_local_view_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 adeb4bfce..680471c60 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control.cpp
+++ b/score/mw/com/impl/bindings/lola/event_data_control.cpp
@@ -11,445 +11,3 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
-
-#include "score/mw/com/impl/bindings/lola/event_slot_status.h"
-
-#include <score/assert.hpp>
-
-#include <atomic>
-#include <iostream>
-#include <limits>
-
-namespace score::mw::com::impl::lola::detail_event_data_control
-{
-
-namespace
-{
-
-constexpr auto MAX_ALLOCATE_RETRIES = 100U;
-constexpr auto MAX_REFERENCE_RETRIES = 100U;
-
-}  // namespace
-
-template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". we can't mark the constructor of 'score::containers::DynamicArray' as noexcept because this will
-// generate coverity findings in all users. The only way to throw exception by the constructor is that we run out of
-// memory, and as we assume that the user has memory so no way to throw std::terminate().
-// coverity[autosar_cpp14_a15_5_3_violation]
-EventDataControlImpl<AtomicIndirectorType>::EventDataControlImpl(
-    const SlotIndexType max_slots,
-    score::memory::shared::ManagedMemoryResource& resource,
-    const LolaEventInstanceDeployment::SubscriberCountType max_number_combined_subscribers) noexcept
-    : state_slots_{max_slots, resource}, transaction_log_set_{max_number_combined_subscribers, max_slots, resource}
-{
-}
-
-template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". std::terminate() is implicitly called from 'selected_index.value()' in case the selected_index doesn't
-// 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 EventDataControlImpl<AtomicIndirectorType>::AllocateNextSlot() noexcept -> ControlSlotIndicator
-{
-    // initially we have a default constructed "invalid" control-slot-indicator
-    ControlSlotIndicator selected_slot{};
-    std::uint64_t retry_counter{0U};
-
-    for (; retry_counter <= MAX_ALLOCATE_RETRIES; ++retry_counter)
-    {
-        selected_slot = FindOldestUnusedSlot();
-
-        if (!selected_slot.IsValid())
-        {
-            continue;
-        }
-
-        const auto& slot = selected_slot.GetSlot();
-        const auto slot_value =
-            AtomicIndirectorType<EventSlotStatus::value_type>::load(slot, std::memory_order_acquire);
-        EventSlotStatus status{slot_value};
-
-        // we need to check that this is still the same, since it is possible that is has changed after we found it
-        // earlier
-        if ((status.GetReferenceCount() != static_cast<EventSlotStatus::SubscriberCount>(0)) || status.IsInWriting())
-        {
-            continue;
-        }
-
-        EventSlotStatus status_new{};  // This will set the refcount to 0 by default
-        status_new.MarkInWriting();
-
-        auto status_value_type = static_cast<EventSlotStatus::value_type&>(status);
-        auto status_new_value_type = static_cast<EventSlotStatus::value_type&>(status_new);
-        if (selected_slot.GetSlot().compare_exchange_weak(
-                status_value_type, status_new_value_type, std::memory_order_acq_rel))
-        {
-            break;
-        }
-    }
-
-    score::cpp::ignore = num_alloc_retries.fetch_add(retry_counter);
-
-    if ((retry_counter >= MAX_ALLOCATE_RETRIES) && (!selected_slot.IsValid()))
-    {
-        ++num_alloc_misses;
-    }
-
-    return selected_slot;
-}
-
-template <template <class> class AtomicIndirectorType>
-// 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, no way for throwing std::terminate().
-// coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-auto EventDataControlImpl<AtomicIndirectorType>::FindOldestUnusedSlot() noexcept -> ControlSlotIndicator
-{
-    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".
-    // There is no C-style cast happening here! "current_index" and "it" are automatically deduced.
-    // Suppress "AUTOSAR C++14 M6-5-5" finding rule. This rule states: "A loop-control-variable other than the
-    // loop-counter shall not be modified within condition or expression".
-    // Both variables (current_index, it) depict exactly the same element once via index addressing and once via
-    // iterator/raw-pointer! The func has to return both, and we want both to be fully in sync, therefore we increment
-    // them both symmetrically, since in this case, it is less error-prone!
-    // Suppress "AUTOSAR C++14 A4-7-1" finding rule. This rule states: "An integer expression shall not lead to data
-    // loss". This can not be the case as the type of current_index is correctly deduced from SlotIndexType and it is
-    // assured, that state_slots_ doesn't contain more elements than SlotIndexType can represent.
-    // Suppress "AUTOSAR C++14 M5-0-15". This rule states:"indexing shall be the only form of pointer arithmetic.".
-    // Rationale: Tolerated due to containers providing pointer-like iterators.
-    // The Coverity tool considers these iterators as raw pointers.
-    // Suppress "AUTOSAR C++14 M5-2-10". This rule states: "The increment (++) and decrement (--) operators shall not be
-    // mixed with other operators in an expression".
-    // Rationale: We are only using increment operators here on separate variables! That we use it on separate variables
-    // is explained above for M6-5-5.
-    // coverity[autosar_cpp14_a5_2_2_violation]
-    for (auto [current_index, it] = std::make_tuple(SlotIndexType{0U}, state_slots_.begin()); it != state_slots_.end();
-         // coverity[autosar_cpp14_m6_5_5_violation]
-         // coverity[autosar_cpp14_a4_7_1_violation]
-         // coverity[autosar_cpp14_m5_0_15_violation]
-         // coverity[autosar_cpp14_m5_2_10_violation]
-         ++it,
-                              // coverity[autosar_cpp14_a4_7_1_violation]
-                              // coverity[autosar_cpp14_m6_5_5_violation]
-         ++current_index)
-    {
-        // coverity[autosar_cpp14_a5_3_2_violation]
-        const EventSlotStatus status{
-            AtomicIndirectorType<EventSlotStatus::value_type>::load(*it, std::memory_order_acquire)};
-
-        if (status.IsInvalid())
-        {
-            selected_slot = {current_index, *it};
-            break;
-        }
-
-        const auto are_proxies_referencing_slot =
-            status.GetReferenceCount() != static_cast<EventSlotStatus::SubscriberCount>(0U);
-        if (!are_proxies_referencing_slot && !status.IsInWriting())
-        {
-            if (status.GetTimeStamp() < oldest_time_stamp)
-            {
-                oldest_time_stamp = status.GetTimeStamp();
-                selected_slot = {current_index, *it};
-            }
-        }
-    }
-    return selected_slot;
-}
-
-template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
-// 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 EventDataControlImpl<AtomicIndirectorType>::EventReady(ControlSlotIndicator slot_indicator,
-                                                            const EventSlotStatus::EventTimeStamp time_stamp) noexcept
-    -> void
-{
-    const EventSlotStatus initial{time_stamp, 0U};
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
-    slot_indicator.GetSlot().store(static_cast<EventSlotStatus::value_type>(
-        initial));  // no race-condition can happen, since event sender has to be single-threaded/non-concurrent per AoU
-}
-
-template <template <class> class AtomicIndirectorType>
-auto EventDataControlImpl<AtomicIndirectorType>::Discard(ControlSlotIndicator slot_indicator) -> void
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
-    auto slot = static_cast<EventSlotStatus>(slot_indicator.GetSlot().load(std::memory_order_acquire));
-    if (slot.IsInWriting())
-    {
-        slot.MarkInvalid();
-        slot_indicator.GetSlot().store(static_cast<EventSlotStatus::value_type>(slot), std::memory_order_release);
-    }
-}
-
-template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
-// 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 EventDataControlImpl<AtomicIndirectorType>::ReferenceSpecificEvent(
-    const SlotIndexType slot_index,
-    const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept -> void
-{
-    // Sanity check that the slot is currently ready for reading. It's up to the caller to ensure that this function is
-    // not called in a context in which the status can change to in writing or invalid while this function is running.
-    const auto slot_current_status =
-        static_cast<EventSlotStatus>(state_slots_[slot_index].load(std::memory_order_relaxed));
-    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(
-        !(slot_current_status.IsInWriting() || slot_current_status.IsInvalid()),
-        "An event slot can only be referenced once it's ready for reading.");
-
-    auto& transaction_log = transaction_log_set_.GetTransactionLog(transaction_log_index);
-
-    // Since this function must be called when the slot is already ready for reading, we can simply increment the ref
-    // count.
-    transaction_log.ReferenceTransactionBegin(slot_index);
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
-    const auto old_slot_value = AtomicIndirectorType<EventSlotStatus::value_type>::fetch_add(
-        state_slots_[slot_index], static_cast<EventSlotStatus::value_type>(1U), std::memory_order_acq_rel);
-
-    // If the slot value overflows then the value is completely invalid which is an unrecoverable error. If we try to
-    // restart the provider, then it should contain an uncommitted reference transaction which will cause the restart to
-    // fail.
-    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(EventSlotStatus{old_slot_value}.GetReferenceCount() !=
-                                                          std::numeric_limits<EventSlotStatus::SubscriberCount>::max(),
-                                                      "Reference count overflowed which cannot be recovered from.");
-    transaction_log.ReferenceTransactionCommit(slot_index);
-}
-
-template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". std::terminate() is implicitly called from 'possible_index.value()' in case the possible_index doesn't
-// 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 EventDataControlImpl<AtomicIndirectorType>::ReferenceNextEvent(
-    const EventSlotStatus::EventTimeStamp last_search_time,
-    const TransactionLogSet::TransactionLogIndex transaction_log_index,
-    const EventSlotStatus::EventTimeStamp upper_limit) noexcept -> ControlSlotIndicator
-{
-    // function can only finish with result, if use count was able to be increased
-    ControlSlotIndicator possible_slot{};
-
-    auto& transaction_log = transaction_log_set_.GetTransactionLog(transaction_log_index);
-
-    // possible optimization: We can remember a history of possible candidates, then we don't need to fully reiterate
-    std::uint64_t counter = 0U;
-    for (; counter < MAX_REFERENCE_RETRIES; counter++)
-    {
-        // resetting possible slot for this iteration
-        possible_slot.Reset();
-
-        // initialize candidate_slot_status with last_search_time. candidate_slot_status.timestamp always reflects
-        // "highest new timestamp". The sentinel, if we did find a possible candidate is always possible_index.
-        EventSlotStatus candidate_slot_status{last_search_time, 0U};
-
-        SlotIndexType current_index = 0U;
-        // Suppres "AUTOSAR C++14 A5-3-2" finding rule. This rule states: "Null pointers shall not be dereferenced.".
-        // The "slot" variable must never be a null pointer, since DynamicArray allocates its elements when it is
-        // created.
-        // coverity[autosar_cpp14_a5_3_2_violation]
-        for (auto& slot : state_slots_)
-        {
-            // coverity[autosar_cpp14_a5_3_2_violation]
-            const EventSlotStatus slot_status{slot.load(std::memory_order_relaxed)};
-            if (slot_status.IsTimeStampBetween(candidate_slot_status.GetTimeStamp(), upper_limit))
-            {
-                possible_slot = {current_index, slot};
-                candidate_slot_status = slot_status;
-            }
-
-            // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall
-            // not lead to data loss.".
-            // On construction of state_slots_, it is already assured, that the number of slots/size can never
-            // be larger than a SlotIndexType, so no way an overflow can happen.
-            // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
-            ++current_index;
-        }
-
-        if (!possible_slot.IsValid())
-        {
-            return {};  // no sample within searched timestamp range exists.
-        }
-
-        std::size_t status_new_val{candidate_slot_status};
-
-        // An assertion to make sure that status_new_val will never overflow after assigning candidate_slot_status
-        // value.
-        static_assert(std::is_same_v<decltype(candidate_slot_status)::value_type, decltype(status_new_val)>,
-                      "ReferenceNextEvent: status_new_val overflow dangerous.");
-        // As status_new_val increment will take place and in case status_new_val has the maximum limit, an error
-        // message logged and terminate to avoid status_new_val overflow.
-        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
-            status_new_val != std::numeric_limits<std::size_t>::max(),
-            "EventDataControlImpl::ReferenceNextEvent failed: status_new_val reached the maximum "
-            "value, an overflow dangerous");
-        // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall
-        // not lead to data loss.".
-        // No way for an overflow as long as both variables have same data type, and status_new_val doesn't reach the
-        // maximum value.
-        // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
-        ++status_new_val;
-
-        auto& candidate_slot_status_value = static_cast<EventSlotStatus::value_type&>(candidate_slot_status);
-
-        auto possible_index_value = possible_slot.GetIndex();
-        auto& slot_value = possible_slot.GetSlot();
-
-        transaction_log.ReferenceTransactionBegin(possible_index_value);
-        if (AtomicIndirectorType<EventSlotStatus::value_type>::compare_exchange_weak(
-                slot_value, candidate_slot_status_value, status_new_val, std::memory_order_acq_rel))
-        {
-            transaction_log.ReferenceTransactionCommit(possible_index_value);
-            break;
-        }
-        transaction_log.ReferenceTransactionAbort(possible_index_value);
-    }
-
-    num_ref_retries += counter;
-
-    if (counter < MAX_REFERENCE_RETRIES)
-    {
-        return possible_slot;
-    }
-
-    ++num_ref_misses;
-
-    // if this happens it means we have a wrong configuration in the system, see doc-string
-    return {};
-}
-
-template <template <class> class AtomicIndirectorType>
-// 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, no way for throwing std::terminate().
-// coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-std::size_t EventDataControlImpl<AtomicIndirectorType>::GetNumNewEvents(
-    const EventSlotStatus::EventTimeStamp reference_time) const noexcept
-{
-    std::size_t result{0U};
-    // Suppres "AUTOSAR C++14 A5-3-2" finding rule. This rule states: "Null pointers shall not be dereferenced.".
-    // The "slot" variable must never be a null pointer, since DynamicArray allocates its elements when it is created.
-    // coverity[autosar_cpp14_a5_3_2_violation]
-    for (const auto& slot : state_slots_)
-    {
-        // coverity[autosar_cpp14_a5_3_2_violation]
-        const EventSlotStatus slot_status{slot.load(std::memory_order_relaxed)};
-        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
-            // an overflow here.
-            // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
-            result++;
-        }
-    }
-    return result;
-}
-
-template <template <class> class AtomicIndirectorType>
-auto EventDataControlImpl<AtomicIndirectorType>::DereferenceEvent(
-    ControlSlotIndicator slot_indicator,
-    const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept -> void
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
-    auto& transaction_log = transaction_log_set_.GetTransactionLog(transaction_log_index);
-    transaction_log.DereferenceTransactionBegin(slot_indicator.GetIndex());
-    score::cpp::ignore = slot_indicator.GetSlot().fetch_sub(1U, std::memory_order_acq_rel);
-    transaction_log.DereferenceTransactionCommit(slot_indicator.GetIndex());
-}
-
-template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
-// 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]
-void EventDataControlImpl<AtomicIndirectorType>::DereferenceEventWithoutTransactionLogging(
-    const SlotIndexType event_slot_index) noexcept
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(event_slot_index) < state_slots_.size());
-    score::cpp::ignore = state_slots_[event_slot_index].fetch_sub(1U, std::memory_order_acq_rel);
-}
-
-template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
-// 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 EventDataControlImpl<AtomicIndirectorType>::operator[](const SlotIndexType slot_index) const noexcept
-    -> EventSlotStatus
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
-    return static_cast<EventSlotStatus>(state_slots_[slot_index].load(std::memory_order_acquire));
-}
-
-template <template <class> class AtomicIndirectorType>
-// 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, no way for throwing std::terminate().
-// coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-auto EventDataControlImpl<AtomicIndirectorType>::RemoveAllocationsForWriting() noexcept -> void
-{
-    // Suppres "AUTOSAR C++14 A5-3-2" finding rule. This rule states: "Null pointers shall not be dereferenced.".
-    // The "slot" variable must never be a null pointer, since DynamicArray allocates its elements when it is created.
-    // coverity[autosar_cpp14_a5_3_2_violation]
-    for (auto& slot : state_slots_)
-    {
-        // coverity[autosar_cpp14_a5_3_2_violation]
-        EventSlotStatus status{
-            AtomicIndirectorType<EventSlotStatus::value_type>::load(slot, std::memory_order_acquire)};
-
-        if (status.IsInWriting())
-        {
-            EventSlotStatus status_new{};
-
-            auto status_value_type = static_cast<EventSlotStatus::value_type&>(status);
-            auto status_new_value_type = static_cast<EventSlotStatus::value_type&>(status_new);
-            // coverity[autosar_cpp14_a5_3_2_violation]
-            if (slot.compare_exchange_strong(status_value_type, status_new_value_type, std::memory_order_acq_rel) ==
-                false)
-            {
-                // atomic could not be changed, contract violation (other skeleton must be dead, nobody other should
-                // change the slot)
-                std::terminate();
-            }
-        }
-    }
-}
-
-template <template <class> class AtomicIndirectorType>
-auto EventDataControlImpl<AtomicIndirectorType>::DumpPerformanceCounters() -> void
-{
-    std::cout << "EventDataControlImpl performance breakdown\n"
-              << "======================================\n"
-              << "\nnum_alloc_misses:  " << num_alloc_misses << "\nnum_ref_misses     " << num_ref_misses
-              << "\nnum_alloc_retries: " << num_alloc_retries << "\nnum_ref_retries:   "
-              << num_ref_retries
-              // Suppress AUTOSAR C++14 M8-4-4, rule finding: "A function identifier shall either be used to call the
-              // function or it shall be preceded by &". Passing std::endl to std::cout object with the stream operator
-              // follows the idiomatic way that both features in conjunction were designed in the C++ standard.
-              // coverity[autosar_cpp14_m8_4_4_violation : FALSE]
-              << std::endl;
-}
-
-template <template <class> class AtomicIndirectorType>
-auto EventDataControlImpl<AtomicIndirectorType>::ResetPerformanceCounters() -> void
-{
-    num_alloc_misses.store(0U);
-    num_ref_misses.store(0U);
-    num_alloc_retries.store(0U);
-    num_ref_retries.store(0U);
-}
-
-template class EventDataControlImpl<memory::shared::AtomicIndirectorReal>;
-template class EventDataControlImpl<memory::shared::AtomicIndirectorMock>;
-
-}  // namespace score::mw::com::impl::lola::detail_event_data_control
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 6828ea89b..16bee1b3e 100644
--- a/score/mw/com/impl/bindings/lola/event_data_control.h
+++ b/score/mw/com/impl/bindings/lola/event_data_control.h
@@ -13,236 +13,46 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_H
 #define 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/control_slot_indicator.h"
 #include "score/mw/com/impl/bindings/lola/control_slot_types.h"
-#include "score/mw/com/impl/bindings/lola/transaction_log_id.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
 
+#include "score/containers/dynamic_array.h"
 #include "score/memory/shared/memory_resource_proxy.h"
 #include "score/memory/shared/polymorphic_offset_ptr_allocator.h"
 
-#include "score/memory/shared/atomic_indirector.h"
-
-#include "score/containers/dynamic_array.h"
-
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <optional>
-#include <utility>
-
 namespace score::mw::com::impl::lola
 {
-// 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]
-class EventDataControlAttorney;
-// 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]
-class EventDataControlCompositeAttorney;
-
-// 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 EventDataControlComposite;
-
-namespace detail_event_data_control
-{
 
-/// \brief EventDataControlImpl encapsulates the overall control information for one event. It is stored in Shared
-/// Memory.
+/// \brief EventDataControl encapsulates the overall control information for one event. It is stored in Shared Memory.
 ///
-/// \details Underlying EventDataControlImpl holds a dynamic array of multiple slots, which hold EventSlotStatus. The
+/// \details EventDataControl holds a dynamic array of multiple slots, which hold EventSlotStatus. The
 /// event has another equally sized dynamic array of slots which will contain the data. Both data points (data and
 /// control information) are related by their slot index. The number of slots is configured on construction (start-up of
 /// a process).
 ///
+/// This is a data-only class. All behaviour related to EventDataControl is added to EventDataControlLocal.
+/// This is because accessing state_slots_ (which is in shared memory) during runtime requires using (dereferencing,
+/// copying etc.) OffsetPtrs which can negatively affect performance. Therefore, the data in EventDataControl is created
+/// / opened once during Skeleton / Proxy creation, and then is accessed during runtime via EventDataControlLocal.
+///
 /// It is one of the corner stone elements of our LoLa IPC for Events!
-template <template <class> class AtomicIndirectorType = memory::shared::AtomicIndirectorReal>
-class EventDataControlImpl final
+class EventDataControl
 {
-    // Suppress "AUTOSAR C++14 A11-3-1", The rule declares: "Friend declarations shall not be used".
-    // The "EventDataControlAttorney" class is a helper, which sets the internal state of
-    // "EventDataControlImpl" accessing private members and used for testing purposes only.
-    // coverity[autosar_cpp14_a11_3_1_violation]
-    friend class lola::EventDataControlAttorney;
-    // 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
-    // "EventDataControlImpl" accessing private members and used for testing purposes only.
-    // 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,
-                                        memory::shared::PolymorphicOffsetPtrAllocator<ControlSlotType>>;
-    static_assert(ControlSlotType::is_always_lock_free, "According to high level design, SlotType must be lock free.");
-
-    /// \brief Will construct EventDataControlImpl and dynamically allocate memory on provided resource on
-    /// construction
-    /// \param max_slots The number of slots that shall be allocated (const afterwards)
-    /// \param proxy The memory resource proxy where the memory shall be allocated (e.g. Shared Memory)
-    /// \param max_number_combined_subscribers The max number of subscribers which can subscribe to the SkeletonEvent
-    ///        owning this EventDataControl at any one time.
-    EventDataControlImpl(
-        const SlotIndexType max_slots,
-        score::memory::shared::ManagedMemoryResource& resource,
-        const LolaEventInstanceDeployment::SubscriberCountType max_number_combined_subscribers) noexcept;
-    ~EventDataControlImpl() noexcept = default;
-
-    EventDataControlImpl(const EventDataControlImpl&) = delete;
-    EventDataControlImpl& operator=(const EventDataControlImpl&) = delete;
-    EventDataControlImpl(EventDataControlImpl&&) noexcept = delete;
-    EventDataControlImpl& operator=(EventDataControlImpl&& other) noexcept = delete;
-
-    /// \brief Checks for the oldest unused slot and acquires for writing (thread-safe, wait-free)
-    ///
-    /// \details This method will perform retries (bounded) on data-races. In order to ensure that _always_
-    /// a slot is found, it needs to be ensured that:
-    /// * enough slots are allocated (sum of all possible max allocations by consumer + 1)
-    /// * enough retries are performed (currently max number of parallel actions is restricted to 50 (number of
-    /// possible transactions (2) * number of parallel actions = number of retries))
-    ///
-    /// \return reserved slot for writing in the form of a valid ControlSlotIndicator if found, invalid
-    ///         ControlSlotIndicator otherwise
-    /// \post EventReady() is invoked to withdraw write-ownership
-    ControlSlotIndicator AllocateNextSlot() noexcept;
-
-    /// \brief Indicates that a slot is ready for reading - writing has finished. (thread-safe, wait-free)
-    /// \pre AllocateNextSlot() was invoked to obtain write-ownership
-    void EventReady(ControlSlotIndicator slot_indicator, const EventSlotStatus::EventTimeStamp time_stamp) noexcept;
-
-    /// \brief Marks selected slot as invalid, if it was not yet marked as ready
-    ///
-    /// \details We don't discard elements that are already ready, since it is possible that a user might already
-    /// read them. This just might be the case if a SampleAllocateePtr is destroyed after invoking Send().
-    ///
-    /// \pre AllocateNextSlot() was invoked to obtain write-ownership
-    void Discard(ControlSlotIndicator slot_indicator);
+        containers::DynamicArray<ControlSlotType, memory::shared::PolymorphicOffsetPtrAllocator<ControlSlotType>>;
 
-    /// \brief Increments refcount of given slot by one (given it is in the correct state i.e. being accessible/
-    ///        readable)
-    /// \details This is a specific feature - not used by the standard proxy/consumer, which is using
-    ///          ReferenceNextEvent(). This API has been introduced in the context of IPC-Tracing, where a skeleton is
-    ///          referencing/using a slot it just has allocated to trace out the content via Trace-API and
-    ///          de-referencing it after tracing of the slot data has been accomplished.
-    ///          IMPORTANT: This function is _ONLY_ threadsafe with another function incrementing the ref count of a
-    ///          slot (e.g. via ReferenceNextEvent). The function must _NOT_ be called in a context in which another
-    ///          thread could mark the slot as invalid or marked for writing concurrently with this function. If this
-    ///          function is called by the SkeletonEvent itself before handing out a SampleAllocateePtr to the user,
-    ///          then it is safe.
-    /// \param slot_index index of the slot to be referenced.
-    void ReferenceSpecificEvent(const SlotIndexType slot_index,
-                                const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
-
-    /// \brief Will search for the next slot that shall be read, after the last time and mark it for reading
-    /// \param last_search_time The time stamp the last time a search for an event was performed
-    ///
-    /// \details This method will perform retries (bounded) on data-races. I.e. if a viable slot failed to be marked
-    /// for reading because of a data race, retries are made.
-    ///
-    /// \return Will return a valid ControlSlotIndicator indicating/pointing to an event, which is the youngest/newest
-    ///         one between last_search_time and upper_limit. I.e. its timestamp is between last_search_time and
-    ///         upper_limit and all other events with timestamps between last_search_time and upper_limit have a smaller
-    ///         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::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.
-    /// \return number/count of available events, which are newer than the given reference_time.
-    std::size_t GetNumNewEvents(const EventSlotStatus::EventTimeStamp reference_time) const noexcept;
-
-    /// \brief Indicates that a consumer is finished reading (thread-safe, wait-free)
-    /// \pre ReferenceNextEvent() was invoked to obtain read-ownership
-    ///
-    /// \details Will also record the transaction in the TransactionLog corresponding to transaction_log_index
-    void DereferenceEvent(ControlSlotIndicator slot_indicator,
-                          const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
-
-    /// \brief Indicates that a consumer is finished reading (thread-safe, wait-free).
-    /// \pre ReferenceNextEvent() was invoked to obtain read-ownership
-    ///
-    /// \details Will not record the transaction in any TransactionLog. This function is called by the
-    /// TransactionLog::DereferenceSlotCallback created within TransactionLogSet::RollbackProxyTransactions and
-    /// RollbackSkeletonTracingTransactions. In these cases, the transaction will be recorded within
-    /// TransactionLog::RollbackIncrementTransactions resp. RollbackSubscribeTransactions before calling the callback.
-    void DereferenceEventWithoutTransactionLogging(const SlotIndexType event_slot_index) noexcept;
-
-    /// \brief Directly access EventSlotStatus for one specific slot
-    EventSlotStatus operator[](const SlotIndexType slot_index) const noexcept;
-
-    /// \brief Marks all Slots which are `InWriting` as `Invalid`.
-    /// \details This function shall _only_ be called on skeleton side and _only_ if a previous skeleton instance died.
-    void RemoveAllocationsForWriting() noexcept;
-
-    // Suppress "AUTOSAR C++14 A9-3-1" rule finding: "Member functions shall not return non-const “raw” pointers or
-    // references to private or protected data owned by the class.".
-    // To avoid overhead such as shared_ptr in the result, a non-const reference to the instance is returned instead.
-    // This instance exposes another sub-API that can change the its state and therefore also the state of instance
-    // holder. API callers get the reference and use it in place without leaving the scope, so the reference remains
-    // valid.
-    // coverity[autosar_cpp14_a9_3_1_violation]
-    TransactionLogSet& GetTransactionLogSet() noexcept
-    {
-        // coverity[autosar_cpp14_a9_3_1_violation] see above
-        return transaction_log_set_;
-    }
-
-    /// \brief Returns the max sample slots set on creation of EventDataControl
-    std::size_t GetMaxSampleSlots() const noexcept
+    EventDataControl(const SlotIndexType max_slots,
+                     score::memory::shared::ManagedMemoryResource& resource,
+                     const LolaEventInstanceDeployment::SubscriberCountType max_number_combined_subscribers) noexcept
+        : state_slots_{max_slots, resource}, transaction_log_set_{max_number_combined_subscribers, max_slots, resource}
     {
-        return state_slots_.size();
     }
 
-    // helper for performance indication (no production usage)
-    static void DumpPerformanceCounters();
-    static void ResetPerformanceCounters();
-
-  private:
-    /// \brief Finds oldest unused slot within control slots, if there is any.
-    /// \return if an unused slot is found, returns a ControlSlotIndicator, which is valid, otherwise an invalid
-    ///         ControlSlotIndicator is returned.
-    ControlSlotIndicator FindOldestUnusedSlot() noexcept;
-
-    // Shared Memory ready :)!
-    // we don't implement a smarter structure and just iterate through it, because we believe that by
-    // cache optimization this is way faster than e.g. a tree, since a tree also needs to be
-    // implemented wait-free.
     EventControlSlots state_slots_;
-
     TransactionLogSet transaction_log_set_;
-
-    // helper variables to calculated performance indicators
-    static inline std::atomic_uint_fast64_t num_alloc_misses{0U};
-    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};
 };
 
-}  // namespace detail_event_data_control
-
-using EventDataControl = detail_event_data_control::EventDataControlImpl<>;
-
 }  // namespace score::mw::com::impl::lola
 
 #endif  // SCORE_MW_COM_IMPL_BINDINGS_LOLA_EVENT_DATA_CONTROL_H
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 16d0e0055..d0584f77c 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
@@ -26,15 +26,22 @@ 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>
-EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(EventDataControl* const asil_qm_control)
-    : EventDataControlComposite{asil_qm_control, nullptr}
+EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(
+    SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+    ProxyEventDataControlLocalView<>* const proxy_control_local)
+    : EventDataControlComposite{asil_qm_control_local, nullptr, proxy_control_local}
 {
 }
 
 template <template <class> class AtomicIndirectorType>
-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}
+EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(
+    SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+    SkeletonEventDataControlLocalView<>* const asil_b_control_local,
+    ProxyEventDataControlLocalView<>* const proxy_control_local)
+    : asil_qm_control_local_{asil_qm_control_local},
+      asil_b_control_local_{asil_b_control_local},
+      proxy_control_local_{proxy_control_local},
+      ignore_qm_control_{false}
 {
     CheckForValidDataControls();
 }
@@ -51,8 +58,8 @@ auto EventDataControlComposite<AtomicIndirectorType>::GetNextFreeMultiSlot() con
 {
     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};
+    SkeletonEventDataControlLocalView<>::LocalEventControlSlots::iterator qm_slot_ptr{};
+    SkeletonEventDataControlLocalView<>::LocalEventControlSlots::iterator asil_b_slot_ptr{};
 
     // Here we are explicitly iterating via iterators/raw-pointers over the slots as it avoids unnecessary
     // bounds-checks, which index access would apply!
@@ -75,9 +82,9 @@ auto EventDataControlComposite<AtomicIndirectorType>::GetNextFreeMultiSlot() con
     for (auto [current_index, it_slots_qm, it_slots_asil_b] = std::make_tuple(
              // coverity[autosar_cpp14_a5_2_2_violation]
              std::size_t{0U},
-             asil_qm_control_->state_slots_.begin(),
-             asil_b_control_->state_slots_.begin());
-         current_index != asil_b_control_->state_slots_.size();
+             asil_qm_control_local_->state_slots_.begin(),
+             asil_b_control_local_->state_slots_.begin());
+         current_index != asil_b_control_local_->state_slots_.size();
          // coverity[autosar_cpp14_m6_5_5_violation]
          // coverity[autosar_cpp14_m5_0_15_violation]
          // coverity[autosar_cpp14_a12_8_3_violation : FALSE]
@@ -187,9 +194,9 @@ auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextMultiSlot() no
 template <template <class> class AtomicIndirectorType>
 auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcept -> ControlSlotCompositeIndicator
 {
-    if (asil_b_control_ == nullptr)
+    if (asil_b_control_local_ == nullptr)
     {
-        auto qm_control_slot_indicator = asil_qm_control_->AllocateNextSlot();
+        auto qm_control_slot_indicator = asil_qm_control_local_->AllocateNextSlot();
         if (qm_control_slot_indicator.IsValid())
         {
             return {qm_control_slot_indicator.GetIndex(),
@@ -201,7 +208,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcep
 
     if (ignore_qm_control_)
     {
-        auto asil_b_control_slot_indicator = asil_b_control_->AllocateNextSlot();
+        auto asil_b_control_slot_indicator = asil_b_control_local_->AllocateNextSlot();
         if (asil_b_control_slot_indicator.IsValid())
         {
             return {asil_b_control_slot_indicator.GetIndex(),
@@ -220,7 +227,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcep
         // to be able to allocate a further slot ...
         ignore_qm_control_ = true;
         // fall back to allocation solely within asil_b control.
-        auto asil_b_control_slot_indicator = asil_b_control_->AllocateNextSlot();
+        auto asil_b_control_slot_indicator = asil_b_control_local_->AllocateNextSlot();
         if (asil_b_control_slot_indicator.IsValid())
         {
             return {asil_b_control_slot_indicator.GetIndex(),
@@ -237,28 +244,28 @@ auto EventDataControlComposite<AtomicIndirectorType>::EventReady(ControlSlotComp
                                                                  EventSlotStatus::EventTimeStamp time_stamp) noexcept
     -> void
 {
-    if (asil_b_control_ != nullptr)
+    if (asil_b_control_local_ != nullptr)
     {
-        asil_b_control_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotAsilB()}, time_stamp);
+        asil_b_control_local_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotAsilB()}, time_stamp);
     }
 
     if (!ignore_qm_control_)
     {
-        asil_qm_control_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, time_stamp);
+        asil_qm_control_local_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, time_stamp);
     }
 }
 
 template <template <class> class AtomicIndirectorType>
 auto EventDataControlComposite<AtomicIndirectorType>::Discard(ControlSlotCompositeIndicator slot_indicator) -> void
 {
-    if (asil_b_control_ != nullptr)
+    if (asil_b_control_local_ != nullptr)
     {
-        asil_b_control_->Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotAsilB()});
+        asil_b_control_local_->Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotAsilB()});
     }
 
     if (!ignore_qm_control_)
     {
-        asil_qm_control_->Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()});
+        asil_qm_control_local_->Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()});
     }
 }
 
@@ -269,34 +276,40 @@ bool EventDataControlComposite<AtomicIndirectorType>::IsQmControlDisconnected()
 }
 
 template <template <class> class AtomicIndirectorType>
-EventDataControl& EventDataControlComposite<AtomicIndirectorType>::GetQmEventDataControl() const noexcept
+SkeletonEventDataControlLocalView<>& EventDataControlComposite<AtomicIndirectorType>::GetQmEventDataControlLocal()
+    const noexcept
 {
-    return *asil_qm_control_;
+    return *asil_qm_control_local_;
 }
 
 template <template <class> class AtomicIndirectorType>
-std::optional<EventDataControl*> EventDataControlComposite<AtomicIndirectorType>::GetAsilBEventDataControl() noexcept
+SkeletonEventDataControlLocalView<>*
+EventDataControlComposite<AtomicIndirectorType>::GetAsilBEventDataControlLocal() noexcept
 {
-    if (asil_b_control_ != nullptr)
-    {
-        return asil_b_control_;
-    }
-    return {};
+    return asil_b_control_local_;
+}
+
+template <template <class> class AtomicIndirectorType>
+ProxyEventDataControlLocalView<>&
+EventDataControlComposite<AtomicIndirectorType>::GetProxyEventDataControlLocalView() noexcept
+{
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD(proxy_control_local_ != nullptr);
+    return *proxy_control_local_;
 }
 
 template <template <class> class AtomicIndirectorType>
 EventSlotStatus::EventTimeStamp EventDataControlComposite<AtomicIndirectorType>::GetEventSlotTimestamp(
     const SlotIndexType slot) const noexcept
 {
-    if (asil_b_control_ != nullptr)
+    if (asil_b_control_local_ != nullptr)
     {
-        const EventSlotStatus event_slot_status{(*asil_b_control_)[slot]};
+        const EventSlotStatus event_slot_status{(*asil_b_control_local_)[slot]};
         const EventSlotStatus::EventTimeStamp sample_timestamp{event_slot_status.GetTimeStamp()};
         return sample_timestamp;
     }
     else
     {
-        const EventSlotStatus event_slot_status{(*asil_qm_control_)[slot]};
+        const EventSlotStatus event_slot_status{(*asil_qm_control_local_)[slot]};
         const EventSlotStatus::EventTimeStamp sample_timestamp{event_slot_status.GetTimeStamp()};
         return sample_timestamp;
     }
@@ -305,7 +318,7 @@ EventSlotStatus::EventTimeStamp EventDataControlComposite<AtomicIndirectorType>:
 template <template <class> class AtomicIndirectorType>
 void EventDataControlComposite<AtomicIndirectorType>::CheckForValidDataControls() const noexcept
 {
-    if (asil_qm_control_ == nullptr)
+    if (asil_qm_control_local_ == nullptr)
     {
         std::terminate();
     }
@@ -320,7 +333,8 @@ template <template <class> class AtomicIndirectorType>
 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_;
+    SkeletonEventDataControlLocalView<>* control =
+        (asil_b_control_local_ != nullptr) ? asil_b_control_local_ : asil_qm_control_local_;
     for (SlotIndexType slot_index = 0U;
          // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall not lead to
          // loss.". As the maximum number of slots is std::uint16_t, so there is no case for a data loss here.
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 920d371b4..b636a194c 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
@@ -17,12 +17,12 @@
 #include "score/mw/com/impl/bindings/lola/control_slot_types.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_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 
 #include "score/memory/shared/atomic_indirector.h"
 
 #include <optional>
-#include <tuple>
-#include <utility>
 
 namespace score::mw::com::impl::lola
 {
@@ -47,10 +47,13 @@ class EventDataControlComposite
 
   public:
     /// \brief Constructs a composite which will only manage a single QM control (no ASIL use-case)
-    explicit EventDataControlComposite(EventDataControl* const asil_qm_control);
+    explicit EventDataControlComposite(SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+                                       ProxyEventDataControlLocalView<>* const proxy_control_local);
 
     /// \brief Constructs a composite which will manage QM and ASIL control at the same time
-    explicit EventDataControlComposite(EventDataControl* const asil_qm_control, EventDataControl* const asil_b_control);
+    explicit EventDataControlComposite(SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+                                       SkeletonEventDataControlLocalView<>* const asil_b_control_local,
+                                       ProxyEventDataControlLocalView<>* const proxy_control_local);
 
     /// \brief Checks for the oldest unused slot and acquires for writing (thread-safe, wait-free)
     ///
@@ -84,12 +87,16 @@ class EventDataControlComposite
     /// \return _true_ if disconnected and the composite supports QM/ASIL parts, _false_ else.
     bool IsQmControlDisconnected() const noexcept;
 
-    /// \brief Returns the (mandatory) EventDataControl for QM.
-    EventDataControl& GetQmEventDataControl() const noexcept;
+    /// \brief Returns the (mandatory) SkeletonEventDataControlLocalView for QM.
+    SkeletonEventDataControlLocalView<>& GetQmEventDataControlLocal() const noexcept;
 
-    /// \brief Returns the optional EventDataControl for ASIL-B
-    /// \return an empty optional if no ASIL-B support, otherwise, a valid pointer to the ASIL-B EventDataControl.
-    std::optional<EventDataControl*> GetAsilBEventDataControl() noexcept;
+    /// \brief Returns a pointer to SkeletonEventDataControlLocalView for ASIL-B
+    /// \return a nullptr if no ASIL-B support, otherwise, a valid pointer to the ASIL-B EventDataControl.
+    SkeletonEventDataControlLocalView<>* GetAsilBEventDataControlLocal() noexcept;
+
+    /// \brief Returns a reference to ProxyEventDataControlLocalView for which is used for tracing
+    /// \pre only called if EventDataControlComposite was constructed with a valid ProxyEventDataControlLocalView
+    ProxyEventDataControlLocalView<>& GetProxyEventDataControlLocalView() noexcept;
 
     /// \brief Returns the timestamp of the provided slot index
     EventSlotStatus::EventTimeStamp GetEventSlotTimestamp(const SlotIndexType slot) const noexcept;
@@ -97,8 +104,10 @@ class EventDataControlComposite
     EventSlotStatus::EventTimeStamp GetLatestTimestamp() const noexcept;
 
   private:
-    EventDataControl* asil_qm_control_;
-    EventDataControl* asil_b_control_;
+    SkeletonEventDataControlLocalView<>* asil_qm_control_local_;
+    SkeletonEventDataControlLocalView<>* asil_b_control_local_;
+
+    ProxyEventDataControlLocalView<>* proxy_control_local_;
 
     /// \brief flag indicating, whether qm_control part shall be ignored in any public API (AllocateNextSlot(),
     /// EventReady(), Discard()()
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 e33cdf0a0..a3008e3e9 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
@@ -13,6 +13,8 @@
 #include "score/mw/com/impl/bindings/lola/event_data_control_composite.h"
 
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
 #include "score/mw/com/impl/instance_specifier.h"
 
@@ -82,34 +84,43 @@ class EventDataControlCompositeFixture : public ::testing::Test
     {
         qm_ = std::make_unique<EventDataControl>(kMaxSlots, memory_, kMaxSubscribers);
         asil_ = std::make_unique<EventDataControl>(kMaxSlots, memory_, kMaxSubscribers);
+
+        skeleton_qm_local_.emplace(*qm_);
+        skeleton_asil_local_.emplace(*asil_);
+
+        proxy_qm_local_.emplace(*qm_);
+        proxy_asil_local_.emplace(*asil_);
+
         return *this;
     }
 
     EventDataControlCompositeFixture& WithQmOnlyEventDataControl()
     {
         qm_ = std::make_unique<EventDataControl>(kMaxSlots, memory_, kMaxSubscribers);
+        skeleton_qm_local_.emplace(*qm_);
+        proxy_qm_local_.emplace(*qm_);
         return *this;
     }
 
     EventDataControlCompositeFixture& WithRealEventDataControlComposite()
     {
-        SCORE_LANGUAGE_FUTURECPP_ASSERT(qm_ != nullptr);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(skeleton_qm_local_.has_value());
 
-        auto* const asil_control = asil_ != nullptr ? asil_.get() : nullptr;
-        unit_ = std::make_unique<EventDataControlComposite<>>(qm_.get(), asil_control);
+        auto* const asil_control = skeleton_asil_local_.has_value() ? &skeleton_asil_local_.value() : nullptr;
+        unit_ = std::make_unique<EventDataControlComposite<>>(&skeleton_qm_local_.value(), asil_control, nullptr);
         return *this;
     }
 
     EventDataControlCompositeFixture& WithMockedEventDataControlComposite()
     {
-        SCORE_LANGUAGE_FUTURECPP_ASSERT(qm_ != nullptr);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(skeleton_qm_local_.has_value());
 
         atomic_mock_ = std::make_unique<memory::shared::AtomicMock<EventSlotStatus::value_type>>();
         memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(atomic_mock_.get());
 
-        auto* const asil_control = asil_ != nullptr ? asil_.get() : nullptr;
-        unit_mock_ =
-            std::make_unique<EventDataControlComposite<memory::shared::AtomicIndirectorMock>>(qm_.get(), asil_control);
+        auto* const asil_control = skeleton_asil_local_.has_value() ? &skeleton_asil_local_.value() : nullptr;
+        unit_mock_ = std::make_unique<EventDataControlComposite<memory::shared::AtomicIndirectorMock>>(
+            &skeleton_qm_local_.value(), asil_control, nullptr);
 
         return *this;
     }
@@ -118,12 +129,12 @@ class EventDataControlCompositeFixture : public ::testing::Test
     {
         SCORE_LANGUAGE_FUTURECPP_ASSERT(qm_ != nullptr);
         transaction_log_index_qm_ = std::make_unique<TransactionLogSet::TransactionLogIndex>(
-            qm_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdQm).value());
+            skeleton_qm_local_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdQm).value());
 
         if (asil_ != nullptr)
         {
             transaction_log_index_asil_ = std::make_unique<TransactionLogSet::TransactionLogIndex>(
-                asil_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdAsil).value());
+                skeleton_asil_local_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdAsil).value());
         }
         return *this;
     }
@@ -149,7 +160,7 @@ class EventDataControlCompositeFixture : public ::testing::Test
         for (SlotIndexType counter = 0; counter < kSlotCount; ++counter)
         {
             auto slot_indicator = slot_indicators_[counter];
-            qm_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, counter + 1u);
+            skeleton_qm_local_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, counter + 1u);
         }
     }
 
@@ -158,6 +169,11 @@ class EventDataControlCompositeFixture : public ::testing::Test
 
     std::unique_ptr<EventDataControl> asil_{nullptr};
     std::unique_ptr<EventDataControl> qm_{nullptr};
+    std::optional<SkeletonEventDataControlLocalView<>> skeleton_qm_local_{};
+    std::optional<SkeletonEventDataControlLocalView<>> skeleton_asil_local_{};
+    std::optional<ProxyEventDataControlLocalView<>> proxy_qm_local_{};
+    std::optional<ProxyEventDataControlLocalView<>> proxy_asil_local_{};
+
     std::unique_ptr<EventDataControlComposite<>> unit_{nullptr};
 
     std::unique_ptr<memory::shared::AtomicMock<EventSlotStatus::value_type>> atomic_mock_{nullptr};
@@ -409,7 +425,8 @@ TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInQmList)
     unit_->EventReady(slot_indicators_[2], 1);
     unit_->EventReady(slot_indicators_[4], 2);
 
-    score::cpp::ignore = qm_->ReferenceNextEvent(0, *transaction_log_index_qm_);  // slot 4 is used in QM list
+    score::cpp::ignore =
+        proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_);  // slot 4 is used in QM list
 
     // When allocating one additional slot
     const auto allocation = unit_->AllocateNextSlot();
@@ -425,7 +442,8 @@ TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInAsilList)
     AllocateAllSlots();
     unit_->EventReady(slot_indicators_[2], 1);
     unit_->EventReady(slot_indicators_[4], 2);
-    score::cpp::ignore = asil_->ReferenceNextEvent(0, *transaction_log_index_asil_);  // slot 4 is used in ASIL list
+    score::cpp::ignore =
+        proxy_asil_local_->ReferenceNextEvent(0, *transaction_log_index_asil_);  // slot 4 is used in ASIL list
 
     // When allocating one additional slot
     const auto allocation = unit_->AllocateNextSlot();
@@ -479,8 +497,8 @@ TEST_F(EventDataControlCompositeFixture, QmConsumerViolation)
     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);
-        upper_limit = (*qm_)[slot_indicator.GetIndex()].GetTimeStamp();
+        auto slot_indicator = proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
+        upper_limit = (*proxy_qm_local_)[slot_indicator.GetIndex()].GetTimeStamp();
     }
 
     // When allocating one additional slot
@@ -509,8 +527,8 @@ TEST_F(EventDataControlCompositeFixture, AllocationIgnoresQMAfterContractViolati
     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);
-        upper_limit = (*qm_)[slot_indicator.GetIndex()].GetTimeStamp();
+        auto slot_indicator = proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
+        upper_limit = (*proxy_qm_local_)[slot_indicator.GetIndex()].GetTimeStamp();
     }
     score::cpp::ignore = unit_->AllocateNextSlot();
     ASSERT_TRUE(unit_->IsQmControlDisconnected());
@@ -550,8 +568,8 @@ TEST_F(EventDataControlCompositeFixture, AsilBConsumerViolation)
     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);
-        upper_limit = (*asil_)[slot_indicator.GetIndex()].GetTimeStamp();
+        auto slot_indicator = proxy_asil_local_->ReferenceNextEvent(0, *transaction_log_index_asil_, upper_limit);
+        upper_limit = (*proxy_asil_local_)[slot_indicator.GetIndex()].GetTimeStamp();
     }
 
     // When allocating one additional slot
@@ -576,7 +594,10 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
     constexpr auto MAX_SUBSCRIBERS = 10;
     EventDataControl asil{MAX_SLOTS, memory, MAX_SUBSCRIBERS};
     EventDataControl qm{MAX_SLOTS, memory, MAX_SUBSCRIBERS};
-    EventDataControlComposite unit{&qm, &asil};
+    SkeletonEventDataControlLocalView skeleton_asil_local{asil};
+    SkeletonEventDataControlLocalView skeleton_qm_local{qm};
+
+    EventDataControlComposite unit{&skeleton_qm_local, &skeleton_asil_local, nullptr};
 
     std::mutex allocated_slots_mutex{};
     std::vector<ControlSlotCompositeIndicator> allocated_slots{};
@@ -613,14 +634,16 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
     };
 
     auto receiver = [&last_send_time_stamp, &qm, &asil]() {
+        ProxyEventDataControlLocalView proxy_asil_local{asil};
+        ProxyEventDataControlLocalView proxy_qm_local{qm};
         std::vector<ControlSlotIndicator> used_slots_qm{};
         std::vector<ControlSlotIndicator> used_slots_asil{};
         EventSlotStatus::EventTimeStamp start_ts{1};
 
         TransactionLogSet::TransactionLogIndex transaction_log_index_qm =
-            qm.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdQm).value();
+            proxy_qm_local.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdQm).value();
         TransactionLogSet::TransactionLogIndex transaction_log_index_asil =
-            asil.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdAsil).value();
+            proxy_asil_local.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdAsil).value();
 
         for (auto counter = 0; counter < 100; counter++)
         {
@@ -632,7 +655,7 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
                 // QM List
                 if (used_slots_qm.size() < 5 && RandomTrueOrFalse())
                 {
-                    auto slot_indicator = qm.ReferenceNextEvent(start_ts, transaction_log_index_qm);
+                    auto slot_indicator = proxy_qm_local.ReferenceNextEvent(start_ts, transaction_log_index_qm);
                     if (slot_indicator.IsValid())
                     {
                         score::cpp::ignore = used_slots_qm.emplace_back(slot_indicator);
@@ -648,7 +671,7 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
                         std::advance(iterator, index);
                         const auto value = *iterator;
                         score::cpp::ignore = used_slots_qm.erase(iterator);
-                        qm.DereferenceEvent(value, transaction_log_index_qm);
+                        proxy_qm_local.DereferenceEvent(value, transaction_log_index_qm);
                     }
                 }
             }
@@ -657,7 +680,7 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
                 // ASIL List
                 if (used_slots_asil.size() < 5 && RandomTrueOrFalse())
                 {
-                    auto slot_indicator = asil.ReferenceNextEvent(start_ts, transaction_log_index_asil);
+                    auto slot_indicator = proxy_asil_local.ReferenceNextEvent(start_ts, transaction_log_index_asil);
                     if (slot_indicator.IsValid())
                     {
                         score::cpp::ignore = used_slots_asil.emplace_back(slot_indicator);
@@ -673,7 +696,7 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
                         std::advance(iterator, index);
                         const auto value = *iterator;
                         score::cpp::ignore = used_slots_asil.erase(iterator);
-                        asil.DereferenceEvent(value, transaction_log_index_asil);
+                        proxy_asil_local.DereferenceEvent(value, transaction_log_index_asil);
                     }
                 }
             }
@@ -707,9 +730,9 @@ TEST_F(EventDataControlCompositeFixture, GetQmEventDataControl)
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
 
     // When getting the QM event data control
-    auto& qm_event_data_control = unit_->GetQmEventDataControl();
+    auto& qm_event_data_control = unit_->GetQmEventDataControlLocal();
     // we can call a method on the returned control.
-    qm_event_data_control.GetNumNewEvents(0);
+    qm_event_data_control.AllocateNextSlot();
 }
 
 TEST_F(EventDataControlCompositeFixture, GetAsilBEventDataControl)
@@ -718,11 +741,11 @@ TEST_F(EventDataControlCompositeFixture, GetAsilBEventDataControl)
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
 
     // When getting the ASIL-B event data control
-    const auto asil_b__event_data_control = unit_->GetAsilBEventDataControl();
+    auto* const asil_b_event_data_control_local = unit_->GetAsilBEventDataControlLocal();
     // expect, that we have a value
-    EXPECT_TRUE(asil_b__event_data_control.has_value());
+    EXPECT_NE(asil_b_event_data_control_local, nullptr);
     // and expect, we can call a method on the returned control.
-    asil_b__event_data_control.value()->GetNumNewEvents(0);
+    asil_b_event_data_control_local->AllocateNextSlot();
 }
 
 TEST_F(EventDataControlCompositeFixture, GetEmptyAsilBEventDataControl)
@@ -731,9 +754,54 @@ TEST_F(EventDataControlCompositeFixture, GetEmptyAsilBEventDataControl)
     WithQmOnlyEventDataControl().WithRealEventDataControlComposite();
 
     // When getting the ASIL-B event data control
-    const auto asil_b__event_data_control = unit_->GetAsilBEventDataControl();
+    auto* const asil_b_event_data_control = unit_->GetAsilBEventDataControlLocal();
     // expect, that we get no value
-    EXPECT_FALSE(asil_b__event_data_control.has_value());
+    EXPECT_EQ(asil_b_event_data_control, nullptr);
+}
+
+TEST_F(EventDataControlCompositeFixture, GetProxyEventDataControlLocalView)
+{
+    // Given an EventDataControlComposite constructed with a ProxyEventDataControlLocalView
+    EventDataControl qm{kMaxSlots, memory_, kMaxSubscribers};
+    SkeletonEventDataControlLocalView<> skeleton_qm_local{qm};
+    ProxyEventDataControlLocalView<> proxy_qm_local{qm};
+    EventDataControlComposite<> unit{&skeleton_qm_local, &proxy_qm_local};
+
+    // When getting the ASIL-B event data control
+    auto& returned_proxy_qm_local = unit.GetProxyEventDataControlLocalView();
+
+    // Then the same ProxyEventDataControlLocalView that was passed to the constructor is returned
+    EXPECT_EQ(&proxy_qm_local, &returned_proxy_qm_local);
+}
+
+TEST_F(EventDataControlCompositeFixture, GetProxyEventDataControlLocalViewWithAsilB)
+{
+    // Given an EventDataControlComposite constructed with a ProxyEventDataControlLocalView
+    EventDataControl qm{kMaxSlots, memory_, kMaxSubscribers};
+    EventDataControl asil_b{kMaxSlots, memory_, kMaxSubscribers};
+    SkeletonEventDataControlLocalView<> skeleton_qm_local{qm};
+    SkeletonEventDataControlLocalView<> skeleton_asil_b_local{asil_b};
+    ProxyEventDataControlLocalView<> proxy_qm_local{qm};
+    EventDataControlComposite<> unit{&skeleton_qm_local, &skeleton_asil_b_local, &proxy_qm_local};
+
+    // When getting the ASIL-B event data control
+    auto& returned_proxy_qm_local = unit.GetProxyEventDataControlLocalView();
+
+    // Then the same ProxyEventDataControlLocalView that was passed to the constructor is returned
+    EXPECT_EQ(&proxy_qm_local, &returned_proxy_qm_local);
+}
+
+TEST_F(EventDataControlCompositeFixture,
+       CallingGetProxyEventDataControlLocalViewWhenCompositeNotConstructedWithOneTerminates)
+{
+    // Given an EventDataControlComposite constructed without a ProxyEventDataControlLocalView
+    EventDataControl qm{kMaxSlots, memory_, kMaxSubscribers};
+    SkeletonEventDataControlLocalView<> skeleton_qm_local{qm};
+    EventDataControlComposite<> unit{&skeleton_qm_local, nullptr};
+
+    // When getting the ASIL-B event data control
+    // Then the program terminates
+    EXPECT_DEATH(score::cpp::ignore = unit.GetProxyEventDataControlLocalView(), ".*");
 }
 
 TEST(EventDataControlCompositeDeathTest, DiesOnConstructionWithNullptr)
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 57bb4e510..d9b937484 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
@@ -12,23 +12,11 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
 
-#include "score/containers/dynamic_array.h"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
-#include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
-#include "score/mw/com/impl/instance_specifier.h"
-
-#include "score/memory/shared/atomic_indirector.h"
-#include "score/memory/shared/atomic_mock.h"
 
-#include <score/utility.hpp>
+#include "score/containers/dynamic_array.h"
 
 #include <gtest/gtest.h>
-#include <chrono>
-#include <limits>
-#include <mutex>
-#include <random>
-#include <thread>
-#include <vector>
 
 namespace score::mw::com::impl::lola
 {
@@ -36,30 +24,6 @@ namespace score::mw::com::impl::lola
 namespace
 {
 
-using ::testing::_;
-using ::testing::Return;
-
-constexpr std::size_t kMaxSlots{5U};
-constexpr std::size_t kMaxSubscribers{5U};
-const TransactionLogId kDummyTransactionLogId{10U};
-
-constexpr auto kSlotIsInWriting = std::numeric_limits<EventSlotStatus::SubscriberCount>::max();
-
-std::size_t RandomNumberBetween(std::size_t lower, std::size_t upper)
-{
-    std::mt19937_64 random_number_generator{};
-    auto time_seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
-    std::seed_seq sequence_seed{uint32_t(time_seed & 0xffffffff), std::uint32_t(time_seed >> 32)};
-    random_number_generator.seed(sequence_seed);
-    std::uniform_int_distribution<std::size_t> number_distribution(lower, upper);
-    return number_distribution(random_number_generator);
-}
-
-bool RandomTrueOrFalse()
-{
-    return RandomNumberBetween(0, 1);
-}
-
 TEST(EventDataControlTest, EventDataControlUsesADynamicArrayToRepresentSlots)
 {
     // Our detailed design (aas/lib/memory/design/shared_memory/OffsetPtrDesign.md#dynamic-array-considerations)
@@ -72,727 +36,5 @@ TEST(EventDataControlTest, EventDataControlUsesADynamicArrayToRepresentSlots)
         "EventDataControl should use a dynamic array to represent slots.");
 }
 
-class EventDataControlFixture : public ::testing::Test
-{
-  public:
-    static void SetUpTestSuite()
-    {
-        // we are annotating this requirement coverage for SSR-6225206 on test-suite level, as all
-        // test cases within this suite verify the slot-allocation/usage algo defined in SSR-6225206
-        RecordProperty("Verifies", "SSR-6225206");
-        RecordProperty("Description", "Ensures correct slot allocation algorithm");
-        RecordProperty("TestType", "Requirements-based test");
-        RecordProperty("Priority", "1");
-        RecordProperty("DerivationTechnique", "Analysis of requirements");
-    }
-
-    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>>(
-                max_slots, memory_, max_subscribers);
-
-        return *this;
-    }
-
-    EventDataControlFixture& WithAnAllocatedSlot(EventSlotStatus::EventTimeStamp timestamp = 1)
-    {
-        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)
-{
-    RecordProperty("Verifies", "SCR-5899076");
-    RecordProperty("Description", "Ensures that a slot can be allocated");
-    RecordProperty("TestType", "Requirements-based test");
-    RecordProperty("Priority", "1");
-    RecordProperty("DerivationTechnique", "Analysis of requirements");
-
-    // Given an initialized EventDataControl structure
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-
-    // When allocating a slot
-    auto slot = unit_->AllocateNextSlot();
-
-    EXPECT_TRUE(slot.IsValid());
-    // The expected (first) slot is returned
-    EXPECT_EQ(slot.GetIndex(), 0);
-}
-
-TEST_F(EventDataControlFixture, CanAllocateOneSlotWhenReferenceCountChanges)
-{
-    RecordProperty("Verifies", "SCR-5899076");
-    RecordProperty("Description", "Ensures that a slot can be allocated");
-    RecordProperty("TestType", "Requirements-based test");
-    RecordProperty("Priority", "1");
-    RecordProperty("DerivationTechnique", "Analysis of requirements");
-
-    score::cpp::ignore = GivenAMockedEventDataControl(kMaxSlots, kMaxSubscribers);
-
-    // And an atomic mimicking two relevant slots where ...
-    EXPECT_CALL(*atomic_mock_, load(_))
-        // ... first slot is unreferenced for the first iteration in FindOldestUnusedSlot()
-        .WillOnce([] {
-            EventSlotStatus invalid_event_slot_status{};
-            return static_cast<EventSlotStatus::value_type>(invalid_event_slot_status);
-        })
-        // ... first slot was set to in-writing by a different party at the last possible time right before we check in
-        // AllocateNextSlot()
-        .WillOnce([] {
-            EventSlotStatus event_slot_status_in_writing{};
-            event_slot_status_in_writing.SetReferenceCount(kSlotIsInWriting);
-            return static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing);
-        })
-        // ... first slot keeps in-writing status during next iteration in FindOldestUnusedSlot() and therefore won't be
-        // chosen
-        .WillOnce([] {
-            EventSlotStatus event_slot_status_in_writing{};
-            event_slot_status_in_writing.SetReferenceCount(kSlotIsInWriting);
-            return static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing);
-        })
-        // ... second slot is always unreferenced in all future calls and is therefore chosen
-        .WillRepeatedly([] {
-            EventSlotStatus invalid_event_slot_status{};
-            return static_cast<EventSlotStatus::value_type>(invalid_event_slot_status);
-        });
-
-    // When allocating a slot
-    const auto slot = unit_mock_->AllocateNextSlot();
-
-    EXPECT_TRUE(slot.IsValid());
-    // The expected (second) slot is returned
-    EXPECT_EQ(slot.GetIndex(), 1);
-}
-
-TEST_F(EventDataControlFixture, CanAllocateMultipleSlotWithoutContention)
-{
-    // Given an initialized EventDataControl structure where already a slot is allocated
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-    unit_->AllocateNextSlot();
-
-    // When allocating a slot
-    const auto slot = unit_->AllocateNextSlot();
-
-    // Then the second possible slot is returned
-    EXPECT_EQ(slot.GetIndex(), 1);
-}
-
-TEST_F(EventDataControlFixture, DiscardedElementOnWritingWillBeInvalid)
-{
-    // Given an initialized EventDataControl structure where already a slot is allocated
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-    auto slot = unit_->AllocateNextSlot();
-
-    // When discarding that 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());
-    // or via raw-pointer
-    EXPECT_TRUE(EventSlotStatus(slot.GetSlot().load()).IsInvalid());
-}
-
-TEST_F(EventDataControlFixture, DiscardedElementAfterWritingIsNotTouched)
-{
-    // Given an initialized EventDataControl structure where already a slot is written
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-    const auto slot = unit_->AllocateNextSlot();
-    unit_->EventReady(slot, 0x42);
-
-    // When discarding that slot
-    unit_->Discard(slot);
-
-    // Then the slot is not touched
-    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
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-    for (auto counter = 0; counter < 5; ++counter)
-    {
-        unit_->AllocateNextSlot();
-    }
-
-    // When trying to allocate another slot
-    const auto slot = unit_->AllocateNextSlot();
-
-    // Then this is not possible
-    EXPECT_FALSE(slot.IsValid());
-}
-
-TEST_F(EventDataControlFixture, CanAllocateSlotAfterOneSlotReady)
-{
-    // Given an initialized EventDataControl structure where all slots are allocated
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-    std::array<ControlSlotIndicator, 5U> slot_indicators{};
-    for (auto counter = 0U; counter < 5U; ++counter)
-    {
-        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();
-
-    // Then the freed slot is allocated
-    EXPECT_EQ(slot.GetIndex(), 3);
-}
-
-TEST_F(EventDataControlFixture, CanAllocateOldestSlotAfterOneSlotReady)
-{
-    // Given an initialized EventDataControl structure where all slots are allocated
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-    std::array<ControlSlotIndicator, 5U> slot_indicators{};
-    for (auto counter = 0U; counter < 5U; ++counter)
-    {
-        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();
-
-    // Then the oldest (lowest timestamp) slot is allocated
-    EXPECT_EQ(slot.GetIndex(), 2);
-}
-
-// Initially we had a 'randomized allocate or free logic'.
-// But because of our excessive retry-logic (Ticket-188373) in case of slot exhaustion,
-// this lead to huge test runtimes/timeouts.
-// So we now favor an alternating allocate/free approach, which avoids this issue
-TEST_F(EventDataControlFixture, MultithreadedSlotAllocationDeallocation)
-{
-    // Given an empty EventDataControl
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-
-    std::atomic<EventSlotStatus::EventTimeStamp> time_stamp{1};
-    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};
-        for (int i = 0; i < 1000; i++)
-        {
-            if ((allocate = !allocate))
-            {
-                const auto slot = unit_->AllocateNextSlot();
-                if (slot.IsValid())
-                {
-                    allocated_events.push_back(slot);
-                }
-            }
-            else
-            {
-                if (!allocated_events.empty())
-                {
-                    const auto index = RandomNumberBetween(0, allocated_events.size() - 1);
-                    unit_->EventReady(allocated_events[index], ++time_stamp);
-                }
-            }
-        }
-    };
-
-    // When accessing it randomly from multiple threads
-    std::vector<std::thread> thread_pool{};
-    for (int i = 0; i < 10; i++)
-    {
-        thread_pool.emplace_back(fuzzer);
-    }
-
-    for (auto& thread : thread_pool)
-    {
-        thread.join();
-    }
-
-    // Then no race-condition or memory corruption occurs
-}
-
-TEST_F(EventDataControlFixture, RegisterProxyElementReturnsValidTransactionLogIndex)
-{
-    // Given a EventDataControlUnit
-    GivenARealEventDataControl(1, kMaxSubscribers);
-
-    // When registering the proxy with the TransactionLogSet
-    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());
-    EXPECT_EQ(transaction_log_index_result.value(), 0);
-}
-
-TEST_F(EventDataControlFixture, FindNextSlotBlocksAllocation)
-{
-    // Given a EventDataControlUnit with one ready slot
-    GivenARealEventDataControl(1, kMaxSubscribers).WithAnAllocatedSlot(1);
-
-    const auto transaction_log_index =
-        unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
-
-    // When finding the next slot
-    auto event = unit_->ReferenceNextEvent(0, transaction_log_index);
-    ASSERT_TRUE(event.IsValid());
-
-    // Then we cannot allocate the slot again
-    ASSERT_FALSE(unit_->AllocateNextSlot().IsValid());
-}
-
-// Re-enable when the test is fixed in Ticket-128552
-TEST_F(EventDataControlFixture, DISABLED_MultipleReceiverRefCountCheck)
-{
-    const std::size_t max_subscribers{10U};
-
-    // Given an EventDataControl with one ready slot
-    GivenARealEventDataControl(1, kMaxSubscribers).WithAnAllocatedSlot(1);
-
-    auto receiver_tester = [this]() {
-        const auto transaction_log_index =
-            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::TIMESTAMP_MAX);
-            ASSERT_TRUE(receive_slot.IsValid());
-            EXPECT_EQ((*unit_)[receive_slot.GetIndex()].GetTimeStamp(), 1);
-
-            // and decrease the ref-count
-            unit_->DereferenceEvent(receive_slot, transaction_log_index);
-        }
-    };
-
-    // When accessing it from multiple readers as the same time
-    std::vector<std::thread> receiver_threads{};
-    for (std::size_t counter = 0; counter < max_subscribers; ++counter)
-    {
-        receiver_threads.emplace_back(receiver_tester);
-    }
-    for (auto& thread : receiver_threads)
-    {
-        thread.join();
-    }
-
-    // Then the reference count is zero and we can overwrite the slot if no memory corruption or race occurred
-    ASSERT_TRUE(unit_->AllocateNextSlot().IsValid());
-}
-
-TEST_F(EventDataControlFixture, FailingToUpdateSlotValueCausesReferenceNextEventToReturnNull)
-{
-    using namespace score::memory::shared;
-
-    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));
-
-    // and a EventDataControlUnit with one ready slot
-    auto slot = unit_mock_->AllocateNextSlot();
-    unit_mock_->EventReady(slot, 1);
-
-    const auto transaction_log_index =
-        unit_mock_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
-
-    // When finding the next slot
-    auto event = unit_mock_->ReferenceNextEvent(0, transaction_log_index);
-
-    // No event will be found
-    ASSERT_FALSE(event.IsValid());
-}
-
-TEST_F(EventDataControlFixture, GetNumNewEvents_Zero)
-{
-    // Given an EventDataControl with one ready slot
-    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);
-}
-
-TEST_F(EventDataControlFixture, GetNumNewEvents_One)
-{
-    // Given an EventDataControl with one ready slot
-    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);
-}
-
-TEST_F(EventDataControlFixture, GetNumNewEvents_Many)
-{
-    // Given an EventDataControl with 6 ready slots
-    GivenARealEventDataControl(6, kMaxSubscribers);
-    for (unsigned int i = 1; i <= 6; 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);
-}
-
-using EventDataControlReferenceSpecificEventFixture = EventDataControlFixture;
-
-TEST_F(EventDataControlReferenceSpecificEventFixture, ReferenceSpecificEvents)
-{
-    const std::size_t max_number_slots{6U};
-    const std::size_t subscription_slots{6U};
-
-    // Given an EventDataControl with 6 ready slots
-    GivenARealEventDataControl(max_number_slots, kMaxSubscribers);
-    for (unsigned int i = 0; i < 6; i++)
-    {
-        WithAnAllocatedSlot(i + 1);
-    }
-
-    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);
-    }
-}
-
-using EventDataControlReferenceSpecificEventDeathTest = EventDataControlReferenceSpecificEventFixture;
-TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInvalidTerminates)
-{
-    // Given an EventDataControl with one (initially invalid) slot
-    GivenARealEventDataControl(1, kMaxSubscribers);
-    EXPECT_TRUE((*unit_)[0].IsInvalid());
-
-    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), ".*");
-}
-
-TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInWritingTerminates)
-{
-    // Given an EventDataControl with one in_writing slot
-    GivenARealEventDataControl(1, kMaxSubscribers);
-    auto slot = unit_->AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInWriting());
-
-    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), ".*");
-}
-
-TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_ReferenceCountOverFlowsTerminates)
-{
-    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(_, _))
-        .WillByDefault(Return(static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing)));
-
-    // and given one slot has been allocated
-    auto slot = unit_mock_->AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-
-    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_mock_->ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
-}
-
-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
-    GivenARealEventDataControl(kMaxSlots, kMaxSubscribers);
-    const auto first_slot = unit_->AllocateNextSlot();
-    const auto second_slot = unit_->AllocateNextSlot();
-
-    // When cleaning up allocations
-    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());
-}
-
-using EventDataControlDeathTest = EventDataControlFixture;
-TEST_F(EventDataControlDeathTest, FailingToCleanUpSlotDueToOtherThreadModifyingAtomicTerminates)
-{
-    GivenAMockedEventDataControl(kMaxSlots, kMaxSubscribers);
-
-    // 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(_))
-        .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));
-
-    // When cleaning up allocations
-    // Then the program terminates
-    EXPECT_DEATH(unit_mock_->RemoveAllocationsForWriting(), ".*");
-}
-
-struct MultiSenderMultiReceiverParams
-{
-    SlotIndexType num_slots;
-    LolaEventInstanceDeployment::SubscriberCountType num_receiver_threads;
-    std::size_t num_actions_per_sender;
-    std::size_t num_actions_per_receiver;
-    std::size_t max_referenced_samples_per_receiver;
-};
-
-class MultiSenderMultiReceiverTest : public ::testing::TestWithParam<MultiSenderMultiReceiverParams>
-{
-  public:
-    MultiSenderMultiReceiverTest()
-    {
-        EventDataControl::ResetPerformanceCounters();
-    }
-    ~MultiSenderMultiReceiverTest() override
-    {
-        EventDataControl::DumpPerformanceCounters();
-    }
-
-  protected:
-    // Protected by lock_
-    std::mutex lock_{};
-    EventSlotStatus::EventTimeStamp next_ts_{1};
-    std::set<SlotIndexType> allocated_slots_{};
-
-    // Unprotected
-    FakeMemoryResource memory_{};
-    EventDataControl unit_{GetParam().num_slots, memory_, GetParam().num_receiver_threads};
-};
-
-TEST_P(MultiSenderMultiReceiverTest, MultiSenderMultiReceiver)
-{
-    // this test case access the data structure in parallel by multiple threads one from read and one thread from writer
-    // side, this way we can ensure that _no_ data races occur
-
-    auto sender = [this]() {
-        // Randomly allocate or mark slot as ready
-        const auto& params = GetParam();
-        EventSlotStatus::EventTimeStamp ts{1};
-        for (std::size_t counter = 0; counter < params.num_actions_per_sender; ++counter)
-        {
-            auto slot = unit_.AllocateNextSlot();
-            ASSERT_TRUE(slot.IsValid());
-
-            unit_.EventReady(slot, ++ts);
-        }
-    };
-
-    auto receiver = [this]() {
-        // randomly increases or decreases ref-count
-        const auto& params = GetParam();
-
-        std::vector<ControlSlotIndicator> used_slots{};
-        EventSlotStatus::EventTimeStamp start_ts{1};
-
-        TransactionLogSet::TransactionLogIndex transaction_log_index =
-            unit_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
-
-        for (std::size_t counter = 0; counter < params.num_actions_per_receiver; ++counter)
-        {
-            if (used_slots.size() < params.max_referenced_samples_per_receiver && RandomTrueOrFalse())
-            {
-                auto slot = unit_.ReferenceNextEvent(start_ts, transaction_log_index);
-                if (slot.IsValid())
-                {
-                    start_ts = EventSlotStatus{unit_[slot.GetIndex()]}.GetTimeStamp();
-                    used_slots.push_back(slot);
-                }
-            }
-            else
-            {
-                if (!used_slots.empty())
-                {
-                    auto index = RandomNumberBetween(0, used_slots.size() - 1);
-                    auto iter = used_slots.begin();
-                    std::advance(iter, index);
-                    auto event_slot = *iter;
-                    used_slots.erase(iter);
-                    unit_.DereferenceEvent(event_slot, transaction_log_index);
-                }
-            }
-        }
-    };
-
-    auto sender_thread = std::thread{sender};
-
-    const auto& params = GetParam();
-    std::vector<std::thread> thread_pool{};
-    for (auto counter = 0U; counter < params.num_receiver_threads; counter++)
-    {
-        thread_pool.emplace_back(receiver);
-    }
-
-    sender_thread.join();
-    for (auto& thread : thread_pool)
-    {
-        thread.join();
-    }
-}
-
-// Re-enable when the test is fixed in Ticket-128552
-TEST_P(MultiSenderMultiReceiverTest, DISABLED_MultiSenderMultiReceiverMaxReceiverContention)
-{
-    // this test case increases the contention between reader and writer, by ensuring that the reader will hold his max.
-    // possible sample before freeing one.
-    std::atomic<bool> stop_sender{false};
-
-    auto sender = [this, &stop_sender]() {
-        // Randomly allocate or mark slot as ready
-        EventSlotStatus::EventTimeStamp ts{1};
-        while (!stop_sender)
-        {
-            auto slot = unit_.AllocateNextSlot();
-            ASSERT_NE(ts, std::numeric_limits<std::uint32_t>::max());
-            if (!slot.IsValid())
-            {
-                EventDataControl::DumpPerformanceCounters();
-                std::terminate();
-            }
-            else
-            {
-                unit_.EventReady(slot, ++ts);
-            }
-            EXPECT_TRUE(slot.IsValid());
-        }
-    };
-
-    auto receiver = [this]() {
-        // randomly increases or decreases ref-count
-        const auto& params = GetParam();
-
-        std::vector<ControlSlotIndicator> used_slots{};
-        EventSlotStatus::EventTimeStamp start_ts{0};
-
-        TransactionLogSet::TransactionLogIndex transaction_log_index =
-            unit_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
-
-        for (std::size_t counter = 0; counter < params.num_actions_per_receiver; ++counter)
-        {
-            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 &&
-                   used_slots.size() < params.max_referenced_samples_per_receiver)
-            {
-                auto slot = unit_.ReferenceNextEvent(start_ts, transaction_log_index, highest_ts);
-                if (slot.IsValid())
-                {
-                    highest_ts = EventSlotStatus{unit_[slot.GetIndex()]}.GetTimeStamp();
-                    used_slots.push_back(slot);
-                    slot_last = slot.GetIndex();
-                }
-                counter1++;
-            }
-
-            if (slot_last.has_value())
-            {
-                start_ts = EventSlotStatus{unit_[slot_last.value()]}.GetTimeStamp();
-            }
-
-            if (used_slots.size() == params.max_referenced_samples_per_receiver)
-            {
-
-                auto index = RandomNumberBetween(0, used_slots.size() - 1);
-                auto iter = used_slots.begin();
-                std::advance(iter, index);
-                auto event_slot = *iter;
-                used_slots.erase(iter);
-                unit_.DereferenceEvent(event_slot, transaction_log_index);
-            }
-        }
-    };
-
-    auto sender_thread = std::thread{sender};
-
-    const auto& params = GetParam();
-    std::vector<std::thread> thread_pool{};
-    for (auto counter = 0U; counter < params.num_receiver_threads; counter++)
-    {
-        thread_pool.emplace_back(receiver);
-    }
-
-    for (auto& thread : thread_pool)
-    {
-        thread.join();
-    }
-    stop_sender = true;
-    sender_thread.join();
-}
-
-INSTANTIATE_TEST_SUITE_P(MultiSenderMultiReceiverRealisticCases,
-                         MultiSenderMultiReceiverTest,
-                         ::testing::Values(
-                             // Values:
-                             // num_slots, num_receiver_threads, num_actions_per_sender, num_actions_per_receiver,
-                             // max_referenced_samples_per_receiver
-                             MultiSenderMultiReceiverParams{21, 5, 100, 5, 4}
-                             //                            MultiSenderMultiReceiverParams{2001, 500, 100, 100, 4},
-                             //                            MultiSenderMultiReceiverParams{121, 30, 100, 1000, 4}
-                             ));
-
 }  // namespace
 }  // namespace score::mw::com::impl::lola
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 346f15d10..49d454eda 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
@@ -32,7 +32,7 @@ void EventDataControlCompositeAttorney::PrepareAllocateNextSlot(
     // we want, that event_data_control_composite_ returns slot_index from call to AllocateNextSlot().
     // To achieve this, we set the reference-count of all slots but slot_index to a value > 0.
     EventSlotStatus::EventTimeStamp timestamp{1};
-    const auto number_states_slots = event_data_control_composite_.asil_qm_control_->state_slots_.size();
+    const auto number_states_slots = event_data_control_composite_.asil_qm_control_local_->state_slots_.size();
     for (std::size_t index{0}; index < number_states_slots; index++)
     {
         EventSlotStatus status{};
@@ -46,11 +46,11 @@ void EventDataControlCompositeAttorney::PrepareAllocateNextSlot(
         {
             status.SetReferenceCount(1U);
         }
-        event_data_control_composite_.asil_qm_control_->state_slots_[index].store(
+        event_data_control_composite_.asil_qm_control_local_->state_slots_[index].store(
             static_cast<EventSlotStatus::value_type>(status));
-        if (event_data_control_composite_.asil_b_control_ != nullptr)
+        if (event_data_control_composite_.asil_b_control_local_ != nullptr)
         {
-            event_data_control_composite_.asil_b_control_->state_slots_[index].store(
+            event_data_control_composite_.asil_b_control_local_->state_slots_[index].store(
                 static_cast<EventSlotStatus::value_type>(status));
         }
     }
@@ -64,10 +64,10 @@ void EventDataControlCompositeAttorney::SetQmControlDisconnected(const bool expe
 std::pair<EventSlotStatus, score::cpp::optional<EventSlotStatus>> EventDataControlCompositeAttorney::GetSlotStatus(
     const SlotIndexType slot_index) const noexcept
 {
-    return {EventSlotStatus(event_data_control_composite_.asil_qm_control_->state_slots_[slot_index]),
-            event_data_control_composite_.asil_b_control_ != nullptr
+    return {EventSlotStatus(event_data_control_composite_.asil_qm_control_local_->state_slots_[slot_index]),
+            event_data_control_composite_.asil_b_control_local_ != nullptr
                 ? score::cpp::optional<EventSlotStatus>(
-                      event_data_control_composite_.asil_b_control_->state_slots_[slot_index])
+                      event_data_control_composite_.asil_b_control_local_->state_slots_[slot_index])
                 : score::cpp::optional<EventSlotStatus>{}};
 }
 
diff --git a/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp b/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp
index d2114eedd..03cbe4f9e 100644
--- a/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp
+++ b/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp
@@ -80,7 +80,7 @@ Result<score::mw::com::impl::SampleAllocateePtr<void>> GenericSkeletonEvent::All
     }
     const auto slot = control_.value().AllocateNextSlot();
 
-    if (!qm_disconnect_ && control_->GetAsilBEventDataControl().has_value() && !slot.IsValidQM())
+    if (!qm_disconnect_ && (control_->GetAsilBEventDataControlLocal() != nullptr) && !slot.IsValidQM())
     {
         qm_disconnect_ = true;
         score::mw::log::LogWarn("lola")
diff --git a/score/mw/com/impl/bindings/lola/generic_skeleton_event.h b/score/mw/com/impl/bindings/lola/generic_skeleton_event.h
index 6765d93a6..b42320f87 100644
--- a/score/mw/com/impl/bindings/lola/generic_skeleton_event.h
+++ b/score/mw/com/impl/bindings/lola/generic_skeleton_event.h
@@ -21,6 +21,8 @@
 #include "score/mw/com/impl/data_type_meta_info.h"
 #include "score/mw/com/impl/generic_skeleton_event_binding.h"
 
+#include <optional>
+
 namespace score::mw::com::impl::lola
 {
 
diff --git a/score/mw/com/impl/bindings/lola/methods/method_resource_map.h b/score/mw/com/impl/bindings/lola/methods/method_resource_map.h
index b915240cf..c8f9f1bc3 100644
--- a/score/mw/com/impl/bindings/lola/methods/method_resource_map.h
+++ b/score/mw/com/impl/bindings/lola/methods/method_resource_map.h
@@ -39,7 +39,7 @@ namespace score::mw::com::impl::lola
 /// created in the same region).
 ///
 /// A detailed explanation of the how we handle partial restart in the context of methods and why this map is needed is
-/// in `platform/aas/docs/features/ipc/lola/method/README.md` (Specifically in the section about "Cleaning up old
+/// in `score/docs/features/ipc/lola/method/README.md` (Specifically in the section about "Cleaning up old
 /// method shared memory resources").
 class MethodResourceMap
 {
diff --git a/score/mw/com/impl/bindings/lola/proxy.cpp b/score/mw/com/impl/bindings/lola/proxy.cpp
index 2d65b4b38..86b32ce8f 100644
--- a/score/mw/com/impl/bindings/lola/proxy.cpp
+++ b/score/mw/com/impl/bindings/lola/proxy.cpp
@@ -19,6 +19,7 @@
 #include "score/mw/com/impl/bindings/lola/methods/offered_state_machine.h"
 #include "score/mw/com/impl/bindings/lola/partial_restart_path_builder.h"
 #include "score/mw/com/impl/bindings/lola/proxy_instance_identifier.h"
+#include "score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/service_data_control.h"
 #include "score/mw/com/impl/bindings/lola/service_data_storage.h"
 #include "score/mw/com/impl/bindings/lola/shm_path_builder.h"
@@ -38,6 +39,7 @@
 #include "score/mw/com/impl/runtime.h"
 #include "score/mw/com/impl/service_element_type.h"
 
+#include "score/filesystem/factory/filesystem_factory.h"
 #include "score/language/safecpp/safe_atomics/try_atomic_add.h"
 #include "score/memory/data_type_size_info.h"
 #include "score/memory/shared/flock/flock_mutex_and_lock.h"
@@ -186,7 +188,8 @@ OpenSharedMemory(const LolaServiceInstanceDeployment& instance_deployment,
     return std::make_pair(control, data);
 }
 
-ServiceDataControl& GetServiceDataControlProxySide(const memory::shared::ManagedMemoryResource& control) noexcept
+ProxyServiceDataControlLocalView GetProxyServiceDataControlLocalView(
+    const memory::shared::ManagedMemoryResource& control) noexcept
 {
     // Suppress "AUTOSAR C++14 M5-2-8" rule. The rule declares:
     // An object with integer type or pointer to void type shall not be converted to an object with pointer type.
@@ -195,7 +198,7 @@ ServiceDataControl& GetServiceDataControlProxySide(const memory::shared::Managed
     auto* const service_data_control = static_cast<ServiceDataControl*>(control.getUsableBaseAddress());
     SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(service_data_control != nullptr,
                                                 "Could not retrieve service data control.");
-    return *service_data_control;
+    return ProxyServiceDataControlLocalView{*service_data_control};
 }
 
 // Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
@@ -216,8 +219,8 @@ score::ResultBlank ExecutePartialRestartLogic(const QualityType quality_type,
     // The transaction log is identified by the application's unique identifier, which is either the configured
     // 'applicationID' or the process UID as a fallback.
     const TransactionLogId transaction_log_id{static_cast<TransactionLogId>(lola_runtime.GetApplicationId())};
-    auto& service_data_control = GetServiceDataControlProxySide(control);
-    TransactionLogRollbackExecutor transaction_log_rollback_executor{service_data_control,
+    auto service_data_control_local = GetProxyServiceDataControlLocalView(control);
+    TransactionLogRollbackExecutor transaction_log_rollback_executor{service_data_control_local,
                                                                      skeleton_instance_identifier,
                                                                      quality_type,
                                                                      service_data_storage.skeleton_pid_,
@@ -403,6 +406,7 @@ Proxy::Proxy(std::shared_ptr<memory::shared::ManagedMemoryResource> control,
       control_{std::move(control)},
       data_{std::move(data)},
       method_shm_resource_{nullptr},
+      service_data_control_local_{GetProxyServiceDataControlLocalView(*control_)},
       quality_type_{quality_type},
       event_name_to_element_fq_id_converter_{std::move(event_name_to_element_fq_id_converter)},
       handle_{std::move(handle)},
@@ -515,13 +519,12 @@ void Proxy::ServiceAvailabilityChangeHandler(const bool is_service_available)
 // value is not comparable and in our case the key is comparable. so no way for 'event_controls_.find()' to throw an
 // exception.
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-EventControl& Proxy::GetEventControl(const ElementFqId element_fq_id) noexcept
+ProxyEventControlLocalView& Proxy::GetEventControlLocal(const ElementFqId element_fq_id) noexcept
 {
     SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(control_ != nullptr,
                                                       "Proxy::GetEventControl: Managed memory control pointer is Null");
-    auto& service_data_control = GetServiceDataControlProxySide(*control_);
-    const auto event_entry = service_data_control.event_controls_.find(element_fq_id);
-    if (event_entry == service_data_control.event_controls_.end())
+    const auto event_entry = service_data_control_local_.event_controls_.find(element_fq_id);
+    if (event_entry == service_data_control_local_.event_controls_.end())
     {
         score::mw::log::LogFatal("lola") << __func__ << __LINE__
                                          << "Unable to find control channel for given event instance. Terminating.";
@@ -577,10 +580,9 @@ bool Proxy::IsEventProvided(const std::string_view event_name) const noexcept
 {
     SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(control_ != nullptr,
                                                       "IsEventProvided: Managed memory control pointer is Null");
-    auto& service_data_control = GetServiceDataControlProxySide(*control_);
     const auto element_fq_id = event_name_to_element_fq_id_converter_.Convert(event_name);
-    const auto event_entry = service_data_control.event_controls_.find(element_fq_id);
-    const bool event_exists = (event_entry != service_data_control.event_controls_.end());
+    const auto event_entry = service_data_control_local_.event_controls_.find(element_fq_id);
+    const bool event_exists = (event_entry != service_data_control_local_.event_controls_.end());
     return event_exists;
 }
 
diff --git a/score/mw/com/impl/bindings/lola/proxy.h b/score/mw/com/impl/bindings/lola/proxy.h
index 0bf47f308..5d29856c3 100644
--- a/score/mw/com/impl/bindings/lola/proxy.h
+++ b/score/mw/com/impl/bindings/lola/proxy.h
@@ -22,6 +22,7 @@
 #include "score/mw/com/impl/bindings/lola/methods/type_erased_call_queue.h"
 #include "score/mw/com/impl/bindings/lola/proxy_instance_identifier.h"
 #include "score/mw/com/impl/bindings/lola/proxy_method.h"
+#include "score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/service_data_storage.h"
 #include "score/mw/com/impl/configuration/lola_method_id.h"
 #include "score/mw/com/impl/configuration/lola_service_instance_id.h"
@@ -133,7 +134,7 @@ class Proxy : public ProxyBinding
     ///
     /// \param element_fq_id The Event ID.
     /// \return A reference to the event control structure.
-    EventControl& GetEventControl(const ElementFqId element_fq_id) noexcept;
+    ProxyEventControlLocalView& GetEventControlLocal(const ElementFqId element_fq_id) noexcept;
 
     /// Retrieves a reference to the event data storage area for a given ElementFqId.
     ///
@@ -217,6 +218,11 @@ class Proxy : public ProxyBinding
     std::shared_ptr<memory::shared::ManagedMemoryResource> data_;
     std::shared_ptr<memory::shared::ManagedMemoryResource> method_shm_resource_;
 
+    /// \brief Local view of ServiceDataControl which is stored in shared memory.
+    ///
+    /// We use this view to avoid directly accessing objects in shared memory which negatively affects performance.
+    ProxyServiceDataControlLocalView service_data_control_local_;
+
     QualityType quality_type_;
     EventNameToElementFqIdConverter event_name_to_element_fq_id_converter_;
     HandleType handle_;
@@ -237,7 +243,7 @@ class Proxy : public ProxyBinding
 
     /// Flag which is set once the proxy methods are fully setup in Proxy::SetupMethods(). This is checked in the
     /// ServiceAvailabilityChangeHandler so that it doesn't send a notification to the Skeleton before the shared memory
-    /// has been setup. See platform/aas/docs/features/ipc/lola/method/README.md for details about the full methods
+    /// has been setup. See score/docs/features/ipc/lola/method/README.md for details about the full methods
     /// logic related to proxy autoreconnect.
     ///
     /// We use an atomic instead of a mutex because we don't care if SubscribeServiceMethod is called multiple times
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_common.cpp b/score/mw/com/impl/bindings/lola/proxy_event_common.cpp
index 8a826c494..bfd6527b6 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_common.cpp
+++ b/score/mw/com/impl/bindings/lola/proxy_event_common.cpp
@@ -29,11 +29,11 @@ ProxyEventCommon::ProxyEventCommon(Proxy& parent, const ElementFqId element_fq_i
       // The transaction log is identified by the application's unique identifier.
       transaction_log_id_{
           static_cast<TransactionLogId>(GetBindingRuntime<lola::IRuntime>(BindingType::kLoLa).GetApplicationId())},
-      event_control_{parent_.GetEventControl(event_fq_id_)},
+      event_control_local_{parent_.GetEventControlLocal(event_fq_id_)},
       subscription_event_state_machine_{parent_.GetQualityType(),
                                         event_fq_id_,
                                         GetEventSourcePid(),
-                                        event_control_,
+                                        event_control_local_,
                                         transaction_log_id_}
 {
 }
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_common.h b/score/mw/com/impl/bindings/lola/proxy_event_common.h
index 1482eba81..cf79008fa 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_common.h
+++ b/score/mw/com/impl/bindings/lola/proxy_event_common.h
@@ -17,6 +17,7 @@
 #include "score/mw/com/impl/bindings/lola/event_control.h"
 #include "score/mw/com/impl/bindings/lola/event_meta_info.h"
 #include "score/mw/com/impl/bindings/lola/proxy.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/slot_collector.h"
 #include "score/mw/com/impl/bindings/lola/subscription_state_machine.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_id.h"
@@ -86,9 +87,9 @@ class ProxyEventCommon final
     {
         return event_fq_id_;
     };
-    EventControl& GetEventControl() const noexcept
+    ProxyEventControlLocalView& GetEventControl() const noexcept
     {
-        return event_control_;
+        return event_control_local_;
     };
     std::optional<std::uint16_t> GetMaxSampleCount() const noexcept;
     score::cpp::optional<TransactionLogSet::TransactionLogIndex> GetTransactionLogIndex() const noexcept;
@@ -110,7 +111,7 @@ class ProxyEventCommon final
     ElementFqId event_fq_id_;
     const std::string_view event_name_;
     TransactionLogId transaction_log_id_;
-    EventControl& event_control_;
+    ProxyEventControlLocalView& event_control_local_;
     SubscriptionStateMachine subscription_event_state_machine_;
 };
 
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_control_local_view.cpp b/score/mw/com/impl/bindings/lola/proxy_event_control_local_view.cpp
new file mode 100644
index 000000000..272af75e5
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_event_control_local_view.cpp
@@ -0,0 +1,24 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/proxy_event_control_local_view.h"
+
+namespace score::mw::com::impl::lola
+{
+
+ProxyEventControlLocalView::ProxyEventControlLocalView(EventControl& event_control_shared_mem) noexcept
+    : data_control{event_control_shared_mem.data_control},
+      subscription_control{event_control_shared_mem.subscription_control}
+{
+}
+
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_control_local_view.h b/score/mw/com/impl/bindings/lola/proxy_event_control_local_view.h
new file mode 100644
index 000000000..4f6f5f0c4
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_event_control_local_view.h
@@ -0,0 +1,42 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#ifndef SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_CONTROL_LOCAL_VIEW_H
+#define SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_CONTROL_LOCAL_VIEW_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/proxy_event_data_control_local_view.h"
+
+#include <functional>
+
+namespace score::mw::com::impl::lola
+{
+
+class ProxyEventControlLocalView
+{
+  public:
+    using SubscriberCountType = EventSubscriptionControl::SubscriberCountType;
+    ProxyEventControlLocalView(EventControl& event_control_shared_mem) noexcept;
+
+    // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall
+    // be private.". There are no class invariants to maintain which could be violated by directly accessing member
+    // variables.
+    // coverity[autosar_cpp14_m11_0_1_violation]
+    ProxyEventDataControlLocalView<> data_control;
+    // coverity[autosar_cpp14_m11_0_1_violation]
+    std::reference_wrapper<EventSubscriptionControl> subscription_control;
+};
+
+}  // namespace score::mw::com::impl::lola
+
+#endif  // SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_CONTROL_LOCAL_VIEW_H
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp
new file mode 100644
index 000000000..d8a315524
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp
@@ -0,0 +1,268 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
+
+#include "score/mw/com/impl/bindings/lola/event_slot_status.h"
+
+#include <score/assert.hpp>
+
+#include <atomic>
+#include <iostream>
+#include <limits>
+
+namespace score::mw::com::impl::lola
+{
+
+namespace
+{
+
+constexpr auto MAX_REFERENCE_RETRIES = 100U;
+
+}  // namespace
+
+template <template <class> class AtomicIndirectorType>
+ProxyEventDataControlLocalView<AtomicIndirectorType>::ProxyEventDataControlLocalView(
+    EventDataControl& event_data_control_shared) noexcept
+    : state_slots_{event_data_control_shared.state_slots_.begin(), event_data_control_shared.state_slots_.size()},
+      transaction_log_set_{event_data_control_shared.transaction_log_set_}
+{
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'possible_index.value()' in case the possible_index doesn't
+// 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 ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceNextEvent(
+    const EventSlotStatus::EventTimeStamp last_search_time,
+    const TransactionLogSet::TransactionLogIndex transaction_log_index,
+    const EventSlotStatus::EventTimeStamp upper_limit) noexcept -> ControlSlotIndicator
+{
+    // function can only finish with result, if use count was able to be increased
+    ControlSlotIndicator possible_slot{};
+
+    auto& transaction_log = transaction_log_set_.get().GetTransactionLog(transaction_log_index);
+
+    // possible optimization: We can remember a history of possible candidates, then we don't need to fully reiterate
+    std::uint64_t counter = 0U;
+    for (; counter < MAX_REFERENCE_RETRIES; counter++)
+    {
+        // resetting possible slot for this iteration
+        possible_slot.Reset();
+
+        // initialize candidate_slot_status with last_search_time. candidate_slot_status.timestamp always reflects
+        // "highest new timestamp". The sentinel, if we did find a possible candidate is always possible_index.
+        EventSlotStatus candidate_slot_status{last_search_time, 0U};
+
+        SlotIndexType current_index = 0U;
+        // Suppres "AUTOSAR C++14 A5-3-2" finding rule. This rule states: "Null pointers shall not be dereferenced.".
+        // The "slot" variable must never be a null pointer, since DynamicArray allocates its elements when it is
+        // created.
+        // coverity[autosar_cpp14_a5_3_2_violation]
+        for (auto& slot : state_slots_)
+        {
+            // coverity[autosar_cpp14_a5_3_2_violation]
+            const EventSlotStatus slot_status{slot.load(std::memory_order_relaxed)};
+            if (slot_status.IsTimeStampBetween(candidate_slot_status.GetTimeStamp(), upper_limit))
+            {
+                possible_slot = {current_index, slot};
+                candidate_slot_status = slot_status;
+            }
+
+            // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall
+            // not lead to data loss.".
+            // On construction of state_slots_, it is already assured, that the number of slots/size can never
+            // be larger than a SlotIndexType, so no way an overflow can happen.
+            // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
+            ++current_index;
+        }
+
+        if (!possible_slot.IsValid())
+        {
+            return {};  // no sample within searched timestamp range exists.
+        }
+
+        std::size_t status_new_val{candidate_slot_status};
+
+        // An assertion to make sure that status_new_val will never overflow after assigning candidate_slot_status
+        // value.
+        static_assert(std::is_same_v<decltype(candidate_slot_status)::value_type, decltype(status_new_val)>,
+                      "ReferenceNextEvent: status_new_val overflow dangerous.");
+        // As status_new_val increment will take place and in case status_new_val has the maximum limit, an error
+        // message logged and terminate to avoid status_new_val overflow.
+        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
+            status_new_val != std::numeric_limits<std::size_t>::max(),
+            "EventDataControl::ReferenceNextEvent failed: status_new_val reached the maximum "
+            "value, an overflow dangerous");
+        // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall
+        // not lead to data loss.".
+        // No way for an overflow as long as both variables have same data type, and status_new_val doesn't reach the
+        // maximum value.
+        // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
+        ++status_new_val;
+
+        auto& candidate_slot_status_value = static_cast<EventSlotStatus::value_type&>(candidate_slot_status);
+
+        auto possible_index_value = possible_slot.GetIndex();
+        auto& slot_value = possible_slot.GetSlot();
+
+        transaction_log.ReferenceTransactionBegin(possible_index_value);
+        if (AtomicIndirectorType<EventSlotStatus::value_type>::compare_exchange_weak(
+                slot_value, candidate_slot_status_value, status_new_val, std::memory_order_acq_rel))
+        {
+            transaction_log.ReferenceTransactionCommit(possible_index_value);
+            break;
+        }
+        transaction_log.ReferenceTransactionAbort(possible_index_value);
+    }
+
+    num_ref_retries += counter;
+
+    if (counter < MAX_REFERENCE_RETRIES)
+    {
+        return possible_slot;
+    }
+
+    ++num_ref_misses;
+
+    // if this happens it means we have a wrong configuration in the system, see doc-string
+    return {};
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
+// 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 ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceSpecificEvent(
+    const SlotIndexType slot_index,
+    const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept -> void
+{
+    // Sanity check that the slot is currently ready for reading. It's up to the caller to ensure that this function is
+    // not called in a context in which the status can change to in writing or invalid while this function is running.
+    const auto slot_current_status =
+        static_cast<EventSlotStatus>(state_slots_[slot_index].load(std::memory_order_relaxed));
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(
+        !(slot_current_status.IsInWriting() || slot_current_status.IsInvalid()),
+        "An event slot can only be referenced once it's ready for reading.");
+
+    auto& transaction_log = transaction_log_set_.get().GetTransactionLog(transaction_log_index);
+
+    // Since this function must be called when the slot is already ready for reading, we can simply increment the ref
+    // count.
+    transaction_log.ReferenceTransactionBegin(slot_index);
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
+    const auto old_slot_value = AtomicIndirectorType<EventSlotStatus::value_type>::fetch_add(
+        state_slots_[slot_index], static_cast<EventSlotStatus::value_type>(1U), std::memory_order_acq_rel);
+
+    // If the slot value overflows then the value is completely invalid which is an unrecoverable error. If we try to
+    // restart the provider, then it should contain an uncommitted reference transaction which will cause the restart to
+    // fail.
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(EventSlotStatus{old_slot_value}.GetReferenceCount() !=
+                                                          std::numeric_limits<EventSlotStatus::SubscriberCount>::max(),
+                                                      "Reference count overflowed which cannot be recovered from.");
+    transaction_log.ReferenceTransactionCommit(slot_index);
+}
+
+template <template <class> class AtomicIndirectorType>
+// 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, no way for throwing std::terminate().
+// coverity[autosar_cpp14_a15_5_3_violation : FALSE]
+std::size_t ProxyEventDataControlLocalView<AtomicIndirectorType>::GetNumNewEvents(
+    const EventSlotStatus::EventTimeStamp reference_time) const noexcept
+{
+    std::size_t result{0U};
+    // Suppres "AUTOSAR C++14 A5-3-2" finding rule. This rule states: "Null pointers shall not be dereferenced.".
+    // The "slot" variable must never be a null pointer, since DynamicArray allocates its elements when it is created.
+    // coverity[autosar_cpp14_a5_3_2_violation]
+    for (const auto& slot : state_slots_)
+    {
+        // coverity[autosar_cpp14_a5_3_2_violation]
+        const EventSlotStatus slot_status{slot.load(std::memory_order_relaxed)};
+        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
+            // an overflow here.
+            // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
+            result++;
+        }
+    }
+    return result;
+}
+
+template <template <class> class AtomicIndirectorType>
+auto ProxyEventDataControlLocalView<AtomicIndirectorType>::DereferenceEvent(
+    ControlSlotIndicator slot_indicator,
+    const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept -> void
+{
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
+    auto& transaction_log = transaction_log_set_.get().GetTransactionLog(transaction_log_index);
+    transaction_log.DereferenceTransactionBegin(slot_indicator.GetIndex());
+    score::cpp::ignore = slot_indicator.GetSlot().fetch_sub(1U, std::memory_order_acq_rel);
+    transaction_log.DereferenceTransactionCommit(slot_indicator.GetIndex());
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
+// 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]
+void ProxyEventDataControlLocalView<AtomicIndirectorType>::DereferenceEventWithoutTransactionLogging(
+    const SlotIndexType event_slot_index) noexcept
+{
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(event_slot_index) < state_slots_.size());
+    score::cpp::ignore = state_slots_[event_slot_index].fetch_sub(1U, std::memory_order_acq_rel);
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
+// 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 ProxyEventDataControlLocalView<AtomicIndirectorType>::operator[](const SlotIndexType slot_index) const noexcept
+    -> EventSlotStatus
+{
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
+    return static_cast<EventSlotStatus>(state_slots_[slot_index].load(std::memory_order_acquire));
+}
+
+template <template <class> class AtomicIndirectorType>
+auto ProxyEventDataControlLocalView<AtomicIndirectorType>::DumpPerformanceCounters() -> void
+{
+    std::cout << "EventDataControlImpl performance breakdown\n"
+              << "======================================\n"
+              << "\nnum_ref_misses     " << num_ref_misses << "\nnum_ref_retries:   "
+              << num_ref_retries
+              // Suppress AUTOSAR C++14 M8-4-4, rule finding: "A function identifier shall either be used to call the
+              // function or it shall be preceded by &". Passing std::endl to std::cout object with the stream operator
+              // follows the idiomatic way that both features in conjunction were designed in the C++ standard.
+              // coverity[autosar_cpp14_m8_4_4_violation : FALSE]
+              << std::endl;
+}
+
+template <template <class> class AtomicIndirectorType>
+auto ProxyEventDataControlLocalView<AtomicIndirectorType>::ResetPerformanceCounters() -> void
+{
+    num_ref_misses.store(0U);
+    num_ref_retries.store(0U);
+}
+
+template class ProxyEventDataControlLocalView<memory::shared::AtomicIndirectorReal>;
+template class ProxyEventDataControlLocalView<memory::shared::AtomicIndirectorMock>;
+
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h
new file mode 100644
index 000000000..728aa2b56
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h
@@ -0,0 +1,180 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_DATA_CONTROL_LOCAL_VIEW_H
+#define SCORE_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_DATA_CONTROL_LOCAL_VIEW_H
+
+#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
+#include "score/mw/com/impl/bindings/lola/control_slot_types.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/transaction_log_set.h"
+
+#include "score/memory/shared/atomic_indirector.h"
+
+#include <score/span.hpp>
+
+#include <atomic>
+#include <cstddef>
+
+namespace score::mw::com::impl::lola
+{
+// 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]
+class EventDataControlAttorney;
+// 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]
+class EventDataControlCompositeAttorney;
+
+// 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;
+
+/// \brief View class which provides functionality for interacting with EventDataControl.
+///
+/// \details EventDataControl contains control information for an event which is stored in shared memory. Accessing the
+/// control information directly in shared memory during runtime requires using (dereferencing, copying etc.) OffsetPtrs
+/// which can negatively affect performance. Therefore, the data in EventDataControl is created / opened once during
+/// Skeleton / Proxy creation, and then is accessed during runtime via EventDataControlLocal.
+template <template <class> class AtomicIndirectorType = memory::shared::AtomicIndirectorReal>
+class ProxyEventDataControlLocalView final
+{
+    // Suppress "AUTOSAR C++14 A11-3-1", The rule declares: "Friend declarations shall not be used".
+    // The "EventDataControlAttorney" class is a helper, which sets the internal state of
+    // "EventDataControlImpl" accessing private members and used for testing purposes only.
+    // coverity[autosar_cpp14_a11_3_1_violation]
+    friend class lola::EventDataControlAttorney;
+    // 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
+    // "EventDataControlImpl" accessing private members and used for testing purposes only.
+    // 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 EventDataControlCompositeImpl;
+
+  public:
+    using LocalEventControlSlots = score::cpp::span<ControlSlotType>;
+
+    ProxyEventDataControlLocalView(EventDataControl& event_data_control_shared) noexcept;
+
+    ~ProxyEventDataControlLocalView() noexcept = default;
+
+    ProxyEventDataControlLocalView(const ProxyEventDataControlLocalView&) = delete;
+    ProxyEventDataControlLocalView& operator=(const ProxyEventDataControlLocalView&) = delete;
+    ProxyEventDataControlLocalView(ProxyEventDataControlLocalView&&) noexcept = delete;
+    ProxyEventDataControlLocalView& operator=(ProxyEventDataControlLocalView&& other) noexcept = delete;
+
+    /// \brief Will search for the next slot that shall be read, after the last time and mark it for reading
+    /// \param last_search_time The time stamp the last time a search for an event was performed
+    ///
+    /// \details This method will perform retries (bounded) on data-races. I.e. if a viable slot failed to be marked
+    /// for reading because of a data race, retries are made.
+    ///
+    /// \return Will return a valid ControlSlotIndicator indicating/pointing to an event, which is the youngest/newest
+    ///         one between last_search_time and upper_limit. I.e. its timestamp is between last_search_time and
+    ///         upper_limit and all other events with timestamps between last_search_time and upper_limit have a smaller
+    ///         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::TIMESTAMP_MAX) noexcept;
+
+    /// \brief Increments refcount of given slot by one (given it is in the correct state i.e. being accessible/
+    ///        readable)
+    /// \details This is a specific feature - not used by the standard proxy/consumer, which is using
+    ///          ReferenceNextEvent(). This API has been introduced in the context of IPC-Tracing, where a skeleton is
+    ///          referencing/using a slot it just has allocated to trace out the content via Trace-API and
+    ///          de-referencing it after tracing of the slot data has been accomplished.
+    ///          IMPORTANT: This function is _ONLY_ threadsafe with another function incrementing the ref count of a
+    ///          slot (e.g. via ReferenceNextEvent). The function must _NOT_ be called in a context in which another
+    ///          thread could mark the slot as invalid or marked for writing concurrently with this function. If this
+    ///          function is called by the SkeletonEvent itself before handing out a SampleAllocateePtr to the user,
+    ///          then it is safe.
+    /// \param slot_index index of the slot to be referenced.
+    void ReferenceSpecificEvent(const SlotIndexType slot_index,
+                                const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
+
+    /// \brief Returns number/count of events within event slots, which are newer than the given timestamp.
+    /// \param reference_time given reference timestamp.
+    /// \return number/count of available events, which are newer than the given reference_time.
+    std::size_t GetNumNewEvents(const EventSlotStatus::EventTimeStamp reference_time) const noexcept;
+
+    /// \brief Indicates that a consumer is finished reading (thread-safe, wait-free)
+    /// \pre ReferenceNextEvent() was invoked to obtain read-ownership
+    ///
+    /// \details Will also record the transaction in the TransactionLog corresponding to transaction_log_index
+    void DereferenceEvent(ControlSlotIndicator slot_indicator,
+                          const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
+
+    /// \brief Indicates that a consumer is finished reading (thread-safe, wait-free).
+    /// \pre ReferenceNextEvent() was invoked to obtain read-ownership
+    ///
+    /// \details Will not record the transaction in any TransactionLog. This function is called by the
+    /// TransactionLog::DereferenceSlotCallback created within TransactionLogSet::RollbackProxyTransactions and
+    /// RollbackSkeletonTracingTransactions. In these cases, the transaction will be recorded within
+    /// TransactionLog::RollbackIncrementTransactions resp. RollbackSubscribeTransactions before calling the callback.
+    void DereferenceEventWithoutTransactionLogging(const SlotIndexType event_slot_index) noexcept;
+
+    /// \brief Directly access EventSlotStatus for one specific slot
+    EventSlotStatus operator[](const SlotIndexType slot_index) const noexcept;
+
+    // Suppress "AUTOSAR C++14 A9-3-1" rule finding: "Member functions shall not return non-const “raw” pointers or
+    // references to private or protected data owned by the class.".
+    // To avoid overhead such as shared_ptr in the result, a non-const reference to the instance is returned instead.
+    // This instance exposes another sub-API that can change the its state and therefore also the state of instance
+    // holder. API callers get the reference and use it in place without leaving the scope, so the reference remains
+    // valid.
+    // coverity[autosar_cpp14_a9_3_1_violation]
+    TransactionLogSet& GetTransactionLogSet() noexcept
+    {
+        // coverity[autosar_cpp14_a9_3_1_violation] see above
+        return transaction_log_set_;
+    }
+
+    /// \brief Returns the max sample slots set on creation of EventDataControl
+    std::size_t GetMaxSampleSlots() const noexcept
+    {
+        return state_slots_.size();
+    }
+
+    // helper for performance indication (no production usage)
+    static void DumpPerformanceCounters();
+    static void ResetPerformanceCounters();
+
+  private:
+    LocalEventControlSlots state_slots_;
+
+    std::reference_wrapper<TransactionLogSet> transaction_log_set_;
+
+    // helper variables to calculated performance indicators
+    static inline std::atomic_uint_fast64_t num_ref_misses{0U};
+    static inline std::atomic_uint_fast64_t num_ref_retries{0U};
+};
+
+}  // namespace score::mw::com::impl::lola
+
+#endif  // SCORE_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_DATA_CONTROL_LOCAL_VIEW_H
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp
new file mode 100644
index 000000000..d09027bb1
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp
@@ -0,0 +1,548 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.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/skeleton_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
+
+#include "score/memory/shared/atomic_indirector.h"
+#include "score/memory/shared/atomic_mock.h"
+
+#include <score/utility.hpp>
+
+#include <gtest/gtest.h>
+#include <chrono>
+#include <limits>
+#include <mutex>
+#include <random>
+#include <thread>
+#include <vector>
+
+namespace score::mw::com::impl::lola
+{
+
+namespace
+{
+
+using ::testing::_;
+using ::testing::Return;
+
+constexpr std::size_t kMaxSubscribers{5U};
+const TransactionLogId kDummyTransactionLogId{10U};
+
+constexpr auto kSlotIsInWriting = std::numeric_limits<EventSlotStatus::SubscriberCount>::max();
+
+std::size_t RandomNumberBetween(std::size_t lower, std::size_t upper)
+{
+    std::mt19937_64 random_number_generator{};
+    auto time_seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+    std::seed_seq sequence_seed{uint32_t(time_seed & 0xffffffff), std::uint32_t(time_seed >> 32)};
+    random_number_generator.seed(sequence_seed);
+    std::uniform_int_distribution<std::size_t> number_distribution(lower, upper);
+    return number_distribution(random_number_generator);
+}
+
+bool RandomTrueOrFalse()
+{
+    return RandomNumberBetween(0, 1);
+}
+
+class ProxyEventDataControlLocalViewFixture : public ::testing::Test
+{
+  public:
+    static void SetUpTestSuite()
+    {
+        // we are annotating this requirement coverage for SSR-6225206 on test-suite level, as all
+        // test cases within this suite verify the slot-allocation/usage algo defined in SSR-6225206
+        RecordProperty("Verifies", "SSR-6225206");
+        RecordProperty("Description", "Ensures correct slot allocation algorithm");
+        RecordProperty("TestType", "Requirements-based test");
+        RecordProperty("Priority", "1");
+        RecordProperty("DerivationTechnique", "Analysis of requirements");
+    }
+
+    void TearDown() override
+    {
+        memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(nullptr);
+    }
+
+    ProxyEventDataControlLocalViewFixture& GivenARealProxyEventDataControlLocalView(
+        const SlotIndexType max_slots,
+        const LolaEventInstanceDeployment::SubscriberCountType max_subscribers)
+    {
+        event_data_control_ = std::make_unique<EventDataControl>(max_slots, memory_, max_subscribers);
+        unit_ = std::make_unique<ProxyEventDataControlLocalView<>>(*event_data_control_);
+        skeleton_event_data_control_local_ =
+            std::make_unique<SkeletonEventDataControlLocalView<>>(*event_data_control_);
+
+        return *this;
+    }
+
+    ProxyEventDataControlLocalViewFixture& GivenAMockedEventDataControl(
+        const SlotIndexType max_slots,
+        const LolaEventInstanceDeployment::SubscriberCountType max_subscribers)
+    {
+        event_data_control_ = std::make_unique<EventDataControl>(max_slots, memory_, 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<ProxyEventDataControlLocalView<memory::shared::AtomicIndirectorMock>>(
+            *event_data_control_);
+        skeleton_event_data_control_local_mocked_ =
+            std::make_unique<SkeletonEventDataControlLocalView<memory::shared::AtomicIndirectorMock>>(
+                *event_data_control_);
+
+        return *this;
+    }
+
+    SlotIndexType WithAnAllocatedSlot(EventSlotStatus::EventTimeStamp timestamp = 1)
+    {
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(skeleton_event_data_control_local_ != nullptr);
+        auto slot = skeleton_event_data_control_local_->AllocateNextSlot();
+        EXPECT_TRUE(slot.IsValid());
+        skeleton_event_data_control_local_->EventReady(slot, timestamp);
+        return slot.GetIndex();
+    }
+
+    FakeMemoryResource memory_{};
+    std::unique_ptr<memory::shared::AtomicMock<EventSlotStatus::value_type>> atomic_mock_{nullptr};
+
+    std::unique_ptr<EventDataControl> event_data_control_{nullptr};
+    std::unique_ptr<SkeletonEventDataControlLocalView<>> skeleton_event_data_control_local_{nullptr};
+    std::unique_ptr<SkeletonEventDataControlLocalView<memory::shared::AtomicIndirectorMock>>
+        skeleton_event_data_control_local_mocked_{nullptr};
+    std::unique_ptr<ProxyEventDataControlLocalView<>> unit_{nullptr};
+    std::unique_ptr<ProxyEventDataControlLocalView<memory::shared::AtomicIndirectorMock>> unit_mock_{nullptr};
+};
+
+TEST_F(ProxyEventDataControlLocalViewFixture, RegisterProxyElementReturnsValidTransactionLogIndex)
+{
+    // Given a EventDataControlUnit
+    GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers);
+
+    // When registering the proxy with the TransactionLogSet
+    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());
+    EXPECT_EQ(transaction_log_index_result.value(), 0);
+}
+
+TEST_F(ProxyEventDataControlLocalViewFixture, FindNextSlotBlocksAllocation)
+{
+    // Given a EventDataControlUnit with one ready slot
+    GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers).WithAnAllocatedSlot(1);
+
+    const auto transaction_log_index =
+        unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+
+    // When finding the next slot
+    auto event = unit_->ReferenceNextEvent(0, transaction_log_index);
+    ASSERT_TRUE(event.IsValid());
+
+    // Then we cannot allocate the slot again
+    ASSERT_FALSE(skeleton_event_data_control_local_->AllocateNextSlot().IsValid());
+}
+
+// Re-enable when the test is fixed in Ticket-128552
+TEST_F(ProxyEventDataControlLocalViewFixture, DISABLED_MultipleReceiverRefCountCheck)
+{
+    const std::size_t max_subscribers{10U};
+
+    // Given an EventDataControl with one ready slot
+    GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers).WithAnAllocatedSlot(1);
+
+    auto receiver_tester = [this]() {
+        const auto transaction_log_index =
+            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::TIMESTAMP_MAX);
+            ASSERT_TRUE(receive_slot.IsValid());
+            EXPECT_EQ((*unit_)[receive_slot.GetIndex()].GetTimeStamp(), 1);
+
+            // and decrease the ref-count
+            unit_->DereferenceEvent(receive_slot, transaction_log_index);
+        }
+    };
+
+    // When accessing it from multiple readers as the same time
+    std::vector<std::thread> receiver_threads{};
+    for (std::size_t counter = 0; counter < max_subscribers; ++counter)
+    {
+        receiver_threads.emplace_back(receiver_tester);
+    }
+    for (auto& thread : receiver_threads)
+    {
+        thread.join();
+    }
+
+    // Then the reference count is zero and we can overwrite the slot if no memory corruption or race occurred
+    ASSERT_TRUE(skeleton_event_data_control_local_->AllocateNextSlot().IsValid());
+}
+
+TEST_F(ProxyEventDataControlLocalViewFixture, FailingToUpdateSlotValueCausesReferenceNextEventToReturnNull)
+{
+    using namespace score::memory::shared;
+
+    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));
+
+    // and a EventDataControlUnit with one ready slot
+    auto slot = skeleton_event_data_control_local_mocked_->AllocateNextSlot();
+    skeleton_event_data_control_local_mocked_->EventReady(slot, 1);
+
+    const auto transaction_log_index =
+        unit_mock_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+
+    // When finding the next slot
+    auto event = unit_mock_->ReferenceNextEvent(0, transaction_log_index);
+
+    // No event will be found
+    ASSERT_FALSE(event.IsValid());
+}
+using EventDataControlReferenceSpecificEventFixture = ProxyEventDataControlLocalViewFixture;
+TEST_F(EventDataControlReferenceSpecificEventFixture, ReferenceSpecificEvents)
+{
+    const std::size_t max_number_slots{6U};
+    const std::size_t subscription_slots{6U};
+
+    // Given an EventDataControl with 6 ready slots
+    GivenARealProxyEventDataControlLocalView(max_number_slots, kMaxSubscribers);
+    for (unsigned int i = 0; i < 6; i++)
+    {
+        WithAnAllocatedSlot(i + 1);
+    }
+
+    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);
+    }
+}
+
+using EventDataControlReferenceSpecificEventDeathTest = EventDataControlReferenceSpecificEventFixture;
+TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInvalidTerminates)
+{
+    // Given an EventDataControl with one (initially invalid) slot
+    GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers);
+    EXPECT_TRUE((*unit_)[0].IsInvalid());
+
+    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), ".*");
+}
+
+TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInWritingTerminates)
+{
+    // Given an EventDataControl with one in_writing slot
+    GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers);
+    auto slot = skeleton_event_data_control_local_->AllocateNextSlot();
+    ASSERT_TRUE(slot.IsValid());
+    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInWriting());
+
+    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), ".*");
+}
+
+TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_ReferenceCountOverFlowsTerminates)
+{
+    memory::shared::AtomicMock<EventSlotStatus::value_type> atomic_mock;
+    memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(&atomic_mock);
+
+    // 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(_, _))
+        .WillByDefault(Return(static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing)));
+
+    // Given an EventDataControl with one slot
+    GivenAMockedEventDataControl(1, kMaxSubscribers);
+    auto slot = skeleton_event_data_control_local_mocked_->AllocateNextSlot();
+    ASSERT_TRUE(slot.IsValid());
+
+    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_mock_->ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
+}
+
+TEST_F(ProxyEventDataControlLocalViewFixture, GetNumNewEvents_Zero)
+{
+    // Given an EventDataControl with one ready slot
+    GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers).WithAnAllocatedSlot(1);
+
+    // When checking for new samples since timestamp 1 expect, that 0 is returned.
+    EXPECT_EQ(unit_->GetNumNewEvents(1), 0);
+}
+
+TEST_F(ProxyEventDataControlLocalViewFixture, GetNumNewEvents_One)
+{
+    // Given an EventDataControl with one ready slot
+    GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers).WithAnAllocatedSlot(1);
+
+    // When checking for new samples since start (timestamp 0) expect, that 1 is returned.
+    EXPECT_EQ(unit_->GetNumNewEvents(0), 1);
+}
+
+TEST_F(ProxyEventDataControlLocalViewFixture, GetNumNewEvents_Many)
+{
+    // Given an EventDataControl with 6 ready slots
+    GivenARealProxyEventDataControlLocalView(6, kMaxSubscribers);
+    for (unsigned int i = 1; i <= 6; 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);
+}
+
+struct MultiSenderMultiReceiverParams
+{
+    SlotIndexType num_slots;
+    LolaEventInstanceDeployment::SubscriberCountType num_receiver_threads;
+    std::size_t num_actions_per_sender;
+    std::size_t num_actions_per_receiver;
+    std::size_t max_referenced_samples_per_receiver;
+};
+
+class MultiSenderMultiReceiverTest : public ::testing::TestWithParam<MultiSenderMultiReceiverParams>
+{
+  public:
+    MultiSenderMultiReceiverTest()
+    {
+        ProxyEventDataControlLocalView<>::ResetPerformanceCounters();
+    }
+    ~MultiSenderMultiReceiverTest() override
+    {
+        ProxyEventDataControlLocalView<>::DumpPerformanceCounters();
+    }
+
+  protected:
+    // Protected by lock_
+    std::mutex lock_{};
+    EventSlotStatus::EventTimeStamp next_ts_{1};
+    std::set<SlotIndexType> allocated_slots_{};
+
+    // Unprotected
+    FakeMemoryResource memory_{};
+    EventDataControl event_data_control_{GetParam().num_slots, memory_, GetParam().num_receiver_threads};
+    SkeletonEventDataControlLocalView<> skeleton_event_data_control_local_{event_data_control_};
+    ProxyEventDataControlLocalView<> unit_{event_data_control_};
+};
+
+TEST_P(MultiSenderMultiReceiverTest, MultiSenderMultiReceiver)
+{
+    // this test case access the data structure in parallel by multiple threads one from read and one thread from writer
+    // side, this way we can ensure that _no_ data races occur
+
+    auto sender = [this]() {
+        // Randomly allocate or mark slot as ready
+        const auto& params = GetParam();
+        EventSlotStatus::EventTimeStamp ts{1};
+        for (std::size_t counter = 0; counter < params.num_actions_per_sender; ++counter)
+        {
+            auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
+            ASSERT_TRUE(slot.IsValid());
+
+            skeleton_event_data_control_local_.EventReady(slot, ++ts);
+        }
+    };
+
+    auto receiver = [this]() {
+        // randomly increases or decreases ref-count
+        const auto& params = GetParam();
+
+        std::vector<ControlSlotIndicator> used_slots{};
+        EventSlotStatus::EventTimeStamp start_ts{1};
+
+        TransactionLogSet::TransactionLogIndex transaction_log_index =
+            unit_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+
+        for (std::size_t counter = 0; counter < params.num_actions_per_receiver; ++counter)
+        {
+            if (used_slots.size() < params.max_referenced_samples_per_receiver && RandomTrueOrFalse())
+            {
+                auto slot = unit_.ReferenceNextEvent(start_ts, transaction_log_index);
+                if (slot.IsValid())
+                {
+                    start_ts = EventSlotStatus{unit_[slot.GetIndex()]}.GetTimeStamp();
+                    used_slots.push_back(slot);
+                }
+            }
+            else
+            {
+                if (!used_slots.empty())
+                {
+                    auto index = RandomNumberBetween(0, used_slots.size() - 1);
+                    auto iter = used_slots.begin();
+                    std::advance(iter, index);
+                    auto event_slot = *iter;
+                    used_slots.erase(iter);
+                    unit_.DereferenceEvent(event_slot, transaction_log_index);
+                }
+            }
+        }
+    };
+
+    auto sender_thread = std::thread{sender};
+
+    const auto& params = GetParam();
+    std::vector<std::thread> thread_pool{};
+    for (auto counter = 0U; counter < params.num_receiver_threads; counter++)
+    {
+        thread_pool.emplace_back(receiver);
+    }
+
+    sender_thread.join();
+    for (auto& thread : thread_pool)
+    {
+        thread.join();
+    }
+}
+
+// Re-enable when the test is fixed in Ticket-128552
+TEST_P(MultiSenderMultiReceiverTest, DISABLED_MultiSenderMultiReceiverMaxReceiverContention)
+{
+    // this test case increases the contention between reader and writer, by ensuring that the reader will hold his max.
+    // possible sample before freeing one.
+    std::atomic<bool> stop_sender{false};
+
+    auto sender = [this, &stop_sender]() {
+        // Randomly allocate or mark slot as ready
+        EventSlotStatus::EventTimeStamp ts{1};
+        while (!stop_sender)
+        {
+            auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
+            ASSERT_NE(ts, std::numeric_limits<std::uint32_t>::max());
+            if (!slot.IsValid())
+            {
+                ProxyEventDataControlLocalView<>::DumpPerformanceCounters();
+                std::terminate();
+            }
+            else
+            {
+                skeleton_event_data_control_local_.EventReady(slot, ++ts);
+            }
+            EXPECT_TRUE(slot.IsValid());
+        }
+    };
+
+    auto receiver = [this]() {
+        // randomly increases or decreases ref-count
+        const auto& params = GetParam();
+
+        std::vector<ControlSlotIndicator> used_slots{};
+        EventSlotStatus::EventTimeStamp start_ts{0};
+
+        TransactionLogSet::TransactionLogIndex transaction_log_index =
+            unit_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+
+        for (std::size_t counter = 0; counter < params.num_actions_per_receiver; ++counter)
+        {
+            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 &&
+                   used_slots.size() < params.max_referenced_samples_per_receiver)
+            {
+                auto slot = unit_.ReferenceNextEvent(start_ts, transaction_log_index, highest_ts);
+                if (slot.IsValid())
+                {
+                    highest_ts = EventSlotStatus{unit_[slot.GetIndex()]}.GetTimeStamp();
+                    used_slots.push_back(slot);
+                    slot_last = slot.GetIndex();
+                }
+                counter1++;
+            }
+
+            if (slot_last.has_value())
+            {
+                start_ts = EventSlotStatus{unit_[slot_last.value()]}.GetTimeStamp();
+            }
+
+            if (used_slots.size() == params.max_referenced_samples_per_receiver)
+            {
+
+                auto index = RandomNumberBetween(0, used_slots.size() - 1);
+                auto iter = used_slots.begin();
+                std::advance(iter, index);
+                auto event_slot = *iter;
+                used_slots.erase(iter);
+                unit_.DereferenceEvent(event_slot, transaction_log_index);
+            }
+        }
+    };
+
+    auto sender_thread = std::thread{sender};
+
+    const auto& params = GetParam();
+    std::vector<std::thread> thread_pool{};
+    for (auto counter = 0U; counter < params.num_receiver_threads; counter++)
+    {
+        thread_pool.emplace_back(receiver);
+    }
+
+    for (auto& thread : thread_pool)
+    {
+        thread.join();
+    }
+    stop_sender = true;
+    sender_thread.join();
+}
+
+INSTANTIATE_TEST_SUITE_P(MultiSenderMultiReceiverRealisticCases,
+                         MultiSenderMultiReceiverTest,
+                         ::testing::Values(
+                             // Values:
+                             // num_slots, num_receiver_threads, num_actions_per_sender, num_actions_per_receiver,
+                             // max_referenced_samples_per_receiver
+                             MultiSenderMultiReceiverParams{21, 5, 100, 5, 4}
+                             //                            MultiSenderMultiReceiverParams{2001, 500, 100, 100, 4},
+                             //                            MultiSenderMultiReceiverParams{121, 30, 100, 1000, 4}
+                             ));
+
+}  // namespace
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_test.cpp b/score/mw/com/impl/bindings/lola/proxy_event_test.cpp
index 82e5e8524..c97fd7786 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_test.cpp
+++ b/score/mw/com/impl/bindings/lola/proxy_event_test.cpp
@@ -398,7 +398,7 @@ TYPED_TEST(LolaProxyEventGetNewSamplesFixture, TransmitEventInShmArea)
         [this, slot_index](impl::SamplePtr<typename LolaProxyEventFixture<TypeParam>::SampleType>,
                            const tracing::ITracingRuntime::TracePointDataId timestamp) {
             // Then the retrieved data is pointing to the same valid slot
-            const auto& slot = (this->event_control_->data_control)[slot_index];
+            const auto& slot = (this->proxy_event_control_local_->data_control)[slot_index];
             EXPECT_FALSE(slot.IsInvalid());
             EXPECT_EQ(slot.GetTimeStamp(), timestamp);
         },
diff --git a/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.cpp b/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.cpp
new file mode 100644
index 000000000..703561009
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.cpp
@@ -0,0 +1,13 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h"
diff --git a/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h b/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h
new file mode 100644
index 000000000..ec77a741f
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h
@@ -0,0 +1,83 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#ifndef SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_PROXY_SERVICE_DATA_CONTROL_LOCAL_VIEW_H
+#define SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_PROXY_SERVICE_DATA_CONTROL_LOCAL_VIEW_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/proxy_event_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/service_data_control.h"
+
+#include <score/assert.hpp>
+
+#include <tuple>
+#include <utility>
+
+namespace score::mw::com::impl::lola
+{
+
+/// ProxyServiceDataControlLocalView is a view class which stores views to the individual objects in shared memory.
+///
+/// This class will be created by a Proxy on construction. It provides a local view into all the elements within
+/// ServiceDataControl. Since the memory layout of ServiceDataControl will never change after construction (e.g. the
+/// event_controls_ map will never be resized after construction), each Proxy can simply create a
+/// ProxyServiceDataControlLocalView to avoid accessing the shared memory via OffsetPtr. Additional information about
+/// the performance impacts of OffsetPtr are described in EventDataControl.
+class ProxyServiceDataControlLocalView
+{
+  public:
+    explicit ProxyServiceDataControlLocalView(ServiceDataControl& service_data_control)
+        : event_controls_{}, application_id_pid_mapping_{service_data_control.application_id_pid_mapping_}
+    {
+        for (auto& element : service_data_control.event_controls_)
+        {
+            const auto insertion_result = event_controls_.emplace(
+                std::piecewise_construct, std::forward_as_tuple(element.first), std::forward_as_tuple(element.second));
+
+            const bool was_inserted = insertion_result.second;
+            SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(was_inserted);
+        }
+    }
+
+    ~ProxyServiceDataControlLocalView() noexcept = default;
+
+    ProxyServiceDataControlLocalView(const ProxyServiceDataControlLocalView&) = delete;
+    ProxyServiceDataControlLocalView& operator=(const ProxyServiceDataControlLocalView&) = delete;
+    ProxyServiceDataControlLocalView(ProxyServiceDataControlLocalView&&) noexcept = delete;
+    ProxyServiceDataControlLocalView& operator=(ProxyServiceDataControlLocalView&& other) noexcept = delete;
+
+    // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall
+    // be private.". There are no class invariants to maintain which could be violated by directly accessing member
+    // variables.
+    // coverity[autosar_cpp14_m11_0_1_violation]
+    score::memory::shared::Map<ElementFqId, ProxyEventControlLocalView> event_controls_;
+
+    /// \brief mapping of a proxy's application identifier to its process ID (pid).
+    /// \details Every proxy instance for this service shall register itself in this mapping. The identifier used is
+    ///          either the 'applicationID' from the global configuration or, if not provided, the process's user ID
+    ///          (uid) as a fallback. This mapping is used by proxy instances to detect if they have crashed. Upon
+    ///          restart, they would find their application identifier already registered with a different (old) PID.
+    ///          Note: In the special case where a consumer application has multiple proxy instances for the very same
+    ///          service, they would all use the same application identifier and overwrite the registration with the
+    ///          same pid, which is acceptable.
+    // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall
+    // be private.". There are no class invariants to maintain which could be violated by directly accessing member
+    // variables.
+    // coverity[autosar_cpp14_m11_0_1_violation]
+    ApplicationIdPidMapping<score::memory::shared::PolymorphicOffsetPtrAllocator<ApplicationIdPidMappingEntry>>&
+        application_id_pid_mapping_;
+};
+
+}  // namespace score::mw::com::impl::lola
+
+#endif  // SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_PROXY_SERVICE_DATA_CONTROL_LOCAL_VIEW_H
diff --git a/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view_test.cpp b/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view_test.cpp
new file mode 100644
index 000000000..95d43a7a2
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view_test.cpp
@@ -0,0 +1,147 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/service_data_control_local.h"
+
+#include "score/mw/com/impl/bindings/lola/element_fq_id.h"
+#include "score/mw/com/impl/bindings/lola/event_control_local.h"
+#include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/service_data_control.h"
+#include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
+
+#include <gtest/gtest.h>
+
+#include <tuple>
+#include <utility>
+
+namespace score::mw::com::impl::lola
+{
+namespace
+{
+
+constexpr bool kEnforceMaxSamples{true};
+
+class ServiceDataControlLocalFixture : public ::testing::Test
+{
+  public:
+    ServiceDataControlLocalFixture()
+    {
+        score::cpp::ignore =
+            service_data_control_.event_controls_.emplace(std::piecewise_construct,
+                                                          std::forward_as_tuple(element_fq_id_0_),
+                                                          std::forward_as_tuple(max_slots_0_,
+                                                                                max_number_combined_subscribers_0_,
+                                                                                kEnforceMaxSamples,
+                                                                                memory_.getMemoryResourceProxy()));
+        score::cpp::ignore =
+            service_data_control_.event_controls_.emplace(std::piecewise_construct,
+                                                          std::forward_as_tuple(element_fq_id_1_),
+                                                          std::forward_as_tuple(max_slots_1_,
+                                                                                max_number_combined_subscribers_1_,
+                                                                                kEnforceMaxSamples,
+                                                                                memory_.getMemoryResourceProxy()));
+    }
+
+    EventControlLocal& GetEventControlLocal(ServiceDataControlLocal& service_data_control_local,
+                                            const ElementFqId element_fq_id)
+    {
+        auto event_control_local_it = service_data_control_local.event_controls_.find(element_fq_id);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(event_control_local_it != service_data_control_local.event_controls_.end());
+        return event_control_local_it->second;
+    }
+
+    EventControl& GetEventControl(ServiceDataControl& service_data_control, const ElementFqId element_fq_id)
+    {
+        auto event_control_it = service_data_control.event_controls_.find(element_fq_id);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(event_control_it != service_data_control.event_controls_.end());
+        return event_control_it->second;
+    }
+
+    ElementFqId element_fq_id_0_{10U, 20U, 30U, ServiceElementType::EVENT};
+    ElementFqId element_fq_id_1_{11U, 21U, 31U, ServiceElementType::EVENT};
+
+    SlotIndexType max_slots_0_{10U};
+    SlotIndexType max_slots_1_{11U};
+
+    LolaEventInstanceDeployment::SubscriberCountType max_number_combined_subscribers_0_{20U};
+    LolaEventInstanceDeployment::SubscriberCountType max_number_combined_subscribers_1_{21U};
+
+    FakeMemoryResource memory_{};
+    ServiceDataControl service_data_control_{memory_.getMemoryResourceProxy()};
+};
+
+TEST_F(ServiceDataControlLocalFixture, ConstructsEventControlLocalPointingToEachEventControl)
+{
+    // When creating a ServiceDataControlLocal from a ServiceDataControl
+    ServiceDataControlLocal service_data_control_local{service_data_control_};
+
+    // Then the created ServiceDataControlLocal should contain EventDataControlLocals pointing to the EventDataControls
+    // in the original ServiceDataControl. We check this by Allocating a slot in the EventDataControlLocal and checking
+    // that the actual slot vector in EventDataControl is updated
+    ASSERT_EQ(service_data_control_local.event_controls_.size(), 2);
+
+    // Slots should initially be all 0
+    auto& event_data_control_0{GetEventControl(service_data_control_, element_fq_id_0_).data_control};
+    auto& event_data_control_1{GetEventControl(service_data_control_, element_fq_id_1_).data_control};
+    std::all_of(
+        event_data_control_0.state_slots_.begin(), event_data_control_0.state_slots_.end(), [](const auto& slot_value) {
+            return slot_value == 0U;
+        });
+    std::all_of(
+        event_data_control_1.state_slots_.begin(), event_data_control_1.state_slots_.end(), [](const auto& slot_value) {
+            return slot_value == 0U;
+        });
+
+    auto& event_data_control_local_0 = GetEventControlLocal(service_data_control_local, element_fq_id_0_).data_control;
+    auto& event_data_control_local_1 = GetEventControlLocal(service_data_control_local, element_fq_id_1_).data_control;
+
+    // after allocating in the EventDataControlLocal
+    score::cpp::ignore = event_data_control_local_0.AllocateNextSlot();
+    score::cpp::ignore = event_data_control_local_1.AllocateNextSlot();
+
+    // the EventDataControl should be updated
+    EXPECT_EQ(event_data_control_0.state_slots_[0], std::numeric_limits<std::uint32_t>::max());
+    EXPECT_EQ(event_data_control_1.state_slots_[0], std::numeric_limits<std::uint32_t>::max());
+}
+
+TEST_F(ServiceDataControlLocalFixture, StoresReferenceToEventSubscriptionControlInServiceDataControl)
+{
+    // When creating a ServiceDataControlLocal from a ServiceDataControl
+    ServiceDataControlLocal service_data_control_local{service_data_control_};
+
+    // Then the EventSubscriptionControl reference for each EventControlLocal will point to the corresponding
+    // EventSubscriptionControl in the ServiceDataControl
+    ASSERT_EQ(service_data_control_local.event_controls_.size(), 2);
+    auto& event_subscription_control_0{GetEventControl(service_data_control_, element_fq_id_0_).subscription_control};
+    auto& event_subscription_control_1{GetEventControl(service_data_control_, element_fq_id_1_).subscription_control};
+
+    auto event_subscription_control_local_0{
+        GetEventControlLocal(service_data_control_local, element_fq_id_0_).subscription_control};
+    auto event_subscription_control_local_1{
+        GetEventControlLocal(service_data_control_local, element_fq_id_1_).subscription_control};
+
+    EXPECT_EQ(&event_subscription_control_0, &event_subscription_control_local_0.get());
+    EXPECT_EQ(&event_subscription_control_1, &event_subscription_control_local_1.get());
+}
+
+TEST_F(ServiceDataControlLocalFixture, StoresReferenceToApplicationIdPidMappingInServiceDataControl)
+{
+    // When creating a ServiceDataControlLocal from a ServiceDataControl
+    ServiceDataControlLocal service_data_control_local{service_data_control_};
+
+    // Then the ApplicationIdPidMapping reference will point to the ApplicationIdPidMapping in the ServiceDataControl
+    EXPECT_EQ(&service_data_control_local.application_id_pid_mapping_,
+              &service_data_control_.application_id_pid_mapping_);
+}
+
+}  // namespace
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/proxy_test.cpp b/score/mw/com/impl/bindings/lola/proxy_test.cpp
index bea894e85..94d64ead1 100644
--- a/score/mw/com/impl/bindings/lola/proxy_test.cpp
+++ b/score/mw/com/impl/bindings/lola/proxy_test.cpp
@@ -315,7 +315,7 @@ TEST_F(ProxyCreationDeathTest, GettingEventDataControlWithoutInitialisedEventDat
     // Then trying to get the event data control for an event that was not registered in the ServiceDataStorage
     // Will terminate
     const ElementFqId uninitialised_element_fq_id{0xcdef, 0x5, 0x10, ServiceElementType::EVENT};
-    EXPECT_DEATH(proxy_->GetEventControl(uninitialised_element_fq_id), ".*");
+    EXPECT_DEATH(proxy_->GetEventControlLocal(uninitialised_element_fq_id), ".*");
 }
 
 TEST_F(ProxyCreationDeathTest, GettingRawDataStorageWithoutInitialisedEventDataStorageTerminates)
@@ -703,8 +703,8 @@ TEST_F(ProxyTransactionLogRollbackFixture, RollbackWillBeCalledOnExistingTransac
 
     // When inserting a TransactionLog into the created TransactionLogSet which contains valid transactions
     InsertProxyTransactionLogWithValidTransactions(
-        *event_control_, subscription_max_sample_count_, transaction_log_id_);
-    EXPECT_TRUE(IsProxyTransactionLogIdRegistered(*event_control_, transaction_log_id_));
+        *proxy_event_control_local_, subscription_max_sample_count_, transaction_log_id_);
+    EXPECT_TRUE(IsProxyTransactionLogIdRegistered(*proxy_event_control_local_, transaction_log_id_));
 
     ON_CALL(binding_runtime_, GetApplicationId()).WillByDefault(Return(transaction_log_id_));
 
@@ -713,7 +713,7 @@ TEST_F(ProxyTransactionLogRollbackFixture, RollbackWillBeCalledOnExistingTransac
     EXPECT_NE(proxy_, nullptr);
 
     // Then the TransactionLog should be rollbacked during construction and removed
-    EXPECT_FALSE(IsProxyTransactionLogIdRegistered(*event_control_, transaction_log_id_));
+    EXPECT_FALSE(IsProxyTransactionLogIdRegistered(*proxy_event_control_local_, transaction_log_id_));
 }
 
 TEST_F(ProxyTransactionLogRollbackFixture, RollbackWillBeNotBeCalledOnNonExistingTransactionLogOnCreation)
@@ -721,7 +721,7 @@ TEST_F(ProxyTransactionLogRollbackFixture, RollbackWillBeNotBeCalledOnNonExistin
     // Given a fake Skeleton and SkeletonEvent which sets up an EventDataControl containing a TransactionLogSet
 
     // When no TransactionLog exists in the created TransactionLogSet
-    EXPECT_FALSE(IsProxyTransactionLogIdRegistered(*event_control_, transaction_log_id_));
+    EXPECT_FALSE(IsProxyTransactionLogIdRegistered(*proxy_event_control_local_, transaction_log_id_));
 
     // Given a valid deployment information
 
@@ -730,7 +730,7 @@ TEST_F(ProxyTransactionLogRollbackFixture, RollbackWillBeNotBeCalledOnNonExistin
     EXPECT_NE(proxy_, nullptr);
 
     // Then there should still be no transaction log and we shouldn't crash
-    EXPECT_FALSE(IsProxyTransactionLogIdRegistered(*event_control_, transaction_log_id_));
+    EXPECT_FALSE(IsProxyTransactionLogIdRegistered(*proxy_event_control_local_, transaction_log_id_));
 }
 
 TEST_F(ProxyTransactionLogRollbackFixture, FailureInRollingBackExistingTransactionLogWillReturnEmptyProxyBinding)
@@ -746,8 +746,8 @@ TEST_F(ProxyTransactionLogRollbackFixture, FailureInRollingBackExistingTransacti
 
     // When inserting a TransactionLog into the created TransactionLogSet which contains invalid transactions
     InsertProxyTransactionLogWithInvalidTransactions(
-        *event_control_, subscription_max_sample_count_, transaction_log_id_);
-    EXPECT_TRUE(IsProxyTransactionLogIdRegistered(*event_control_, transaction_log_id_));
+        *proxy_event_control_local_, subscription_max_sample_count_, transaction_log_id_);
+    EXPECT_TRUE(IsProxyTransactionLogIdRegistered(*proxy_event_control_local_, transaction_log_id_));
 
     EXPECT_CALL(binding_runtime_, GetApplicationId()).WillOnce(Return(transaction_log_id_));
 
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 4bae2c9a6..306d94e73 100644
--- a/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h
+++ b/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h
@@ -230,6 +230,11 @@ class SampleAllocateePtrMutableView
         return ptr_.event_data_control_;
     }
 
+    std::optional<EventDataControlComposite<>>& GetEventDataControlComposite() noexcept
+    {
+        return ptr_.event_data_control_;
+    }
+
   private:
     SampleAllocateePtr<SampleType>& ptr_;
 };
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 327700989..a9cd6323f 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
@@ -12,6 +12,7 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h"
 
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
 
 #include <gtest/gtest.h>
@@ -39,13 +40,14 @@ class SampleAllocateePtrFixture : public ::testing::Test
   public:
     FakeMemoryResource memory_{};
     EventDataControl control_block_{kMaxSlots, memory_, kMaxSubscribers};
-    EventDataControlComposite<> control_composite_{&control_block_};
+    SkeletonEventDataControlLocalView<> skeleton_event_data_control_local_{control_block_};
+    EventDataControlComposite<> control_composite_{&skeleton_event_data_control_local_, nullptr};
 };
 
 TEST_F(SampleAllocateePtrFixture, PtrContainingInvalidSlotIsNotDestroyingAnything)
 {
     // Given an SampleAllocateePtr on an allocated slot
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
     std::uint8_t data{};
     {
@@ -54,7 +56,7 @@ TEST_F(SampleAllocateePtrFixture, PtrContainingInvalidSlotIsNotDestroyingAnythin
     // When it goes out of scope
 
     // Then the underlying slot is not marked invalid
-    EXPECT_FALSE(control_block_[slot.GetIndex()].IsInvalid());
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, MarksSlotAsInvalidOnDestruction)
@@ -69,7 +71,7 @@ TEST_F(SampleAllocateePtrFixture, MarksSlotAsInvalidOnDestruction)
     RecordProperty("DerivationTechnique", "Analysis of requirements");
 
     // Given an SampleAllocateePtr on an allocated slot
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
     std::uint8_t data{};
     {
@@ -81,13 +83,13 @@ TEST_F(SampleAllocateePtrFixture, MarksSlotAsInvalidOnDestruction)
     // When it goes out of scope
 
     // Then the underlying slot is marked invalid
-    EXPECT_TRUE(control_block_[slot.GetIndex()].IsInvalid());
+    EXPECT_TRUE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, DoesNotMarkSlotAsInvalidOnMove)
 {
     // Given an SampleAllocateePtr on an allocated slot
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
     std::uint8_t data{};
     auto unit = SampleAllocateePtr<std::uint8_t>(
@@ -99,15 +101,15 @@ TEST_F(SampleAllocateePtrFixture, DoesNotMarkSlotAsInvalidOnMove)
     auto unit2 = std::move(unit);
 
     // Then the underlying slot is _not_ marked invalid
-    EXPECT_FALSE(control_block_[slot.GetIndex()].IsInvalid());
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, ReadySlotIsNotMarkedInvalidOnDestruction)
 {
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
-    control_block_.EventReady(slot, 0x42);
+    skeleton_event_data_control_local_.EventReady(slot, 0x42);
     std::uint8_t data{};
     {
         auto unit = SampleAllocateePtr<std::uint8_t>(
@@ -118,8 +120,8 @@ TEST_F(SampleAllocateePtrFixture, ReadySlotIsNotMarkedInvalidOnDestruction)
     // When it goes out of scope
 
     // Then the underlying slot is _not_ marked invalid
-    EXPECT_FALSE(control_block_[slot.GetIndex()].IsInvalid());
-    EXPECT_EQ(control_block_[slot.GetIndex()].GetTimeStamp(), 0x42);
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
+    EXPECT_EQ(skeleton_event_data_control_local_[slot.GetIndex()].GetTimeStamp(), 0x42);
 }
 
 TEST_F(SampleAllocateePtrFixture, CanAccessUnderlyingSlot)
@@ -131,9 +133,9 @@ TEST_F(SampleAllocateePtrFixture, CanAccessUnderlyingSlot)
     RecordProperty("DerivationTechnique", "Analysis of requirements");
 
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
-    control_block_.EventReady(slot, 0x42);
+    skeleton_event_data_control_local_.EventReady(slot, 0x42);
     std::uint8_t data{};
     auto unit = SampleAllocateePtr<std::uint8_t>(
         &data,
@@ -159,9 +161,9 @@ TEST_F(SampleAllocateePtrFixture, ObeysOwnershipProperties)
 TEST_F(SampleAllocateePtrFixture, MoveConstruct)
 {
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
-    control_block_.EventReady(slot, 0x42);
+    skeleton_event_data_control_local_.EventReady(slot, 0x42);
     std::uint8_t data{};
     auto unit = SampleAllocateePtr<std::uint8_t>(
         &data,
@@ -176,15 +178,15 @@ TEST_F(SampleAllocateePtrFixture, MoveConstruct)
     EXPECT_TRUE(unit2);
 
     // ... and the underlying slot is still valid.
-    EXPECT_FALSE(control_block_[slot.GetIndex()].IsInvalid());
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, MoveAssign)
 {
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
-    control_block_.EventReady(slot, 0x42);
+    skeleton_event_data_control_local_.EventReady(slot, 0x42);
     std::uint8_t data{};
     auto unit = SampleAllocateePtr<std::uint8_t>(
         &data,
@@ -199,7 +201,7 @@ TEST_F(SampleAllocateePtrFixture, MoveAssign)
     EXPECT_TRUE(unit2);
 
     // ... and the underlying slot is still valid.
-    EXPECT_FALSE(control_block_[slot.GetIndex()].IsInvalid());
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, ConstructFromNullptr)
@@ -217,7 +219,7 @@ TEST_F(SampleAllocateePtrFixture, ConstructFromNullptr)
 TEST_F(SampleAllocateePtrFixture, AssignNullptr)
 {
     // Given an SampleAllocateePtr on an allocated slot
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
     std::uint8_t data{};
     auto unit = SampleAllocateePtr<std::uint8_t>(
@@ -229,7 +231,7 @@ TEST_F(SampleAllocateePtrFixture, AssignNullptr)
     unit = nullptr;
 
     // Then the underlying slot is marked invalid
-    EXPECT_TRUE(control_block_[slot.GetIndex()].IsInvalid());
+    EXPECT_TRUE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
     // and the SamplePtr doesn't hold a valid managed object.
     EXPECT_FALSE(unit);
 }
@@ -237,7 +239,7 @@ TEST_F(SampleAllocateePtrFixture, AssignNullptr)
 TEST_F(SampleAllocateePtrFixture, ArrayOp)
 {
     // Given an SampleAllocateePtr on an allocated slot
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
     DummyStruct data{99, 42};
     auto unit = SampleAllocateePtr<DummyStruct>(
@@ -257,7 +259,7 @@ TEST_F(SampleAllocateePtrFixture, ArrayOp)
 TEST_F(SampleAllocateePtrFixture, StarOp)
 {
     // Given an SampleAllocateePtr on an allocated slot
-    auto slot = control_block_.AllocateNextSlot();
+    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot.IsValid());
     DummyStruct data{99, 42};
     auto unit = SampleAllocateePtr<DummyStruct>(
@@ -276,7 +278,7 @@ TEST_F(SampleAllocateePtrFixture, StarOp)
 TEST_F(SampleAllocateePtrFixture, SwapOp)
 {
     // Given two SampleAllocateePtrs on allocated slots
-    auto slot1 = control_block_.AllocateNextSlot();
+    auto slot1 = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot1.IsValid());
     DummyStruct data1{99, 42};
     auto unit1 = SampleAllocateePtr<DummyStruct>(
@@ -284,7 +286,7 @@ TEST_F(SampleAllocateePtrFixture, SwapOp)
         control_composite_,
         {slot1.GetIndex(), slot1.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
 
-    auto slot2 = control_block_.AllocateNextSlot();
+    auto slot2 = skeleton_event_data_control_local_.AllocateNextSlot();
     ASSERT_TRUE(slot2.IsValid());
     DummyStruct data2{10, 100};
     auto unit2 = SampleAllocateePtr<DummyStruct>(
diff --git a/score/mw/com/impl/bindings/lola/sample_ptr.h b/score/mw/com/impl/bindings/lola/sample_ptr.h
index 02a0546f7..2c5f1e084 100644
--- a/score/mw/com/impl/bindings/lola/sample_ptr.h
+++ b/score/mw/com/impl/bindings/lola/sample_ptr.h
@@ -14,8 +14,7 @@
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SAMPLE_PTR_H
 
 #include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
-#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
-#include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/slot_decrementer.h"
 
 #include <optional>
@@ -46,10 +45,11 @@ class SamplePtr final
     /// \param event_data_ctrl event data control structure, which manages the underlying event/sample in shmem.
     /// \param slot_indicator indicator of event slot
     SamplePtr(pointer ptr,
-              EventDataControl& event_data_ctrl,
+              ProxyEventDataControlLocalView<>& event_data_ctrl_local,
               ControlSlotIndicator slot_indicator,
               TransactionLogSet::TransactionLogIndex transaction_log_idx) noexcept
-        : SamplePtr{ptr, std::make_optional<SlotDecrementer>(&event_data_ctrl, slot_indicator, transaction_log_idx)}
+        : SamplePtr{ptr,
+                    std::make_optional<SlotDecrementer>(event_data_ctrl_local, slot_indicator, transaction_log_idx)}
     {
     }
 
diff --git a/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp b/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp
index b4a059446..1aa4db08f 100644
--- a/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp
+++ b/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp
@@ -13,6 +13,8 @@
 #include "score/mw/com/impl/bindings/lola/sample_ptr.h"
 
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
 #include "score/mw/com/impl/instance_specifier.h"
 
@@ -41,14 +43,16 @@ class SamplePtrTest : public ::testing::Test
   protected:
     FakeMemoryResource memory_{};
     EventDataControl event_data_control_{kMaxSlots, memory_, kMaxSubscribers};
+    ProxyEventDataControlLocalView<> proxy_event_data_control_local_{event_data_control_};
+    SkeletonEventDataControlLocalView<> skeleton_event_data_control_local_{event_data_control_};
     TransactionLogSet::TransactionLogIndex transaction_log_index_ =
-        event_data_control_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
+        proxy_event_data_control_local_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     SlotIndexType AllocateSlot(EventSlotStatus::EventTimeStamp timestamp = 1)
     {
-        auto slot = event_data_control_.AllocateNextSlot();
+        auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
         EXPECT_TRUE(slot.IsValid());
-        event_data_control_.EventReady(slot, timestamp);
+        skeleton_event_data_control_local_.EventReady(slot, timestamp);
         return slot.GetIndex();
     }
 };
@@ -72,15 +76,17 @@ TYPED_TEST(SamplePtrGenericTypeTest, DereferencesAssignedSlot)
     auto slot_index = SamplePtrTest::AllocateSlot();
 
     auto client_slot_indicator =
-        SamplePtrTest::event_data_control_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
+        SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
     ASSERT_TRUE(client_slot_indicator.IsValid());
     uint8_t dummy_val{};
-    SamplePtr<TypeParam> sample_ptr{
-        &dummy_val, SamplePtrTest::event_data_control_, client_slot_indicator, SamplePtrTest::transaction_log_index_};
+    SamplePtr<TypeParam> sample_ptr{&dummy_val,
+                                    SamplePtrTest::proxy_event_data_control_local_,
+                                    client_slot_indicator,
+                                    SamplePtrTest::transaction_log_index_};
 
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot_index]}.GetReferenceCount(), 1);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot_index]}.GetReferenceCount(), 1);
     sample_ptr = nullptr;
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot_index]}.GetReferenceCount(), 0);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot_index]}.GetReferenceCount(), 0);
 }
 
 TYPED_TEST(SamplePtrGenericTypeTest, ProperMoveConstruction)
@@ -88,18 +94,20 @@ TYPED_TEST(SamplePtrGenericTypeTest, ProperMoveConstruction)
     auto slot_index = SamplePtrTest::AllocateSlot();
 
     auto client_slot_indicator =
-        SamplePtrTest::event_data_control_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
+        SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
     ASSERT_TRUE(client_slot_indicator.IsValid());
     uint8_t dummy_val{};
-    SamplePtr<TypeParam> sample_ptr{
-        &dummy_val, SamplePtrTest::event_data_control_, client_slot_indicator, SamplePtrTest::transaction_log_index_};
+    SamplePtr<TypeParam> sample_ptr{&dummy_val,
+                                    SamplePtrTest::proxy_event_data_control_local_,
+                                    client_slot_indicator,
+                                    SamplePtrTest::transaction_log_index_};
 
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot_index]}.GetReferenceCount(), 1);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot_index]}.GetReferenceCount(), 1);
     SamplePtr<TypeParam> another_sample_ptr{std::move(sample_ptr)};
     sample_ptr = nullptr;
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot_index]}.GetReferenceCount(), 1);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot_index]}.GetReferenceCount(), 1);
     another_sample_ptr = nullptr;
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot_index]}.GetReferenceCount(), 0);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot_index]}.GetReferenceCount(), 0);
 }
 
 TYPED_TEST(SamplePtrGenericTypeTest, ProperMoveAssignment)
@@ -107,28 +115,32 @@ TYPED_TEST(SamplePtrGenericTypeTest, ProperMoveAssignment)
     auto slot = SamplePtrTest::AllocateSlot(1);
 
     auto client_slot_indicator =
-        SamplePtrTest::event_data_control_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
+        SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
     ASSERT_TRUE(client_slot_indicator.IsValid());
     uint8_t dummy_val{};
-    SamplePtr<TypeParam> sample_ptr{
-        &dummy_val, SamplePtrTest::event_data_control_, client_slot_indicator, SamplePtrTest::transaction_log_index_};
+    SamplePtr<TypeParam> sample_ptr{&dummy_val,
+                                    SamplePtrTest::proxy_event_data_control_local_,
+                                    client_slot_indicator,
+                                    SamplePtrTest::transaction_log_index_};
 
     auto slot2 = SamplePtrTest::AllocateSlot(2);
 
     auto client_slot2_indicator =
-        SamplePtrTest::event_data_control_.ReferenceNextEvent(1, SamplePtrTest::transaction_log_index_);
+        SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(1, SamplePtrTest::transaction_log_index_);
     ASSERT_TRUE(client_slot2_indicator.IsValid());
-    SamplePtr<TypeParam> sample_ptr2{
-        &dummy_val, SamplePtrTest::event_data_control_, client_slot2_indicator, SamplePtrTest::transaction_log_index_};
+    SamplePtr<TypeParam> sample_ptr2{&dummy_val,
+                                     SamplePtrTest::proxy_event_data_control_local_,
+                                     client_slot2_indicator,
+                                     SamplePtrTest::transaction_log_index_};
 
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot]}.GetReferenceCount(), 1);
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot2]}.GetReferenceCount(), 1);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot]}.GetReferenceCount(), 1);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot2]}.GetReferenceCount(), 1);
     sample_ptr2 = std::move(sample_ptr);
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot]}.GetReferenceCount(), 1);
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot2]}.GetReferenceCount(), 0);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot]}.GetReferenceCount(), 1);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot2]}.GetReferenceCount(), 0);
     sample_ptr2 = nullptr;
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot]}.GetReferenceCount(), 0);
-    EXPECT_EQ(EventSlotStatus{SamplePtrTest::event_data_control_[slot2]}.GetReferenceCount(), 0);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot]}.GetReferenceCount(), 0);
+    EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot2]}.GetReferenceCount(), 0);
 }
 
 TYPED_TEST(SamplePtrGenericTypeTest, TestStaticProperties)
@@ -152,10 +164,11 @@ TEST_F(SamplePtrTest, ArrayOp)
 {
     // Given an SamplePtr on an allocated slot
     AllocateSlot();
-    auto client_slot_indicator = event_data_control_.ReferenceNextEvent(0, transaction_log_index_);
+    auto client_slot_indicator = proxy_event_data_control_local_.ReferenceNextEvent(0, transaction_log_index_);
     ASSERT_TRUE(client_slot_indicator.IsValid());
     DummyStruct dummy_val{22, 44};
-    SamplePtr<DummyStruct> sample_ptr{&dummy_val, event_data_control_, client_slot_indicator, transaction_log_index_};
+    SamplePtr<DummyStruct> sample_ptr{
+        &dummy_val, proxy_event_data_control_local_, client_slot_indicator, transaction_log_index_};
 
     // When accessing the data via ->
     auto val1 = sample_ptr->member1_;
@@ -170,10 +183,11 @@ TEST_F(SamplePtrTest, StarOp)
 {
     // Given an SamplePtr on an allocated slot
     AllocateSlot();
-    auto client_slot_indicator = event_data_control_.ReferenceNextEvent(0, transaction_log_index_);
+    auto client_slot_indicator = proxy_event_data_control_local_.ReferenceNextEvent(0, transaction_log_index_);
     ASSERT_TRUE(client_slot_indicator.IsValid());
     DummyStruct dummy_val{22, 44};
-    SamplePtr<DummyStruct> sample_ptr{&dummy_val, event_data_control_, client_slot_indicator, transaction_log_index_};
+    SamplePtr<DummyStruct> sample_ptr{
+        &dummy_val, proxy_event_data_control_local_, client_slot_indicator, transaction_log_index_};
 
     // When accessing the data via *
     auto val1 = *sample_ptr;
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 cb47a9b76..f61959e88 100644
--- a/score/mw/com/impl/bindings/lola/service_data_control.h
+++ b/score/mw/com/impl/bindings/lola/service_data_control.h
@@ -18,7 +18,6 @@
 #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
diff --git a/score/mw/com/impl/bindings/lola/skeleton.cpp b/score/mw/com/impl/bindings/lola/skeleton.cpp
index 449c7b003..7e8e8baa5 100644
--- a/score/mw/com/impl/bindings/lola/skeleton.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton.cpp
@@ -13,6 +13,7 @@
 #include "score/mw/com/impl/bindings/lola/skeleton.h"
 
 #include "score/memory/shared/managed_memory_resource.h"
+#include "score/mw/com/impl/bindings/lola/element_fq_id.h"
 #include "score/mw/com/impl/bindings/lola/i_shm_path_builder.h"
 #include "score/mw/com/impl/bindings/lola/messaging/i_message_passing_service.h"
 #include "score/mw/com/impl/bindings/lola/methods/proxy_method_instance_identifier.h"
@@ -21,6 +22,7 @@
 #include "score/mw/com/impl/bindings/lola/service_data_control.h"
 #include "score/mw/com/impl/bindings/lola/service_data_storage.h"
 #include "score/mw/com/impl/bindings/lola/shm_path_builder.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_properties.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_instance_identifier.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_method.h"
 #include "score/mw/com/impl/bindings/lola/tracing/tracing_runtime.h"
@@ -283,6 +285,9 @@ Skeleton::Skeleton(const InstanceIdentifier& identifier,
       storage_{nullptr},
       control_qm_{nullptr},
       control_asil_b_{nullptr},
+      skeleton_control_qm_local_{},
+      skeleton_control_asil_b_local_{},
+      proxy_control_local_{},
       storage_resource_{},
       control_qm_resource_{},
       control_asil_resource_{},
@@ -619,6 +624,7 @@ bool Skeleton::CreateSharedMemoryForData(
             tracing::TracingRuntime::kDummyElementTypeForShmRegisterCallback,
             memory_resource->GetFileDescriptor(),
             memory_resource->getBaseAddress());
+        score::cpp::ignore = proxy_control_local_.emplace(*control_qm_);
     }
 
     score::mw::log::LogDebug("lola") << "Created shared-memory-object for DATA (S: " << lola_service_id_
@@ -737,10 +743,21 @@ bool Skeleton::OpenSharedMemoryForControl(const QualityType asil_level)
     data_control_path = path;
 
     auto& control = (asil_level == QualityType::kASIL_QM) ? control_qm_ : control_asil_b_;
+    auto& skeleton_control_local =
+        (asil_level == QualityType::kASIL_QM) ? skeleton_control_qm_local_ : skeleton_control_asil_b_local_;
 
     const auto& control_resource_ref = *control_resource.get();
     control = GetServiceDataControlSkeletonSide(control_resource_ref);
 
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(control != nullptr);
+    score::cpp::ignore = skeleton_control_local.emplace(*control);
+
+    auto* const tracing_runtime = impl::Runtime::getInstance().GetTracingRuntime();
+    const bool is_tracing_enabled = (tracing_runtime != nullptr) && tracing_runtime->IsTracingEnabled();
+    if ((asil_level == QualityType::kASIL_QM) && is_tracing_enabled)
+    {
+        score::cpp::ignore = proxy_control_local_.emplace(*control);
+    }
     return true;
 }
 
@@ -950,14 +967,14 @@ QualityType Skeleton::GetInstanceQualityType() const
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
 void Skeleton::CleanupSharedMemoryAfterCrash()
 {
-    for (auto& event : control_qm_->event_controls_)
+    for (auto& event : skeleton_control_qm_local_->event_controls_)
     {
         event.second.data_control.RemoveAllocationsForWriting();
     }
 
-    if (control_asil_b_ != nullptr)
+    if (skeleton_control_asil_b_local_.has_value())
     {
-        for (auto& event : control_asil_b_->event_controls_)
+        for (auto& event : skeleton_control_asil_b_local_->event_controls_)
         {
             event.second.data_control.RemoveAllocationsForWriting();
         }
@@ -1024,69 +1041,119 @@ void Skeleton::InitializeSharedMemoryForControl(
     const std::shared_ptr<score::memory::shared::ManagedMemoryResource>& memory)
 {
     auto& control = (asil_level == QualityType::kASIL_QM) ? control_qm_ : control_asil_b_;
+    auto& control_local =
+        (asil_level == QualityType::kASIL_QM) ? skeleton_control_qm_local_ : skeleton_control_asil_b_local_;
     control = memory->construct<ServiceDataControl>(*memory);
+
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(control != nullptr);
+    score::cpp::ignore = control_local.emplace(*control);
+
+    auto* const tracing_runtime = impl::Runtime::getInstance().GetTracingRuntime();
+    const bool is_tracing_enabled = (tracing_runtime != nullptr) && tracing_runtime->IsTracingEnabled();
+    if ((asil_level == QualityType::kASIL_QM) && is_tracing_enabled)
+    {
+        score::cpp::ignore = proxy_control_local_.emplace(*control);
+    }
+}
+
+std::pair<std::reference_wrapper<EventControl>, std::reference_wrapper<SkeletonEventControlLocalView>>
+Skeleton::InsertEventInServiceDataControl(const QualityType asil_level,
+                                          ElementFqId element_fq_id,
+                                          const SkeletonEventProperties& element_properties)
+{
+    auto* const service_data_control = (asil_level == QualityType::kASIL_QM) ? control_qm_ : control_asil_b_;
+    auto& skeleton_service_data_control_local =
+        (asil_level == QualityType::kASIL_QM) ? skeleton_control_qm_local_ : skeleton_control_asil_b_local_;
+    auto* const memory_resource =
+        (asil_level == QualityType::kASIL_QM) ? control_qm_resource_.get() : control_asil_resource_.get();
+
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD(service_data_control != nullptr);
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD(skeleton_service_data_control_local.has_value());
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD(memory_resource != nullptr);
+
+    auto control_qm =
+        service_data_control->event_controls_.emplace(std::piecewise_construct,
+                                                      std::forward_as_tuple(element_fq_id),
+                                                      std::forward_as_tuple(element_properties.number_of_slots,
+                                                                            element_properties.max_subscribers,
+                                                                            element_properties.enforce_max_samples,
+                                                                            *memory_resource));
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(control_qm.second,
+                                                "Couldn't register/emplace EventControl in control-section.");
+
+    auto control_qm_local =
+        skeleton_service_data_control_local->event_controls_.emplace(std::piecewise_construct,
+                                                                     std::forward_as_tuple(element_fq_id),
+                                                                     std::forward_as_tuple(control_qm.first->second));
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
+        control_qm_local.second, "Couldn't register/emplace SkeletonEventControlLocalView in control-section.");
+    return {control_qm.first->second, control_qm_local.first->second};
 }
 
 EventDataControlComposite<> Skeleton::CreateEventControlComposite(
     const ElementFqId element_fq_id,
     const SkeletonEventProperties& element_properties) noexcept
 {
-    auto control_qm = control_qm_->event_controls_.emplace(std::piecewise_construct,
-                                                           std::forward_as_tuple(element_fq_id),
-                                                           std::forward_as_tuple(element_properties.number_of_slots,
-                                                                                 element_properties.max_subscribers,
-                                                                                 element_properties.enforce_max_samples,
-                                                                                 *control_qm_resource_));
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(control_qm.second,
-                                                "Couldn't register/emplace event-meta-info in data-section.");
+    auto [event_data_control_qm, skeleton_event_data_control_local_qm] =
+        InsertEventInServiceDataControl(QualityType::kASIL_QM, element_fq_id, element_properties);
 
-    EventDataControl* control_asil_result{nullptr};
+    SkeletonEventDataControlLocalView<>* control_asil_local_result{nullptr};
     if (control_asil_resource_ != nullptr)
     {
-        auto iterator =
-            control_asil_b_->event_controls_.emplace(std::piecewise_construct,
-                                                     std::forward_as_tuple(element_fq_id),
-                                                     std::forward_as_tuple(element_properties.number_of_slots,
-                                                                           element_properties.max_subscribers,
-                                                                           element_properties.enforce_max_samples,
-                                                                           *control_asil_resource_));
-
-        // Suppress "AUTOSAR C++14 M7-5-1" rule. This rule declares:
-        // A function shall not return a reference or a pointer to an automatic variable (including parameters), defined
-        // within the function.
-        // Suppress "AUTOSAR C++14 M7-5-2": The address of an object with automatic storage shall not be assigned to
-        // another object that may persist after the first object has ceased to exist.
-        // The result pointer is still valid outside this method until Skeleton object (as a holder) is alive.
+        auto [_, skeleton_event_data_control_local_asil_b] =
+            InsertEventInServiceDataControl(QualityType::kASIL_B, element_fq_id, element_properties);
+
+        // Suppression rationale: The result pointer is still valid outside this method until Skeleton object (as a
+        // holder) is alive.
         // coverity[autosar_cpp14_m7_5_1_violation]
         // coverity[autosar_cpp14_m7_5_2_violation]
         // coverity[autosar_cpp14_a3_8_1_violation]
-        control_asil_result = &iterator.first->second.data_control;
+        control_asil_local_result = &skeleton_event_data_control_local_asil_b.get().data_control;
     }
-    // clang-format off
+
+    ProxyEventDataControlLocalView<>* proxy_event_data_control_local{nullptr};
+    if (proxy_control_local_.has_value())
+    {
+        auto control_qm_local =
+            proxy_control_local_->event_controls_.emplace(std::piecewise_construct,
+                                                          std::forward_as_tuple(element_fq_id),
+                                                          std::forward_as_tuple(event_data_control_qm.get()));
+        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
+            control_qm_local.second, "Couldn't register/emplace ProxyEventControlLocalView in control-section.");
+
+        // Suppressions rationale: The result pointer is still valid outside this method until Skeleton object (as a
+        // holder) is alive.
+        // coverity[autosar_cpp14_m7_5_1_violation]
+        // coverity[autosar_cpp14_m7_5_2_violation]
+        // coverity[autosar_cpp14_a3_8_1_violation]
+        proxy_event_data_control_local = &control_qm_local.first->second.data_control;
+    }
+
     // The lifetime of the "control_asil_result" object lasts as long as the Skeleton is alive.
     // coverity[autosar_cpp14_m7_5_1_violation]
     // coverity[autosar_cpp14_m7_5_2_violation]
     // coverity[autosar_cpp14_a3_8_1_violation]
-    return EventDataControlComposite{&control_qm.first->second.data_control, control_asil_result};
+    return EventDataControlComposite{&skeleton_event_data_control_local_qm.get().data_control,
+                                     control_asil_local_result,
+                                     proxy_event_data_control_local};
 }
 
 std::pair<score::memory::shared::OffsetPtr<void>, EventDataControlComposite<>>
-Skeleton::CreateEventDataFromOpenedSharedMemory(
-    const ElementFqId element_fq_id,
-    const SkeletonEventProperties& element_properties,
-    size_t sample_size,
-    size_t sample_alignment) noexcept
+Skeleton::CreateEventDataFromOpenedSharedMemory(const ElementFqId element_fq_id,
+                                                const SkeletonEventProperties& element_properties,
+                                                size_t sample_size,
+                                                size_t sample_alignment) noexcept
 {
 
     // Guard against over-aligned types (Short-term solution protection)
     if (sample_alignment > alignof(std::max_align_t))
     {
         score::mw::log::LogFatal("Skeleton")
-            << "Requested sample alignment (" << sample_alignment
-            << ") exceeds max_align_t (" << alignof(std::max_align_t)
-            << "). Safe shared memory layout cannot be guaranteed.";
+            << "Requested sample alignment (" << sample_alignment << ") exceeds max_align_t ("
+            << alignof(std::max_align_t) << "). Safe shared memory layout cannot be guaranteed.";
 
-        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(sample_alignment <= alignof(std::max_align_t),"Requested sample alignment exceeds maximum supported alignment.");
+        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(sample_alignment <= alignof(std::max_align_t),
+                                                    "Requested sample alignment exceeds maximum supported alignment.");
     }
 
     // Calculate the aligned size for a single sample to ensure proper padding between slots
@@ -1098,28 +1165,27 @@ Skeleton::CreateEventDataFromOpenedSharedMemory(
         (total_data_size_bytes + sizeof(std::max_align_t) - 1) / sizeof(std::max_align_t);
 
     auto* data_storage = storage_resource_->construct<EventDataStorage<std::max_align_t>>(
-        num_max_align_elements,
-        memory::shared::PolymorphicOffsetPtrAllocator<std::max_align_t>(*storage_resource_));
+        num_max_align_elements, memory::shared::PolymorphicOffsetPtrAllocator<std::max_align_t>(*storage_resource_));
 
-    auto inserted_data_slots = storage_->events_.emplace(std::piecewise_construct,
-                                                         std::forward_as_tuple(element_fq_id),
-                                                         std::forward_as_tuple(data_storage));
+    auto inserted_data_slots = storage_->events_.emplace(
+        std::piecewise_construct, std::forward_as_tuple(element_fq_id), std::forward_as_tuple(data_storage));
     SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(inserted_data_slots.second,
-                                               "Couldn't register/emplace event-storage in data-section.");
-
+                                                "Couldn't register/emplace event-storage in data-section.");
 
     const DataTypeMetaInfo sample_meta_info{sample_size, static_cast<std::uint8_t>(sample_alignment)};
     void* const event_data_raw_array = data_storage->data();
 
-    auto inserted_meta_info = storage_->events_metainfo_.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(element_fq_id),
-        std::forward_as_tuple(sample_meta_info, event_data_raw_array));
+    auto inserted_meta_info =
+        storage_->events_metainfo_.emplace(std::piecewise_construct,
+                                           std::forward_as_tuple(element_fq_id),
+                                           std::forward_as_tuple(sample_meta_info, event_data_raw_array));
     SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(inserted_meta_info.second,
-                                               "Couldn't register/emplace event-meta-info in data-section.");
+                                                "Couldn't register/emplace event-meta-info in data-section.");
 
-    return {score::memory::shared::OffsetPtr<void>(data_storage), CreateEventControlComposite(element_fq_id, element_properties)};
+    return {score::memory::shared::OffsetPtr<void>(data_storage),
+            CreateEventControlComposite(element_fq_id, element_properties)};
 }
+
 std::pair<score::memory::shared::OffsetPtr<void>, EventDataControlComposite<>> Skeleton::RegisterGeneric(
     const ElementFqId element_fq_id,
     const SkeletonEventProperties& element_properties,
@@ -1130,7 +1196,7 @@ std::pair<score::memory::shared::OffsetPtr<void>, EventDataControlComposite<>> S
     {
         auto [data_storage, control_composite] = OpenEventDataFromOpenedSharedMemory<std::uint8_t>(element_fq_id);
 
-        auto& event_data_control_qm = control_composite.GetQmEventDataControl();
+        auto& event_data_control_qm = control_composite.GetQmEventDataControlLocal();
         auto rollback_result = event_data_control_qm.GetTransactionLogSet().RollbackSkeletonTracingTransactions(
             [&event_data_control_qm](const TransactionLog::SlotIndexType slot_index) {
                 event_data_control_qm.DereferenceEventWithoutTransactionLogging(slot_index);
@@ -1147,8 +1213,7 @@ std::pair<score::memory::shared::OffsetPtr<void>, EventDataControlComposite<>> S
     }
     else
     {
-        return CreateEventDataFromOpenedSharedMemory(
-            element_fq_id, element_properties, sample_size, sample_alignment);
+        return CreateEventDataFromOpenedSharedMemory(element_fq_id, element_properties, sample_size, sample_alignment);
     }
 }
 
diff --git a/score/mw/com/impl/bindings/lola/skeleton.h b/score/mw/com/impl/bindings/lola/skeleton.h
index 5099d4b27..8f9338d91 100644
--- a/score/mw/com/impl/bindings/lola/skeleton.h
+++ b/score/mw/com/impl/bindings/lola/skeleton.h
@@ -24,16 +24,20 @@
 #include "score/mw/com/impl/bindings/lola/methods/method_resource_map.h"
 #include "score/mw/com/impl/bindings/lola/methods/type_erased_call_queue.h"
 #include "score/mw/com/impl/bindings/lola/proxy_instance_identifier.h"
+#include "score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/runtime.h"
 #include "score/mw/com/impl/bindings/lola/service_data_control.h"
 #include "score/mw/com/impl/bindings/lola/service_data_storage.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_event_properties.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_instance_identifier.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_method.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/tracing/tracing_runtime.h"
 #include "score/mw/com/impl/configuration/global_configuration.h"
 #include "score/mw/com/impl/configuration/lola_event_id.h"
 #include "score/mw/com/impl/configuration/lola_method_id.h"
 #include "score/mw/com/impl/configuration/lola_service_instance_deployment.h"
+#include "score/mw/com/impl/configuration/quality_type.h"
 #include "score/mw/com/impl/instance_identifier.h"
 #include "score/mw/com/impl/runtime.h"
 #include "score/mw/com/impl/skeleton_binding.h"
@@ -186,6 +190,10 @@ class Skeleton final : public SkeletonBinding
     void InitializeSharedMemoryForData(const std::shared_ptr<score::memory::shared::ManagedMemoryResource>& memory);
     void InitializeSharedMemoryForControl(const QualityType asil_level,
                                           const std::shared_ptr<score::memory::shared::ManagedMemoryResource>& memory);
+    std::pair<std::reference_wrapper<EventControl>, std::reference_wrapper<SkeletonEventControlLocalView>>
+    InsertEventInServiceDataControl(const QualityType asil_level,
+                                    ElementFqId element_fq_id,
+                                    const SkeletonEventProperties& element_properties);
 
     template <typename SampleType>
     std::pair<EventDataStorage<SampleType>*, EventDataControlComposite<>> OpenEventDataFromOpenedSharedMemory(
@@ -280,6 +288,12 @@ class Skeleton final : public SkeletonBinding
     ServiceDataStorage* storage_;
     ServiceDataControl* control_qm_;
     ServiceDataControl* control_asil_b_;
+    std::optional<SkeletonServiceDataControlLocalView> skeleton_control_qm_local_;
+    std::optional<SkeletonServiceDataControlLocalView> skeleton_control_asil_b_local_;
+
+    // Used for tracing
+    std::optional<ProxyServiceDataControlLocalView> proxy_control_local_;
+
     std::shared_ptr<score::memory::shared::ManagedMemoryResource> storage_resource_;
     std::shared_ptr<score::memory::shared::ManagedMemoryResource> control_qm_resource_;
     std::shared_ptr<score::memory::shared::ManagedMemoryResource> control_asil_resource_;
@@ -296,7 +310,7 @@ class Skeleton final : public SkeletonBinding
     ///
     /// OnServiceMethodsSubscribed can be called by the message passing concurrently, since different Proxies could
     /// subscribe at the same time or a single Proxy may send the same message multiple times (See
-    /// platform/aas/docs/features/ipc/lola/method/README.md for details).
+    /// score/docs/features/ipc/lola/method/README.md for details).
     std::mutex on_service_methods_subscribed_mutex_;
     MethodResourceMap method_resources_;
     std::unordered_map<LolaMethodId, std::reference_wrapper<SkeletonMethod>> skeleton_methods_;
@@ -346,10 +360,10 @@ auto Skeleton::Register(const ElementFqId element_fq_id, SkeletonEventProperties
         auto [typed_event_data_storage_ptr, event_data_control_composite] =
             OpenEventDataFromOpenedSharedMemory<SampleType>(element_fq_id);
 
-        auto& event_data_control_qm = event_data_control_composite.GetQmEventDataControl();
-        auto rollback_result = event_data_control_qm.GetTransactionLogSet().RollbackSkeletonTracingTransactions(
-            [&event_data_control_qm](const TransactionLog::SlotIndexType slot_index) {
-                event_data_control_qm.DereferenceEventWithoutTransactionLogging(slot_index);
+        auto& event_data_control_qm_local = event_data_control_composite.GetQmEventDataControlLocal();
+        auto rollback_result = event_data_control_qm_local.GetTransactionLogSet().RollbackSkeletonTracingTransactions(
+            [&event_data_control_qm_local](const TransactionLog::SlotIndexType slot_index) {
+                event_data_control_qm_local.DereferenceEventWithoutTransactionLogging(slot_index);
             });
         if (!rollback_result.has_value())
         {
@@ -395,22 +409,19 @@ auto Skeleton::OpenEventDataFromOpenedSharedMemory(const ElementFqId element_fq_
 
     score::cpp::ignore = find_element(storage_->events_metainfo_, element_fq_id);
     const auto event_data_storage_it = find_element(storage_->events_, element_fq_id);
-    const auto event_control_qm_it = find_element(control_qm_->event_controls_, element_fq_id);
+    const auto event_control_qm_it = find_element(skeleton_control_qm_local_->event_controls_, element_fq_id);
 
-    EventDataControl* event_data_control_asil_b{nullptr};
+    SkeletonEventDataControlLocalView<>* event_data_control_asil_b_local{nullptr};
     if (detail_skeleton::HasAsilBSupport(identifier_))
     {
-        const auto event_control_asil_b_it = find_element(control_asil_b_->event_controls_, element_fq_id);
-        // Suppress "AUTOSAR C++14 M7-5-1" rule. This rule declares:
-        // A function shall not return a reference or a pointer to an automatic variable (including parameters), defined
-        // within the function.
-        // Suppress "AUTOSAR C++14 M7-5-2": The address of an object with automatic storage shall not be assigned to
-        // another object that may persist after the first object has ceased to exist.
-        // The result pointer is still valid outside this method until Skeleton object (as a holder) is alive.
+        const auto event_control_asil_b_it =
+            find_element(skeleton_control_asil_b_local_->event_controls_, element_fq_id);
+        // Suppression rationale: The result pointer is still valid outside this method until Skeleton object (as a
+        // holder) is alive.
         // coverity[autosar_cpp14_m7_5_1_violation]
         // coverity[autosar_cpp14_m7_5_2_violation]
         // coverity[autosar_cpp14_a3_8_1_violation]
-        event_data_control_asil_b = &(event_control_asil_b_it->second.data_control);
+        event_data_control_asil_b_local = &(event_control_asil_b_it->second.data_control);
     }
 
     // Suppress "AUTOSAR C++14 A5-3-2" rule finding. This rule declares: "Null pointers shall not be dereferenced.".
@@ -423,6 +434,18 @@ auto Skeleton::OpenEventDataFromOpenedSharedMemory(const ElementFqId element_fq_
     SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(typed_event_data_storage_ptr != nullptr,
                                                 "Could not get EventDataStorage*");
 
+    ProxyEventDataControlLocalView<>* proxy_event_data_control_local{nullptr};
+    if (proxy_control_local_.has_value())
+    {
+        const auto proxy_event_control_local_it = find_element(proxy_control_local_->event_controls_, element_fq_id);
+        // Suppression rationale: The result pointer is still valid outside this method until Skeleton object (as a
+        // holder) is alive.
+        // coverity[autosar_cpp14_m7_5_1_violation]
+        // coverity[autosar_cpp14_m7_5_2_violation]
+        // coverity[autosar_cpp14_a3_8_1_violation]
+        proxy_event_data_control_local = &(proxy_event_control_local_it->second.data_control);
+    }
+
     // Suppress "AUTOSAR C++14 A3-8-1" rule findings. This rule declares:
     // "An object shall not be accessed outside of its lifetime"
     // The "event_data_control_asil_b" and "typed_event_data_storage_ptr" are still valid lifetime even returned pointer
@@ -433,7 +456,9 @@ auto Skeleton::OpenEventDataFromOpenedSharedMemory(const ElementFqId element_fq_
             // coverity[autosar_cpp14_m7_5_1_violation]
             // coverity[autosar_cpp14_m7_5_2_violation]
             // coverity[autosar_cpp14_a3_8_1_violation]
-            EventDataControlComposite{&event_control_qm_it->second.data_control, event_data_control_asil_b}};
+            EventDataControlComposite{&event_control_qm_it->second.data_control,
+                                      event_data_control_asil_b_local,
+                                      proxy_event_data_control_local}};
 }
 
 template <typename SampleType>
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event.h b/score/mw/com/impl/bindings/lola/skeleton_event.h
index 447b008d2..a41ef3449 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event.h
+++ b/score/mw/com/impl/bindings/lola/skeleton_event.h
@@ -221,7 +221,8 @@ Result<impl::SampleAllocateePtr<SampleType>> SkeletonEvent<SampleType>::Allocate
     // This suppression is unnecessary as the operands do not contain binary operators.
     // A bug ticket has been created to track this: [Ticket-165315](broken_link_j/Ticket-165315)
     // coverity[autosar_cpp14_a5_2_6_violation : FALSE]
-    if (!qm_disconnect_ && event_data_control_composite_->GetAsilBEventDataControl().has_value() && !slot.IsValidQM())
+    if (!qm_disconnect_ && (event_data_control_composite_->GetAsilBEventDataControlLocal() != nullptr) &&
+        !slot.IsValidQM())
     {
         qm_disconnect_ = true;
         score::mw::log::LogWarn("lola")
@@ -260,7 +261,6 @@ template <typename SampleType>
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
 ResultBlank SkeletonEvent<SampleType>::PrepareOffer() noexcept
 {
-
     std::tie(event_data_storage_, event_data_control_composite_) =
         event_shared_impl_.GetParent().template Register<SampleType>(event_shared_impl_.GetElementFQId(),
                                                                      event_properties_);
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_common.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_common.cpp
index 894c3c79c..d468a63ba 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event_common.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_common.cpp
@@ -102,8 +102,8 @@ void SkeletonEventCommon::EmplaceTransactionLogRegistrationGuard()
 {
     SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(event_data_control_composite_ref_.has_value(),
                                                 "EventDataControlComposite must be initialized.");
-    score::cpp::ignore = transaction_log_registration_guard_.emplace(
-        TransactionLogRegistrationGuard::Create(event_data_control_composite_ref_.value().GetQmEventDataControl()));
+    score::cpp::ignore = transaction_log_registration_guard_.emplace(TransactionLogRegistrationGuard::Create(
+        event_data_control_composite_ref_.value().GetQmEventDataControlLocal()));
 }
 
 void SkeletonEventCommon::EmplaceTypeErasedSamplePtrsGuard()
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.cpp
new file mode 100644
index 000000000..ad7b8392c
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.cpp
@@ -0,0 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h"
+
+namespace score::mw::com::impl::lola
+{
+
+SkeletonEventControlLocalView::SkeletonEventControlLocalView(EventControl& event_control_shared_mem) noexcept
+    : data_control{event_control_shared_mem.data_control}
+{
+}
+
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h b/score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h
new file mode 100644
index 000000000..6e1756ef2
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h
@@ -0,0 +1,38 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#ifndef SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_CONTROL_LOCAL_VIEW_H
+#define SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_CONTROL_LOCAL_VIEW_H
+
+#include "score/mw/com/impl/bindings/lola/event_control.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
+
+namespace score::mw::com::impl::lola
+{
+
+class SkeletonEventControlLocalView
+{
+  public:
+    using SubscriberCountType = EventSubscriptionControl::SubscriberCountType;
+    SkeletonEventControlLocalView(EventControl& event_control_shared_mem) noexcept;
+
+    // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall
+    // be private.". There are no class invariants to maintain which could be violated by directly accessing member
+    // variables.
+    // coverity[autosar_cpp14_m11_0_1_violation]
+    SkeletonEventDataControlLocalView<> data_control;
+    // coverity[autosar_cpp14_m11_0_1_violation]
+};
+
+}  // namespace score::mw::com::impl::lola
+
+#endif  // SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_CONTROL_LOCAL_VIEW_H
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp
new file mode 100644
index 000000000..3451bd1b1
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp
@@ -0,0 +1,304 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
+
+#include "score/mw/com/impl/bindings/lola/event_slot_status.h"
+
+#include <score/assert.hpp>
+
+#include <atomic>
+#include <iostream>
+#include <limits>
+
+namespace score::mw::com::impl::lola
+{
+
+namespace
+{
+
+constexpr auto MAX_ALLOCATE_RETRIES = 100U;
+
+}  // namespace
+
+template <template <class> class AtomicIndirectorType>
+SkeletonEventDataControlLocalView<AtomicIndirectorType>::SkeletonEventDataControlLocalView(
+    EventDataControl& event_data_control) noexcept
+    : state_slots_{event_data_control.state_slots_.begin(), event_data_control.state_slots_.size()},
+      transaction_log_set_{event_data_control.transaction_log_set_}
+{
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'selected_index.value()' in case the selected_index doesn't
+// 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 SkeletonEventDataControlLocalView<AtomicIndirectorType>::AllocateNextSlot() noexcept -> ControlSlotIndicator
+{
+    // initially we have a default constructed "invalid" control-slot-indicator
+    ControlSlotIndicator selected_slot{};
+    std::uint64_t retry_counter{0U};
+
+    for (; retry_counter <= MAX_ALLOCATE_RETRIES; ++retry_counter)
+    {
+        selected_slot = FindOldestUnusedSlot();
+
+        if (!selected_slot.IsValid())
+        {
+            continue;
+        }
+
+        const auto& slot = selected_slot.GetSlot();
+        const auto slot_value =
+            AtomicIndirectorType<EventSlotStatus::value_type>::load(slot, std::memory_order_acquire);
+        EventSlotStatus status{slot_value};
+
+        // we need to check that this is still the same, since it is possible that is has changed after we found it
+        // earlier
+        if ((status.GetReferenceCount() != static_cast<EventSlotStatus::SubscriberCount>(0)) || status.IsInWriting())
+        {
+            continue;
+        }
+
+        EventSlotStatus status_new{};  // This will set the refcount to 0 by default
+        status_new.MarkInWriting();
+
+        auto status_value_type = static_cast<EventSlotStatus::value_type&>(status);
+        auto status_new_value_type = static_cast<EventSlotStatus::value_type&>(status_new);
+        if (selected_slot.GetSlot().compare_exchange_weak(
+                status_value_type, status_new_value_type, std::memory_order_acq_rel))
+        {
+            break;
+        }
+    }
+
+    score::cpp::ignore = num_alloc_retries.fetch_add(retry_counter);
+
+    if ((retry_counter >= MAX_ALLOCATE_RETRIES) && (!selected_slot.IsValid()))
+    {
+        ++num_alloc_misses;
+    }
+
+    return selected_slot;
+}
+
+template <template <class> class AtomicIndirectorType>
+// 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, no way for throwing std::terminate().
+// coverity[autosar_cpp14_a15_5_3_violation : FALSE]
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::FindOldestUnusedSlot() noexcept -> ControlSlotIndicator
+{
+    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".
+    // There is no C-style cast happening here! "current_index" and "it" are automatically deduced.
+    // Suppress "AUTOSAR C++14 M6-5-5" finding rule. This rule states: "A loop-control-variable other than the
+    // loop-counter shall not be modified within condition or expression".
+    // Both variables (current_index, it) depict exactly the same element once via index addressing and once via
+    // iterator/raw-pointer! The func has to return both, and we want both to be fully in sync, therefore we increment
+    // them both symmetrically, since in this case, it is less error-prone!
+    // Suppress "AUTOSAR C++14 A4-7-1" finding rule. This rule states: "An integer expression shall not lead to data
+    // loss". This can not be the case as the type of current_index is correctly deduced from SlotIndexType and it is
+    // assured, that state_slots_ doesn't contain more elements than SlotIndexType can represent.
+    // Suppress "AUTOSAR C++14 M5-0-15". This rule states:"indexing shall be the only form of pointer arithmetic.".
+    // Rationale: Tolerated due to containers providing pointer-like iterators.
+    // The Coverity tool considers these iterators as raw pointers.
+    // Suppress "AUTOSAR C++14 M5-2-10". This rule states: "The increment (++) and decrement (--) operators shall not be
+    // mixed with other operators in an expression".
+    // Rationale: We are only using increment operators here on separate variables! That we use it on separate variables
+    // is explained above for M6-5-5.
+    // coverity[autosar_cpp14_a5_2_2_violation]
+    for (auto [current_index, it] = std::make_tuple(SlotIndexType{0U}, state_slots_.begin()); it != state_slots_.end();
+         // coverity[autosar_cpp14_m6_5_5_violation]
+         // coverity[autosar_cpp14_a4_7_1_violation]
+         // coverity[autosar_cpp14_m5_0_15_violation]
+         // coverity[autosar_cpp14_m5_2_10_violation]
+         ++it,
+                              // coverity[autosar_cpp14_a4_7_1_violation]
+                              // coverity[autosar_cpp14_m6_5_5_violation]
+         ++current_index)
+    {
+        // coverity[autosar_cpp14_a5_3_2_violation]
+        const EventSlotStatus status{
+            AtomicIndirectorType<EventSlotStatus::value_type>::load(*it, std::memory_order_acquire)};
+
+        if (status.IsInvalid())
+        {
+            selected_slot = {current_index, *it};
+            break;
+        }
+
+        const auto are_proxies_referencing_slot =
+            status.GetReferenceCount() != static_cast<EventSlotStatus::SubscriberCount>(0U);
+        if (!are_proxies_referencing_slot && !status.IsInWriting())
+        {
+            if (status.GetTimeStamp() < oldest_time_stamp)
+            {
+                oldest_time_stamp = status.GetTimeStamp();
+                selected_slot = {current_index, *it};
+            }
+        }
+    }
+    return selected_slot;
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
+// 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 SkeletonEventDataControlLocalView<AtomicIndirectorType>::EventReady(
+    ControlSlotIndicator slot_indicator,
+    const EventSlotStatus::EventTimeStamp time_stamp) noexcept -> void
+{
+    const EventSlotStatus initial{time_stamp, 0U};
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
+    slot_indicator.GetSlot().store(static_cast<EventSlotStatus::value_type>(
+        initial));  // no race-condition can happen, since event sender has to be single-threaded/non-concurrent per AoU
+}
+
+template <template <class> class AtomicIndirectorType>
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::Discard(ControlSlotIndicator slot_indicator) -> void
+{
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
+    auto slot = static_cast<EventSlotStatus>(slot_indicator.GetSlot().load(std::memory_order_acquire));
+    if (slot.IsInWriting())
+    {
+        slot.MarkInvalid();
+        slot_indicator.GetSlot().store(static_cast<EventSlotStatus::value_type>(slot), std::memory_order_release);
+    }
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
+// 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 SkeletonEventDataControlLocalView<AtomicIndirectorType>::ReferenceSpecificEvent(
+    const SlotIndexType slot_index,
+    const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept -> void
+{
+    // Sanity check that the slot is currently ready for reading. It's up to the caller to ensure that this function is
+    // not called in a context in which the status can change to in writing or invalid while this function is running.
+    const auto slot_current_status =
+        static_cast<EventSlotStatus>(state_slots_[slot_index].load(std::memory_order_relaxed));
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(
+        !(slot_current_status.IsInWriting() || slot_current_status.IsInvalid()),
+        "An event slot can only be referenced once it's ready for reading.");
+
+    auto& transaction_log = transaction_log_set_.get().GetTransactionLog(transaction_log_index);
+
+    // Since this function must be called when the slot is already ready for reading, we can simply increment the ref
+    // count.
+    transaction_log.ReferenceTransactionBegin(slot_index);
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
+    const auto old_slot_value = AtomicIndirectorType<EventSlotStatus::value_type>::fetch_add(
+        state_slots_[slot_index], static_cast<EventSlotStatus::value_type>(1U), std::memory_order_acq_rel);
+
+    // If the slot value overflows then the value is completely invalid which is an unrecoverable error. If we try to
+    // restart the provider, then it should contain an uncommitted reference transaction which will cause the restart to
+    // fail.
+    SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(EventSlotStatus{old_slot_value}.GetReferenceCount() !=
+                                                          std::numeric_limits<EventSlotStatus::SubscriberCount>::max(),
+                                                      "Reference count overflowed which cannot be recovered from.");
+    transaction_log.ReferenceTransactionCommit(slot_index);
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
+// 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]
+void SkeletonEventDataControlLocalView<AtomicIndirectorType>::DereferenceEventWithoutTransactionLogging(
+    const SlotIndexType event_slot_index) noexcept
+{
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(event_slot_index) < state_slots_.size());
+    score::cpp::ignore = state_slots_[event_slot_index].fetch_sub(1U, std::memory_order_acq_rel);
+}
+
+template <template <class> class AtomicIndirectorType>
+// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
+// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
+// 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 SkeletonEventDataControlLocalView<AtomicIndirectorType>::operator[](const SlotIndexType slot_index) const noexcept
+    -> EventSlotStatus
+{
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
+    return static_cast<EventSlotStatus>(state_slots_[slot_index].load(std::memory_order_acquire));
+}
+
+template <template <class> class AtomicIndirectorType>
+// 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, no way for throwing std::terminate().
+// coverity[autosar_cpp14_a15_5_3_violation : FALSE]
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::RemoveAllocationsForWriting() noexcept -> void
+{
+    // Suppres "AUTOSAR C++14 A5-3-2" finding rule. This rule states: "Null pointers shall not be dereferenced.".
+    // The "slot" variable must never be a null pointer, since DynamicArray allocates its elements when it is created.
+    // coverity[autosar_cpp14_a5_3_2_violation]
+    for (auto& slot : state_slots_)
+    {
+        // coverity[autosar_cpp14_a5_3_2_violation]
+        EventSlotStatus status{
+            AtomicIndirectorType<EventSlotStatus::value_type>::load(slot, std::memory_order_acquire)};
+
+        if (status.IsInWriting())
+        {
+            EventSlotStatus status_new{};
+
+            auto status_value_type = static_cast<EventSlotStatus::value_type&>(status);
+            auto status_new_value_type = static_cast<EventSlotStatus::value_type&>(status_new);
+            // coverity[autosar_cpp14_a5_3_2_violation]
+            if (slot.compare_exchange_strong(status_value_type, status_new_value_type, std::memory_order_acq_rel) ==
+                false)
+            {
+                // atomic could not be changed, contract violation (other skeleton must be dead, nobody other should
+                // change the slot)
+                std::terminate();
+            }
+        }
+    }
+}
+
+template <template <class> class AtomicIndirectorType>
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::DumpPerformanceCounters() -> void
+{
+    std::cout << "EventDataControlImpl performance breakdown\n"
+              << "======================================\n"
+              << "\nnum_alloc_misses:  " << num_alloc_misses << "\nnum_alloc_retries: "
+              << num_alloc_retries
+              // Suppress AUTOSAR C++14 M8-4-4, rule finding: "A function identifier shall either be used to call the
+              // function or it shall be preceded by &". Passing std::endl to std::cout object with the stream operator
+              // follows the idiomatic way that both features in conjunction were designed in the C++ standard.
+              // coverity[autosar_cpp14_m8_4_4_violation : FALSE]
+              << std::endl;
+}
+
+template <template <class> class AtomicIndirectorType>
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::ResetPerformanceCounters() -> void
+{
+    num_alloc_misses.store(0U);
+    num_alloc_retries.store(0U);
+}
+
+template class SkeletonEventDataControlLocalView<memory::shared::AtomicIndirectorReal>;
+template class SkeletonEventDataControlLocalView<memory::shared::AtomicIndirectorMock>;
+
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h
new file mode 100644
index 000000000..8900ac477
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h
@@ -0,0 +1,178 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_DATA_CONTROL_LOCAL_VIEW_H
+#define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_DATA_CONTROL_LOCAL_VIEW_H
+
+#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
+#include "score/mw/com/impl/bindings/lola/control_slot_types.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/transaction_log_set.h"
+
+#include "score/memory/shared/atomic_indirector.h"
+
+#include <score/span.hpp>
+
+#include <atomic>
+
+namespace score::mw::com::impl::lola
+{
+// 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]
+class EventDataControlAttorney;
+// 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]
+class EventDataControlCompositeAttorney;
+
+// 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 EventDataControlComposite;
+
+/// \brief View class which provides functionality for interacting with EventDataControl.
+///
+/// \details EventDataControl contains control information for an event which is stored in shared memory. Accessing the
+/// control information directly in shared memory during runtime requires using (dereferencing, copying etc.) OffsetPtrs
+/// which can negatively affect performance. Therefore, the data in EventDataControl is created / opened once during
+/// Skeleton / Proxy creation, and then is accessed during runtime via EventDataControlLocal.
+template <template <class> class AtomicIndirectorType = memory::shared::AtomicIndirectorReal>
+class SkeletonEventDataControlLocalView final
+{
+    // Suppress "AUTOSAR C++14 A11-3-1", The rule declares: "Friend declarations shall not be used".
+    // The "EventDataControlAttorney" class is a helper, which sets the internal state of
+    // "EventDataControl" accessing private members and used for testing purposes only.
+    // coverity[autosar_cpp14_a11_3_1_violation]
+    friend class lola::EventDataControlAttorney;
+    // 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
+    // "EventDataControl" accessing private members and used for testing purposes only.
+    // 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 EventDataControlComposite;
+
+  public:
+    using LocalEventControlSlots = score::cpp::span<ControlSlotType>;
+
+    SkeletonEventDataControlLocalView(EventDataControl& event_data_control) noexcept;
+
+    ~SkeletonEventDataControlLocalView() noexcept = default;
+
+    SkeletonEventDataControlLocalView(const SkeletonEventDataControlLocalView&) = delete;
+    SkeletonEventDataControlLocalView& operator=(const SkeletonEventDataControlLocalView&) = delete;
+    SkeletonEventDataControlLocalView(SkeletonEventDataControlLocalView&&) noexcept = delete;
+    SkeletonEventDataControlLocalView& operator=(SkeletonEventDataControlLocalView&& other) noexcept = delete;
+
+    /// \brief Checks for the oldest unused slot and acquires for writing (thread-safe, wait-free)
+    ///
+    /// \details This method will perform retries (bounded) on data-races. In order to ensure that _always_
+    /// a slot is found, it needs to be ensured that:
+    /// * enough slots are allocated (sum of all possible max allocations by consumer + 1)
+    /// * enough retries are performed (currently max number of parallel actions is restricted to 50 (number of
+    /// possible transactions (2) * number of parallel actions = number of retries))
+    ///
+    /// \return reserved slot for writing in the form of a valid ControlSlotIndicator if found, invalid
+    ///         ControlSlotIndicator otherwise
+    /// \post EventReady() is invoked to withdraw write-ownership
+    ControlSlotIndicator AllocateNextSlot() noexcept;
+
+    /// \brief Indicates that a slot is ready for reading - writing has finished. (thread-safe, wait-free)
+    /// \pre AllocateNextSlot() was invoked to obtain write-ownership
+    void EventReady(ControlSlotIndicator slot_indicator, const EventSlotStatus::EventTimeStamp time_stamp) noexcept;
+
+    /// \brief Marks selected slot as invalid, if it was not yet marked as ready
+    ///
+    /// \details We don't discard elements that are already ready, since it is possible that a user might already
+    /// read them. This just might be the case if a SampleAllocateePtr is destroyed after invoking Send().
+    ///
+    /// \pre AllocateNextSlot() was invoked to obtain write-ownership
+    void Discard(ControlSlotIndicator slot_indicator);
+
+    /// \brief Increments refcount of given slot by one (given it is in the correct state i.e. being accessible/
+    ///        readable)
+    /// \details This is a specific feature - not used by the standard proxy/consumer, which is using
+    ///          ReferenceNextEvent(). This API has been introduced in the context of IPC-Tracing, where a skeleton is
+    ///          referencing/using a slot it just has allocated to trace out the content via Trace-API and
+    ///          de-referencing it after tracing of the slot data has been accomplished.
+    ///          IMPORTANT: This function is _ONLY_ threadsafe with another function incrementing the ref count of a
+    ///          slot (e.g. via ReferenceNextEvent). The function must _NOT_ be called in a context in which another
+    ///          thread could mark the slot as invalid or marked for writing concurrently with this function. If this
+    ///          function is called by the SkeletonEvent itself before handing out a SampleAllocateePtr to the user,
+    ///          then it is safe.
+    /// \param slot_index index of the slot to be referenced.
+    void ReferenceSpecificEvent(const SlotIndexType slot_index,
+                                const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
+
+    /// \brief Indicates that a consumer is finished reading (thread-safe, wait-free).
+    /// \pre ReferenceNextEvent() was invoked to obtain read-ownership
+    ///
+    /// \details Will not record the transaction in any TransactionLog. This function is called by the
+    /// TransactionLog::DereferenceSlotCallback created within TransactionLogSet::RollbackProxyTransactions and
+    /// RollbackSkeletonTracingTransactions. In these cases, the transaction will be recorded within
+    /// TransactionLog::RollbackIncrementTransactions resp. RollbackSubscribeTransactions before calling the callback.
+    void DereferenceEventWithoutTransactionLogging(const SlotIndexType event_slot_index) noexcept;
+
+    // /// \brief Directly access EventSlotStatus for one specific slot
+    EventSlotStatus operator[](const SlotIndexType slot_index) const noexcept;
+
+    /// \brief Marks all Slots which are `InWriting` as `Invalid`.
+    /// \details This function shall _only_ be called on skeleton side and _only_ if a previous skeleton instance died.
+    void RemoveAllocationsForWriting() noexcept;
+
+    // Suppress "AUTOSAR C++14 A9-3-1" rule finding: "Member functions shall not return non-const “raw” pointers or
+    // references to private or protected data owned by the class.".
+    // To avoid overhead such as shared_ptr in the result, a non-const reference to the instance is returned instead.
+    // This instance exposes another sub-API that can change the its state and therefore also the state of instance
+    // holder. API callers get the reference and use it in place without leaving the scope, so the reference remains
+    // valid.
+    // coverity[autosar_cpp14_a9_3_1_violation]
+    TransactionLogSet& GetTransactionLogSet() noexcept
+    {
+        // coverity[autosar_cpp14_a9_3_1_violation] see above
+        return transaction_log_set_;
+    }
+
+    // helper for performance indication (no production usage)
+    static void DumpPerformanceCounters();
+    static void ResetPerformanceCounters();
+
+  private:
+    /// \brief Finds oldest unused slot within control slots, if there is any.
+    /// \return if an unused slot is found, returns a ControlSlotIndicator, which is valid, otherwise an invalid
+    ///         ControlSlotIndicator is returned.
+    ControlSlotIndicator FindOldestUnusedSlot() noexcept;
+
+    LocalEventControlSlots state_slots_;
+
+    std::reference_wrapper<TransactionLogSet> transaction_log_set_;
+
+    // helper variables to calculated performance indicators
+    static inline std::atomic_uint_fast64_t num_alloc_misses{0U};
+    static inline std::atomic_uint_fast64_t num_alloc_retries{0U};
+};
+
+}  // namespace score::mw::com::impl::lola
+
+#endif  // SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_DATA_CONTROL_LOCAL_VIEW_H
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp
new file mode 100644
index 000000000..ea219795b
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp
@@ -0,0 +1,447 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.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/test_doubles/fake_memory_resource.h"
+
+#include "score/memory/shared/atomic_indirector.h"
+#include "score/memory/shared/atomic_mock.h"
+
+#include <score/utility.hpp>
+
+#include <gtest/gtest.h>
+
+#include <chrono>
+#include <limits>
+#include <random>
+#include <thread>
+#include <vector>
+
+namespace score::mw::com::impl::lola
+{
+
+namespace
+{
+
+using ::testing::_;
+using ::testing::Return;
+
+constexpr std::size_t kMaxSlots{5U};
+constexpr std::size_t kMaxSubscribers{5U};
+const TransactionLogId kDummyTransactionLogId{10U};
+
+constexpr auto kSlotIsInWriting = std::numeric_limits<EventSlotStatus::SubscriberCount>::max();
+
+std::size_t RandomNumberBetween(std::size_t lower, std::size_t upper)
+{
+    std::mt19937_64 random_number_generator{};
+    auto time_seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+    std::seed_seq sequence_seed{uint32_t(time_seed & 0xffffffff), std::uint32_t(time_seed >> 32)};
+    random_number_generator.seed(sequence_seed);
+    std::uniform_int_distribution<std::size_t> number_distribution(lower, upper);
+    return number_distribution(random_number_generator);
+}
+
+class SkeletonEventDataControlLocalViewFixture : public ::testing::Test
+{
+  public:
+    static void SetUpTestSuite()
+    {
+        // we are annotating this requirement coverage for SSR-6225206 on test-suite level, as all
+        // test cases within this suite verify the slot-allocation/usage algo defined in SSR-6225206
+        RecordProperty("Verifies", "SSR-6225206");
+        RecordProperty("Description", "Ensures correct slot allocation algorithm");
+        RecordProperty("TestType", "Requirements-based test");
+        RecordProperty("Priority", "1");
+        RecordProperty("DerivationTechnique", "Analysis of requirements");
+    }
+
+    void TearDown() override
+    {
+        memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(nullptr);
+    }
+
+    SkeletonEventDataControlLocalViewFixture& GivenARealSkeletonEventDataControlLocalView(
+        const SlotIndexType max_slots,
+        const LolaEventInstanceDeployment::SubscriberCountType max_subscribers)
+    {
+        event_data_control_ = std::make_unique<EventDataControl>(max_slots, memory_, max_subscribers);
+        unit_ = std::make_unique<SkeletonEventDataControlLocalView<>>(*event_data_control_);
+
+        return *this;
+    }
+
+    SkeletonEventDataControlLocalViewFixture& GivenAMockedEventDataControl(
+        const SlotIndexType max_slots,
+        const LolaEventInstanceDeployment::SubscriberCountType max_subscribers)
+    {
+        event_data_control_ = std::make_unique<EventDataControl>(max_slots, memory_, 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<SkeletonEventDataControlLocalView<memory::shared::AtomicIndirectorMock>>(
+            *event_data_control_);
+
+        return *this;
+    }
+
+    SlotIndexType WithAnAllocatedSlot(EventSlotStatus::EventTimeStamp timestamp = 1)
+    {
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(unit_ != nullptr);
+        auto slot = unit_->AllocateNextSlot();
+        EXPECT_TRUE(slot.IsValid());
+        unit_->EventReady(slot, timestamp);
+        return slot.GetIndex();
+    }
+
+    FakeMemoryResource memory_{};
+    std::unique_ptr<memory::shared::AtomicMock<EventSlotStatus::value_type>> atomic_mock_{nullptr};
+
+    std::unique_ptr<EventDataControl> event_data_control_{nullptr};
+    std::unique_ptr<SkeletonEventDataControlLocalView<>> unit_{nullptr};
+    std::unique_ptr<SkeletonEventDataControlLocalView<memory::shared::AtomicIndirectorMock>> unit_mock_{nullptr};
+};
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateOneSlotWithoutContention)
+{
+    RecordProperty("Verifies", "SCR-5899076");
+    RecordProperty("Description", "Ensures that a slot can be allocated");
+    RecordProperty("TestType", "Requirements-based test");
+    RecordProperty("Priority", "1");
+    RecordProperty("DerivationTechnique", "Analysis of requirements");
+
+    // Given an initialized EventDataControl structure
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+
+    // When allocating a slot
+    auto slot = unit_->AllocateNextSlot();
+
+    EXPECT_TRUE(slot.IsValid());
+    // The expected (first) slot is returned
+    EXPECT_EQ(slot.GetIndex(), 0);
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateOneSlotWhenReferenceCountChanges)
+{
+    RecordProperty("Verifies", "SCR-5899076");
+    RecordProperty("Description", "Ensures that a slot can be allocated");
+    RecordProperty("TestType", "Requirements-based test");
+    RecordProperty("Priority", "1");
+    RecordProperty("DerivationTechnique", "Analysis of requirements");
+
+    // Given an initialized EventDataControl structure
+    score::cpp::ignore = GivenAMockedEventDataControl(kMaxSlots, kMaxSubscribers);
+
+    // And an atomic mimicking two relevant slots where ...
+    EXPECT_CALL(*atomic_mock_, load(_))
+        // ... first slot is unreferenced for the first iteration in FindOldestUnusedSlot()
+        .WillOnce([] {
+            EventSlotStatus invalid_event_slot_status{};
+            return static_cast<EventSlotStatus::value_type>(invalid_event_slot_status);
+        })
+        // ... first slot was set to in-writing by a different party at the last possible time right before we check in
+        // AllocateNextSlot()
+        .WillOnce([] {
+            EventSlotStatus event_slot_status_in_writing{};
+            event_slot_status_in_writing.SetReferenceCount(kSlotIsInWriting);
+            return static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing);
+        })
+        // ... first slot keeps in-writing status during next iteration in FindOldestUnusedSlot() and therefore won't be
+        // chosen
+        .WillOnce([] {
+            EventSlotStatus event_slot_status_in_writing{};
+            event_slot_status_in_writing.SetReferenceCount(kSlotIsInWriting);
+            return static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing);
+        })
+        // ... second slot is always unreferenced in all future calls and is therefore chosen
+        .WillRepeatedly([] {
+            EventSlotStatus invalid_event_slot_status{};
+            return static_cast<EventSlotStatus::value_type>(invalid_event_slot_status);
+        });
+
+    // When allocating a slot
+    const auto slot = unit_mock_->AllocateNextSlot();
+
+    EXPECT_TRUE(slot.IsValid());
+    // The expected (second) slot is returned
+    EXPECT_EQ(slot.GetIndex(), 1);
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateMultipleSlotWithoutContention)
+{
+    // Given an initialized EventDataControl structure where already a slot is allocated
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+    unit_->AllocateNextSlot();
+
+    // When allocating a slot
+    const auto slot = unit_->AllocateNextSlot();
+
+    // Then the second possible slot is returned
+    EXPECT_EQ(slot.GetIndex(), 1);
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, DiscardedElementOnWritingWillBeInvalid)
+{
+    // Given an initialized EventDataControl structure where already a slot is allocated
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+    auto slot = unit_->AllocateNextSlot();
+
+    // When discarding that 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());
+    // or via raw-pointer
+    EXPECT_TRUE(EventSlotStatus(slot.GetSlot().load()).IsInvalid());
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, DiscardedElementAfterWritingIsNotTouched)
+{
+    // Given an initialized EventDataControl structure where already a slot is written
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+    const auto slot = unit_->AllocateNextSlot();
+    unit_->EventReady(slot, 0x42);
+
+    // When discarding that slot
+    unit_->Discard(slot);
+
+    // Then the slot is not touched
+    EXPECT_EQ((*unit_)[slot.GetIndex()].GetTimeStamp(), 0x42);
+    EXPECT_EQ((*unit_)[slot.GetIndex()].GetReferenceCount(), 0);
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, CanNotAllocateSlotIfAllSlotsAllocated)
+{
+    // Given an initialized EventDataControl structure where all slots are allocated
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+    for (auto counter = 0; counter < 5; ++counter)
+    {
+        unit_->AllocateNextSlot();
+    }
+
+    // When trying to allocate another slot
+    const auto slot = unit_->AllocateNextSlot();
+
+    // Then this is not possible
+    EXPECT_FALSE(slot.IsValid());
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateSlotAfterOneSlotReady)
+{
+    // Given an initialized EventDataControl structure where all slots are allocated
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+    std::array<ControlSlotIndicator, 5U> slot_indicators{};
+    for (auto counter = 0U; counter < 5U; ++counter)
+    {
+        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();
+
+    // Then the freed slot is allocated
+    EXPECT_EQ(slot.GetIndex(), 3);
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateOldestSlotAfterOneSlotReady)
+{
+    // Given an initialized EventDataControl structure where all slots are allocated
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+    std::array<ControlSlotIndicator, 5U> slot_indicators{};
+    for (auto counter = 0U; counter < 5U; ++counter)
+    {
+        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();
+
+    // Then the oldest (lowest timestamp) slot is allocated
+    EXPECT_EQ(slot.GetIndex(), 2);
+}
+
+// Initially we had a 'randomized allocate or free logic'.
+// But because of our excessive retry-logic (Ticket-188373) in case of slot exhaustion,
+// this lead to huge test runtimes/timeouts.
+// So we now favor an alternating allocate/free approach, which avoids this issue
+TEST_F(SkeletonEventDataControlLocalViewFixture, MultithreadedSlotAllocationDeallocation)
+{
+    // Given an empty EventDataControl
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+
+    std::atomic<EventSlotStatus::EventTimeStamp> time_stamp{1};
+    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};
+        for (int i = 0; i < 1000; i++)
+        {
+            if ((allocate = !allocate))
+            {
+                const auto slot = unit_->AllocateNextSlot();
+                if (slot.IsValid())
+                {
+                    allocated_events.push_back(slot);
+                }
+            }
+            else
+            {
+                if (!allocated_events.empty())
+                {
+                    const auto index = RandomNumberBetween(0, allocated_events.size() - 1);
+                    unit_->EventReady(allocated_events[index], ++time_stamp);
+                }
+            }
+        }
+    };
+
+    // When accessing it randomly from multiple threads
+    std::vector<std::thread> thread_pool{};
+    for (int i = 0; i < 10; i++)
+    {
+        thread_pool.emplace_back(fuzzer);
+    }
+
+    for (auto& thread : thread_pool)
+    {
+        thread.join();
+    }
+
+    // Then no race-condition or memory corruption occurs
+}
+
+using EventDataControlReferenceSpecificEventFixture = SkeletonEventDataControlLocalViewFixture;
+TEST_F(EventDataControlReferenceSpecificEventFixture, ReferenceSpecificEvents)
+{
+    const std::size_t max_number_slots{6U};
+    const std::size_t subscription_slots{6U};
+
+    // Given an EventDataControl with 6 ready slots
+    GivenARealSkeletonEventDataControlLocalView(max_number_slots, kMaxSubscribers);
+    for (unsigned int i = 0; i < 6; i++)
+    {
+        WithAnAllocatedSlot(i + 1);
+    }
+
+    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);
+    }
+}
+
+using EventDataControlReferenceSpecificEventDeathTest = EventDataControlReferenceSpecificEventFixture;
+TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInvalidTerminates)
+{
+    // Given an EventDataControl with one (initially invalid) slot
+    GivenARealSkeletonEventDataControlLocalView(1, kMaxSubscribers);
+    EXPECT_TRUE((*unit_)[0].IsInvalid());
+
+    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), ".*");
+}
+
+TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_StatusInWritingTerminates)
+{
+    // Given an EventDataControl with one in_writing slot
+    GivenARealSkeletonEventDataControlLocalView(1, kMaxSubscribers);
+    auto slot = unit_->AllocateNextSlot();
+    ASSERT_TRUE(slot.IsValid());
+    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInWriting());
+
+    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), ".*");
+}
+
+TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_ReferenceCountOverFlowsTerminates)
+{
+    memory::shared::AtomicMock<EventSlotStatus::value_type> atomic_mock;
+    memory::shared::AtomicIndirectorMock<EventSlotStatus::value_type>::SetMockObject(&atomic_mock);
+
+    // 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(_, _))
+        .WillByDefault(Return(static_cast<EventSlotStatus::value_type>(event_slot_status_in_writing)));
+
+    // Given an EventDataControl with one slot
+    GivenAMockedEventDataControl(1, kMaxSubscribers);
+    auto slot = unit_mock_->AllocateNextSlot();
+    ASSERT_TRUE(slot.IsValid());
+
+    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_mock_->ReferenceSpecificEvent(static_cast<SlotIndexType>(0), transaction_log_index), ".*");
+}
+
+TEST_F(SkeletonEventDataControlLocalViewFixture, AllocatedSlotsCanBeCleanedUp)
+{
+    RecordProperty("Description", "Tests that all allocated slots can be cleaned up at once.");
+
+    // Given an initialized EventDataControl structure, with allocated slots
+    GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
+    const auto first_slot = unit_->AllocateNextSlot();
+    const auto second_slot = unit_->AllocateNextSlot();
+
+    // When cleaning up allocations
+    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());
+}
+
+using EventDataControlDeathTest = SkeletonEventDataControlLocalViewFixture;
+TEST_F(EventDataControlDeathTest, FailingToCleanUpSlotDueToOtherThreadModifyingAtomicTerminates)
+{
+    GivenAMockedEventDataControl(kMaxSlots, kMaxSubscribers);
+
+    // 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(_))
+        .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));
+
+    // When cleaning up allocations
+    // Then the program terminates
+    EXPECT_DEATH(unit_mock_->RemoveAllocationsForWriting(), ".*");
+}
+
+}  // namespace
+}  // namespace score::mw::com::impl::lola
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 6da435b61..2a6b0e5cb 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
@@ -94,6 +94,14 @@ class SkeletonEventTracingFixture : public SkeletonEventFixture
         EXPECT_TRUE(event_data_control_compositve.has_value());
         return event_data_control_compositve.value().GetEventSlotTimestamp(slot);
     }
+
+    TransactionLogSet& GetTransactionLogSet()
+    {
+        auto* const event_control = GetEventControl(fake_element_fq_id_, QualityType::kASIL_QM);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(event_control != nullptr);
+        SkeletonEventControlLocalView event_control_local{*event_control};
+        return event_control_local.data_control.GetTransactionLogSet();
+    }
 };
 
 using SkeletonEventTracingSendFixture = SkeletonEventTracingFixture;
@@ -469,8 +477,7 @@ TEST_F(SkeletonEventTracingPrepareOfferFixture, DisablingTracingWillNotRegisterT
     std::ignore = skeleton_event_->PrepareOffer();
 
     // Then a TransactionLog is not registered
-    auto& transaction_log_set =
-        GetEventControl(fake_element_fq_id_, QualityType::kASIL_QM)->data_control.GetTransactionLogSet();
+    auto& transaction_log_set = GetTransactionLogSet();
     const auto skeleton_transaction_log_result =
         TransactionLogSetAttorney{transaction_log_set}.GetSkeletonTransactionLog();
     ASSERT_FALSE(skeleton_transaction_log_result.has_value());
@@ -496,8 +503,7 @@ TEST_F(SkeletonEventTracingPrepareOfferFixture, EnablingSendTracingWillRegisterT
     std::ignore = skeleton_event_->PrepareOffer();
 
     // Then a TransactionLog is registered
-    auto& transaction_log_set =
-        GetEventControl(fake_element_fq_id_, QualityType::kASIL_QM)->data_control.GetTransactionLogSet();
+    auto& transaction_log_set = GetTransactionLogSet();
     const auto skeleton_transaction_log_result =
         TransactionLogSetAttorney{transaction_log_set}.GetSkeletonTransactionLog();
     ASSERT_TRUE(skeleton_transaction_log_result.has_value());
@@ -523,8 +529,7 @@ TEST_F(SkeletonEventTracingPrepareOfferFixture, EnablingSendWithAllocateTracingW
     std::ignore = skeleton_event_->PrepareOffer();
 
     // Then a TransactionLog is registered
-    auto& transaction_log_set =
-        GetEventControl(fake_element_fq_id_, QualityType::kASIL_QM)->data_control.GetTransactionLogSet();
+    auto& transaction_log_set = GetTransactionLogSet();
     const auto skeleton_transaction_log_result =
         TransactionLogSetAttorney{transaction_log_set}.GetSkeletonTransactionLog();
     ASSERT_TRUE(skeleton_transaction_log_result.has_value());
@@ -551,8 +556,7 @@ TEST_F(SkeletonEventTracingPrepareStopOfferFixture, PrepareStopOfferWillRemoveRe
     std::ignore = skeleton_event_->PrepareOffer();
 
     // Then a TransactionLog is registered
-    auto& transaction_log_set =
-        GetEventControl(fake_element_fq_id_, QualityType::kASIL_QM)->data_control.GetTransactionLogSet();
+    auto& transaction_log_set = GetTransactionLogSet();
     ASSERT_TRUE(TransactionLogSetAttorney{transaction_log_set}.GetSkeletonTransactionLog().has_value());
 
     // and when calling PrepareStopOffer
@@ -582,8 +586,7 @@ TEST_F(SkeletonEventTracingPrepareStopOfferFixture, PrepareStopOfferWillNotRemov
 
     // Then a TransactionLog is not registered, because expected_enabled_trace_points has no corresponding trace points
     // enabled
-    auto& transaction_log_set =
-        GetEventControl(fake_element_fq_id_, QualityType::kASIL_QM)->data_control.GetTransactionLogSet();
+    auto& transaction_log_set = GetTransactionLogSet();
     ASSERT_FALSE(TransactionLogSetAttorney{transaction_log_set}.GetSkeletonTransactionLog().has_value());
 
     // and when calling PrepareStopOffer
diff --git a/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.cpp b/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.cpp
new file mode 100644
index 000000000..a835ee45f
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.cpp
@@ -0,0 +1,13 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h"
diff --git a/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h b/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h
new file mode 100644
index 000000000..df8a87614
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h
@@ -0,0 +1,66 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#ifndef SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_SERVICE_DATA_CONTROL_LOCAL_VIEW_H
+#define SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_SERVICE_DATA_CONTROL_LOCAL_VIEW_H
+
+#include "score/mw/com/impl/bindings/lola/element_fq_id.h"
+#include "score/mw/com/impl/bindings/lola/service_data_control.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h"
+
+#include <score/assert.hpp>
+
+#include <tuple>
+#include <utility>
+
+namespace score::mw::com::impl::lola
+{
+
+/// SkeletonServiceDataControlLocalView is a view class which stores views to the individual objects in shared memory.
+///
+/// This class will be created by a Proxy on construction. It provides a local view into all the elements within
+/// ServiceDataControl. Since the memory layout of ServiceDataControl will never change after construction (e.g. the
+/// event_controls_ map will never be resized after construction), each Proxy can simply create a
+/// SkeletonServiceDataControlLocalView to avoid accessing the shared memory via OffsetPtr. Additional information about
+/// the performance impacts of OffsetPtr are described in EventDataControl.
+class SkeletonServiceDataControlLocalView
+{
+  public:
+    explicit SkeletonServiceDataControlLocalView(ServiceDataControl& service_data_control) : event_controls_{}
+    {
+        for (auto& element : service_data_control.event_controls_)
+        {
+            const auto insertion_result = event_controls_.emplace(
+                std::piecewise_construct, std::forward_as_tuple(element.first), std::forward_as_tuple(element.second));
+
+            const bool was_inserted = insertion_result.second;
+            SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(was_inserted);
+        }
+    }
+
+    ~SkeletonServiceDataControlLocalView() noexcept = default;
+
+    SkeletonServiceDataControlLocalView(const SkeletonServiceDataControlLocalView&) = delete;
+    SkeletonServiceDataControlLocalView& operator=(const SkeletonServiceDataControlLocalView&) = delete;
+    SkeletonServiceDataControlLocalView(SkeletonServiceDataControlLocalView&&) noexcept = delete;
+    SkeletonServiceDataControlLocalView& operator=(SkeletonServiceDataControlLocalView&& other) noexcept = delete;
+
+    // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall
+    // be private.". There are no class invariants to maintain which could be violated by directly accessing member
+    // variables.
+    // coverity[autosar_cpp14_m11_0_1_violation]
+    score::memory::shared::Map<ElementFqId, SkeletonEventControlLocalView> event_controls_;
+};
+
+}  // namespace score::mw::com::impl::lola
+
+#endif  // SCORE_AAS_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_SERVICE_DATA_CONTROL_LOCAL_VIEW_H
diff --git a/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view_test.cpp
new file mode 100644
index 000000000..95d43a7a2
--- /dev/null
+++ b/score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view_test.cpp
@@ -0,0 +1,147 @@
+/********************************************************************************
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/service_data_control_local.h"
+
+#include "score/mw/com/impl/bindings/lola/element_fq_id.h"
+#include "score/mw/com/impl/bindings/lola/event_control_local.h"
+#include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/service_data_control.h"
+#include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
+
+#include <gtest/gtest.h>
+
+#include <tuple>
+#include <utility>
+
+namespace score::mw::com::impl::lola
+{
+namespace
+{
+
+constexpr bool kEnforceMaxSamples{true};
+
+class ServiceDataControlLocalFixture : public ::testing::Test
+{
+  public:
+    ServiceDataControlLocalFixture()
+    {
+        score::cpp::ignore =
+            service_data_control_.event_controls_.emplace(std::piecewise_construct,
+                                                          std::forward_as_tuple(element_fq_id_0_),
+                                                          std::forward_as_tuple(max_slots_0_,
+                                                                                max_number_combined_subscribers_0_,
+                                                                                kEnforceMaxSamples,
+                                                                                memory_.getMemoryResourceProxy()));
+        score::cpp::ignore =
+            service_data_control_.event_controls_.emplace(std::piecewise_construct,
+                                                          std::forward_as_tuple(element_fq_id_1_),
+                                                          std::forward_as_tuple(max_slots_1_,
+                                                                                max_number_combined_subscribers_1_,
+                                                                                kEnforceMaxSamples,
+                                                                                memory_.getMemoryResourceProxy()));
+    }
+
+    EventControlLocal& GetEventControlLocal(ServiceDataControlLocal& service_data_control_local,
+                                            const ElementFqId element_fq_id)
+    {
+        auto event_control_local_it = service_data_control_local.event_controls_.find(element_fq_id);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(event_control_local_it != service_data_control_local.event_controls_.end());
+        return event_control_local_it->second;
+    }
+
+    EventControl& GetEventControl(ServiceDataControl& service_data_control, const ElementFqId element_fq_id)
+    {
+        auto event_control_it = service_data_control.event_controls_.find(element_fq_id);
+        SCORE_LANGUAGE_FUTURECPP_ASSERT(event_control_it != service_data_control.event_controls_.end());
+        return event_control_it->second;
+    }
+
+    ElementFqId element_fq_id_0_{10U, 20U, 30U, ServiceElementType::EVENT};
+    ElementFqId element_fq_id_1_{11U, 21U, 31U, ServiceElementType::EVENT};
+
+    SlotIndexType max_slots_0_{10U};
+    SlotIndexType max_slots_1_{11U};
+
+    LolaEventInstanceDeployment::SubscriberCountType max_number_combined_subscribers_0_{20U};
+    LolaEventInstanceDeployment::SubscriberCountType max_number_combined_subscribers_1_{21U};
+
+    FakeMemoryResource memory_{};
+    ServiceDataControl service_data_control_{memory_.getMemoryResourceProxy()};
+};
+
+TEST_F(ServiceDataControlLocalFixture, ConstructsEventControlLocalPointingToEachEventControl)
+{
+    // When creating a ServiceDataControlLocal from a ServiceDataControl
+    ServiceDataControlLocal service_data_control_local{service_data_control_};
+
+    // Then the created ServiceDataControlLocal should contain EventDataControlLocals pointing to the EventDataControls
+    // in the original ServiceDataControl. We check this by Allocating a slot in the EventDataControlLocal and checking
+    // that the actual slot vector in EventDataControl is updated
+    ASSERT_EQ(service_data_control_local.event_controls_.size(), 2);
+
+    // Slots should initially be all 0
+    auto& event_data_control_0{GetEventControl(service_data_control_, element_fq_id_0_).data_control};
+    auto& event_data_control_1{GetEventControl(service_data_control_, element_fq_id_1_).data_control};
+    std::all_of(
+        event_data_control_0.state_slots_.begin(), event_data_control_0.state_slots_.end(), [](const auto& slot_value) {
+            return slot_value == 0U;
+        });
+    std::all_of(
+        event_data_control_1.state_slots_.begin(), event_data_control_1.state_slots_.end(), [](const auto& slot_value) {
+            return slot_value == 0U;
+        });
+
+    auto& event_data_control_local_0 = GetEventControlLocal(service_data_control_local, element_fq_id_0_).data_control;
+    auto& event_data_control_local_1 = GetEventControlLocal(service_data_control_local, element_fq_id_1_).data_control;
+
+    // after allocating in the EventDataControlLocal
+    score::cpp::ignore = event_data_control_local_0.AllocateNextSlot();
+    score::cpp::ignore = event_data_control_local_1.AllocateNextSlot();
+
+    // the EventDataControl should be updated
+    EXPECT_EQ(event_data_control_0.state_slots_[0], std::numeric_limits<std::uint32_t>::max());
+    EXPECT_EQ(event_data_control_1.state_slots_[0], std::numeric_limits<std::uint32_t>::max());
+}
+
+TEST_F(ServiceDataControlLocalFixture, StoresReferenceToEventSubscriptionControlInServiceDataControl)
+{
+    // When creating a ServiceDataControlLocal from a ServiceDataControl
+    ServiceDataControlLocal service_data_control_local{service_data_control_};
+
+    // Then the EventSubscriptionControl reference for each EventControlLocal will point to the corresponding
+    // EventSubscriptionControl in the ServiceDataControl
+    ASSERT_EQ(service_data_control_local.event_controls_.size(), 2);
+    auto& event_subscription_control_0{GetEventControl(service_data_control_, element_fq_id_0_).subscription_control};
+    auto& event_subscription_control_1{GetEventControl(service_data_control_, element_fq_id_1_).subscription_control};
+
+    auto event_subscription_control_local_0{
+        GetEventControlLocal(service_data_control_local, element_fq_id_0_).subscription_control};
+    auto event_subscription_control_local_1{
+        GetEventControlLocal(service_data_control_local, element_fq_id_1_).subscription_control};
+
+    EXPECT_EQ(&event_subscription_control_0, &event_subscription_control_local_0.get());
+    EXPECT_EQ(&event_subscription_control_1, &event_subscription_control_local_1.get());
+}
+
+TEST_F(ServiceDataControlLocalFixture, StoresReferenceToApplicationIdPidMappingInServiceDataControl)
+{
+    // When creating a ServiceDataControlLocal from a ServiceDataControl
+    ServiceDataControlLocal service_data_control_local{service_data_control_};
+
+    // Then the ApplicationIdPidMapping reference will point to the ApplicationIdPidMapping in the ServiceDataControl
+    EXPECT_EQ(&service_data_control_local.application_id_pid_mapping_,
+              &service_data_control_.application_id_pid_mapping_);
+}
+
+}  // namespace
+}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/skeleton_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_test.cpp
index c2d3bfdb7..c29f40e10 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_test.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_test.cpp
@@ -98,6 +98,9 @@ class SkeletonTestMockedSharedMemoryFixture : public SkeletonMockedMemoryFixture
     ServiceDataStorage existing_service_data_storage_{
         CreateServiceDataStorageWithEvent<test::TestSampleType>(test::kDummyElementFqId)};
 
+    SkeletonServiceDataControlLocalView existing_service_data_control_qm_local_{existing_service_data_control_qm_};
+    SkeletonServiceDataControlLocalView existing_service_data_control_b_local_{existing_service_data_control_b_};
+
     const ElementFqId fooo_method_fq_id_{10U, test::kFooMethodId, 3U, ServiceElementType::METHOD};
     const ElementFqId dumb_method_fq_id_{1U, test::kDumbMethodId, 2U, ServiceElementType::METHOD};
 
@@ -383,10 +386,10 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferFailsIfOpeningServiceUsageMarker
 
 TEST_F(SkeletonPrepareOfferFixture, PrepareOfferOpensAndCleansExistingSharedMemoryIfFLockingServiceUsageMarkerFilefails)
 {
-    auto& event_control_qm =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_);
-    auto& event_control_asil_b =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_b_);
+    auto& event_control_qm_local = GetEventControlLocalFromServiceDataControlLocal(
+        test::kDummyElementFqId, existing_service_data_control_qm_local_);
+    auto& event_control_asil_b_local = GetEventControlLocalFromServiceDataControlLocal(
+        test::kDummyElementFqId, existing_service_data_control_b_local_);
 
     // Given a Skeleton constructed from a valid identifier referencing an ASIL-B deployment
     InitialiseSkeleton(GetValidASILInstanceIdentifier());
@@ -396,10 +399,10 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferOpensAndCleansExistingSharedMemo
         .WillOnce(Return(score::cpp::make_unexpected(os::Error::createFromErrno(EWOULDBLOCK))));
 
     // and given that QM and ASIL B control segments contain (previously) allocated slots that are in writing
-    auto first_allocation_qm = event_control_qm.data_control.AllocateNextSlot();
+    auto first_allocation_qm = event_control_qm_local.data_control.AllocateNextSlot();
     ASSERT_TRUE(first_allocation_qm.IsValid());
 
-    auto first_allocation_asil_b = event_control_asil_b.data_control.AllocateNextSlot();
+    auto first_allocation_asil_b = event_control_asil_b_local.data_control.AllocateNextSlot();
     ASSERT_TRUE(first_allocation_asil_b.IsValid());
 
     EXPECT_CALL(shared_memory_factory_mock_, Open(test::kControlChannelPathQm, true, _));
@@ -411,11 +414,11 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferOpensAndCleansExistingSharedMemo
     EXPECT_TRUE(skeleton_->PrepareOffer(events_, fields_, std::move(kEmptyRegisterShmObjectTraceCallback)).has_value());
 
     // And a new allocation will return the same slot as before, as it was cleaned up
-    auto second_allocation_qm = event_control_qm.data_control.AllocateNextSlot();
+    auto second_allocation_qm = event_control_qm_local.data_control.AllocateNextSlot();
     ASSERT_TRUE(second_allocation_qm.IsValid());
     EXPECT_EQ(first_allocation_qm.GetIndex(), second_allocation_qm.GetIndex());
 
-    auto second_allocation_asil_b = event_control_asil_b.data_control.AllocateNextSlot();
+    auto second_allocation_asil_b = event_control_asil_b_local.data_control.AllocateNextSlot();
     ASSERT_TRUE(second_allocation_asil_b.IsValid());
     EXPECT_EQ(first_allocation_asil_b.GetIndex(), second_allocation_asil_b.GetIndex());
 }
@@ -828,28 +831,37 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RegisterWillOpenEventDataIfShmRegio
     auto [typed_event_data_storage_ptr, event_data_control_composite] =
         skeleton_->Register<test::TestSampleType>(test::kDummyElementFqId, test::kDefaultEventProperties);
 
-    // Then the Register call should return pointers to the opened control and data sections in the opened shared
-    // memory region
-    auto& event_control_qm =
+    // Then the Register call should return views to the opened control section and pointer to the opened data section
+    // in the opened shared memory region (we check the control section views by allocating a slot in the opened region
+    // and checking that the allocation is reflected in the view)
+    auto& existing_event_control_qm =
         GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_);
-    auto& event_control_asil_b =
+    auto& existing_event_control_asil_b =
         GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_b_);
-    auto& event_data_storage = GetEventStorageFromServiceDataStorage<test::TestSampleType>(
+    auto& existing_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());
-    EXPECT_EQ(event_data_control_composite.GetAsilBEventDataControl().value(), &event_control_asil_b.data_control);
-    EXPECT_EQ(typed_event_data_storage_ptr, &event_data_storage);
+    auto& opened_event_control_local_qm = event_data_control_composite.GetQmEventDataControlLocal();
+    auto opened_event_control_local_asil_b = event_data_control_composite.GetAsilBEventDataControlLocal();
+
+    EXPECT_EQ(existing_event_control_qm.data_control.state_slots_[0], 0U);
+    EXPECT_EQ(existing_event_control_asil_b.data_control.state_slots_[0], 0U);
+    opened_event_control_local_qm.AllocateNextSlot();
+    opened_event_control_local_asil_b->AllocateNextSlot();
+    EXPECT_EQ(existing_event_control_qm.data_control.state_slots_[0], std::numeric_limits<std::uint32_t>::max());
+    EXPECT_EQ(existing_event_control_asil_b.data_control.state_slots_[0], std::numeric_limits<std::uint32_t>::max());
+
+    EXPECT_EQ(typed_event_data_storage_ptr, &existing_event_data_storage);
 }
 
 TEST_P(SkeletonRegisterParamaterisedFixture, RollbackWillBeCalledIfShmRegionWasOpened)
 {
     // Given a QM ServiceDataControl which contains a TransactionLogSet with valid transactions
-    auto& event_data_control_qm =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_).data_control;
-    InsertSkeletonTransactionLogWithValidTransactions(event_data_control_qm);
-    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm));
+    auto& event_data_control_qm_local = GetEventControlLocalFromServiceDataControlLocal(
+                                            test::kDummyElementFqId, existing_service_data_control_qm_local_)
+                                            .data_control;
+    InsertSkeletonTransactionLogWithValidTransactions(event_data_control_qm_local);
+    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm_local));
 
     const ServiceElementType element_type = GetParam();
 
@@ -876,7 +888,7 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RollbackWillBeCalledIfShmRegionWasO
         skeleton_->Register<test::TestSampleType>(test::kDummyElementFqId, test::kDefaultEventProperties);
 
     // Then the TransactionLog should be rollbacked during construction and removed
-    EXPECT_FALSE(IsSkeletonTransactionLogRegistered(event_data_control_qm));
+    EXPECT_FALSE(IsSkeletonTransactionLogRegistered(event_data_control_qm_local));
 }
 
 TEST_P(SkeletonRegisterParamaterisedFixture, RollbackWillOnlyBeCalledOnQmControlSection)
@@ -885,10 +897,11 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RollbackWillOnlyBeCalledOnQmControl
     // practice, this TransactionLogSet will never be used.
 
     // Given an Asil B ServiceDataControl which contains a TransactionLogSet with valid transactions
-    auto& event_data_control_asil_b =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_b_).data_control;
-    InsertSkeletonTransactionLogWithValidTransactions(event_data_control_asil_b);
-    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_asil_b));
+    auto& event_data_control_asil_b_local =
+        GetEventControlLocalFromServiceDataControlLocal(test::kDummyElementFqId, existing_service_data_control_b_local_)
+            .data_control;
+    InsertSkeletonTransactionLogWithValidTransactions(event_data_control_asil_b_local);
+    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_asil_b_local));
 
     const ServiceElementType element_type = GetParam();
 
@@ -915,7 +928,7 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RollbackWillOnlyBeCalledOnQmControl
         skeleton_->Register<test::TestSampleType>(test::kDummyElementFqId, test::kDefaultEventProperties);
 
     // Then the Asil B TransactionLog will still exist as it was not rolled back
-    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_asil_b));
+    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_asil_b_local));
 }
 
 TEST_P(SkeletonRegisterParamaterisedFixture, TracingWillBeDisabledAndTransactionLogRemainsIfRollbackFails)
@@ -924,10 +937,11 @@ TEST_P(SkeletonRegisterParamaterisedFixture, TracingWillBeDisabledAndTransaction
     ON_CALL(runtime_mock_, GetTracingRuntime()).WillByDefault(Return(&tracing_runtime_mock));
 
     // Given a QM ServiceDataControl which contains a TransactionLogSet with invalid transactions
-    auto& event_data_control_qm =
-        GetEventControlFromServiceDataControl(test::kDummyElementFqId, existing_service_data_control_qm_).data_control;
-    InsertSkeletonTransactionLogWithInvalidTransactions(event_data_control_qm);
-    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm));
+    auto& event_data_control_qm_local = GetEventControlLocalFromServiceDataControlLocal(
+                                            test::kDummyElementFqId, existing_service_data_control_qm_local_)
+                                            .data_control;
+    InsertSkeletonTransactionLogWithInvalidTransactions(event_data_control_qm_local);
+    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm_local));
 
     const ServiceElementType element_type = GetParam();
 
@@ -957,7 +971,7 @@ TEST_P(SkeletonRegisterParamaterisedFixture, TracingWillBeDisabledAndTransaction
         skeleton_->Register<test::TestSampleType>(test::kDummyElementFqId, test::kDefaultEventProperties);
 
     // Then the TransactionLog should still exist as it was not removed due to the rollback failing
-    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm));
+    EXPECT_TRUE(IsSkeletonTransactionLogRegistered(event_data_control_qm_local));
 }
 
 /// \brief Test case simulates (via a mock SkeletonEvent) the registration of a SkeletonEvent at its parent Skeleton
diff --git a/score/mw/com/impl/bindings/lola/slot_collector.cpp b/score/mw/com/impl/bindings/lola/slot_collector.cpp
index 03c3f3885..e1f7483fc 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_collector.cpp
@@ -19,10 +19,10 @@
 namespace score::mw::com::impl::lola
 {
 
-SlotCollector::SlotCollector(EventDataControl& event_data_control,
+SlotCollector::SlotCollector(ProxyEventDataControlLocalView<>& event_data_control_local,
                              const std::size_t max_slots,
                              TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept
-    : event_data_control_{event_data_control},
+    : event_data_control_local_{event_data_control_local},
       last_ts_{0U},
       collected_slots_(max_slots),
       transaction_log_index_{transaction_log_index}
@@ -32,7 +32,7 @@ SlotCollector::SlotCollector(EventDataControl& event_data_control,
 
 std::size_t SlotCollector::GetNumNewSamplesAvailable() const noexcept
 {
-    return event_data_control_.get().GetNumNewEvents(last_ts_);
+    return event_data_control_local_.get().GetNumNewEvents(last_ts_);
 }
 
 SlotCollector::SlotIndicators SlotCollector::GetNewSamplesSlotIndices(const std::size_t max_count) noexcept
@@ -65,7 +65,7 @@ SlotCollector::SlotIndicatorVector::iterator SlotCollector::CollectSlots(const s
     for (std::size_t count = 0U; count < max_count; ++count)
     {
         ControlSlotIndicator slot =
-            event_data_control_.get().ReferenceNextEvent(last_ts_, transaction_log_index_, current_highest);
+            event_data_control_local_.get().ReferenceNextEvent(last_ts_, transaction_log_index_, current_highest);
         if (!(slot.IsValid()))
         {
             break;
diff --git a/score/mw/com/impl/bindings/lola/slot_collector.h b/score/mw/com/impl/bindings/lola/slot_collector.h
index 691fc3687..02b3b9785 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector.h
+++ b/score/mw/com/impl/bindings/lola/slot_collector.h
@@ -13,11 +13,12 @@
 #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/event_data_control.h"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
 
 #include <functional>
+
 #include <vector>
 
 namespace score::mw::com::impl::lola
@@ -46,7 +47,7 @@ class SlotCollector final
     ///
     /// \param event_data_control EventDataControl to be used for data reception.
     /// \param max_slots Maximum number of samples that will be received in one call to GetNewSamples.
-    SlotCollector(EventDataControl& event_data_control,
+    SlotCollector(ProxyEventDataControlLocalView<>& event_data_control_local,
                   const std::size_t max_slots,
                   TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
 
@@ -79,7 +80,7 @@ class SlotCollector final
     /// \return an iterator to one past the oldest collected slot (smallest timestamp).
     SlotIndicatorVector::iterator CollectSlots(const std::size_t max_count) noexcept;
 
-    std::reference_wrapper<EventDataControl> event_data_control_;
+    std::reference_wrapper<ProxyEventDataControlLocalView<>> event_data_control_local_;
     EventSlotStatus::EventTimeStamp last_ts_;
     SlotIndicatorVector
         collected_slots_;  // Pre-allocated scratchpad memory to present the events in-order to the user.
diff --git a/score/mw/com/impl/bindings/lola/slot_collector_test.cpp b/score/mw/com/impl/bindings/lola/slot_collector_test.cpp
index ff4475fea..8351e8756 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector_test.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_collector_test.cpp
@@ -12,6 +12,8 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/slot_collector.h"
 
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
 
 #include <gtest/gtest.h>
@@ -29,12 +31,11 @@ using namespace ::score::memory::shared;
 class SlotCollectorWithFakeMem : public ::testing::Test
 {
   protected:
-    static SlotIndexType AllocateSlot(EventDataControl& event_data_control,
-                                      const EventSlotStatus::EventTimeStamp timestamp = 1)
+    SlotIndexType AllocateSlot(const EventSlotStatus::EventTimeStamp timestamp = 1)
     {
-        const auto slot = event_data_control.AllocateNextSlot();
+        const auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
         EXPECT_TRUE(slot.IsValid());
-        event_data_control.EventReady(slot, timestamp);
+        skeleton_event_data_control_local_.EventReady(slot, timestamp);
         return slot.GetIndex();
     }
 
@@ -42,17 +43,19 @@ class SlotCollectorWithFakeMem : public ::testing::Test
     {
         return static_cast<std::size_t>(std::distance(indices.begin, indices.end));
     }
+
     FakeMemoryResource fake_memory_resource_;
+    EventDataControl event_data_control_{5, fake_memory_resource_, kMaxSubscribers};
+    ProxyEventDataControlLocalView<> proxy_event_data_control_local_{event_data_control_};
+    SkeletonEventDataControlLocalView<> skeleton_event_data_control_local_{event_data_control_};
+    TransactionLogSet::TransactionLogIndex transaction_log_index_{
+        proxy_event_data_control_local_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value()};
 };
 
 TEST_F(SlotCollectorWithFakeMem, TestProperEventAcquisition)
 {
-    EventDataControl event_data_control{5, fake_memory_resource_, kMaxSubscribers};
-    const auto transaction_log_index =
-        event_data_control.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
-
-    AllocateSlot(event_data_control);
-    SlotCollector slot_collector{event_data_control, 1U, transaction_log_index};
+    AllocateSlot();
+    SlotCollector slot_collector{proxy_event_data_control_local_, 1U, transaction_log_index_};
     EXPECT_EQ(slot_collector.GetNumNewSamplesAvailable(), 1);
 
     const std::size_t max_count{1};
@@ -64,19 +67,15 @@ TEST_F(SlotCollectorWithFakeMem, TestProperEventAcquisition)
 
 TEST_F(SlotCollectorWithFakeMem, ReceiveEventsInOrder)
 {
-    EventDataControl event_data_control{4, fake_memory_resource_, kMaxSubscribers};
-    const auto transaction_log_index =
-        event_data_control.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
-
     EventSlotStatus::EventTimeStamp send_time{1};
     const std::size_t num_values_to_send{3};
     for (std::size_t i = 0; i < num_values_to_send; ++i)
     {
-        AllocateSlot(event_data_control, send_time);
+        AllocateSlot(send_time);
         send_time++;
     }
 
-    SlotCollector slot_collector{event_data_control, 3U, transaction_log_index};
+    SlotCollector slot_collector{proxy_event_data_control_local_, 3U, transaction_log_index_};
     EXPECT_EQ(slot_collector.GetNumNewSamplesAvailable(), 3);
 
     const std::size_t max_count{3};
@@ -99,12 +98,9 @@ TEST_F(SlotCollectorWithFakeMem, ReceiveEventsInOrder)
 
 TEST_F(SlotCollectorWithFakeMem, DoNotReceiveEventsFromThePast)
 {
-    EventDataControl event_data_control{3, fake_memory_resource_, kMaxSubscribers};
-    const auto transaction_log_index =
-        event_data_control.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
-    SlotCollector slot_collector{event_data_control, 2U, transaction_log_index};
+    SlotCollector slot_collector{proxy_event_data_control_local_, 2U, transaction_log_index_};
 
-    AllocateSlot(event_data_control, 17);
+    AllocateSlot(17);
     EXPECT_EQ(slot_collector.GetNumNewSamplesAvailable(), 1);
 
     const std::size_t max_count{37};
@@ -112,7 +108,7 @@ TEST_F(SlotCollectorWithFakeMem, DoNotReceiveEventsFromThePast)
 
     EXPECT_EQ(CalculateNumberOfCollectedSlots(slot_indices), 1);
 
-    AllocateSlot(event_data_control, 1);
+    AllocateSlot(1);
 
     EXPECT_EQ(slot_collector.GetNumNewSamplesAvailable(), 0);
     const std::size_t new_max_count{38};
@@ -124,13 +120,10 @@ using SlotCollectorWithFakeMemDeathTest = SlotCollectorWithFakeMem;
 TEST_F(SlotCollectorWithFakeMemDeathTest, CreatingSlotCollectorWith0MaxSlotsTerminates)
 {
     // Given an EventDataControl and registered TransactionLog
-    EventDataControl event_data_control{3, fake_memory_resource_, kMaxSubscribers};
-    const auto transaction_log_index =
-        event_data_control.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
 
     // When creating a SlotCollector with max_slots of 0
     // Then the program terminates
-    EXPECT_DEATH(SlotCollector(event_data_control, 0U, transaction_log_index), ".*");
+    EXPECT_DEATH(SlotCollector(proxy_event_data_control_local_, 0U, transaction_log_index_), ".*");
 }
 
 }  // namespace
diff --git a/score/mw/com/impl/bindings/lola/slot_decrementer.cpp b/score/mw/com/impl/bindings/lola/slot_decrementer.cpp
index 93f071c43..6c372c02a 100644
--- a/score/mw/com/impl/bindings/lola/slot_decrementer.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_decrementer.cpp
@@ -15,10 +15,10 @@
 namespace score::mw::com::impl::lola
 {
 
-SlotDecrementer::SlotDecrementer(EventDataControl* event_data_control,
+SlotDecrementer::SlotDecrementer(ProxyEventDataControlLocalView<>& event_data_control_local,
                                  ControlSlotIndicator control_slot_indicator,
                                  const TransactionLogSet::TransactionLogIndex transaction_log_idx) noexcept
-    : event_data_control_{event_data_control},
+    : event_data_control_local_{&event_data_control_local},
       control_slot_indicator_{control_slot_indicator},
       transaction_log_idx_{transaction_log_idx}
 {
@@ -30,7 +30,7 @@ SlotDecrementer::~SlotDecrementer() noexcept
 }
 
 SlotDecrementer::SlotDecrementer(SlotDecrementer&& other) noexcept
-    : event_data_control_{other.event_data_control_},
+    : event_data_control_local_{other.event_data_control_local_},
       // Suppress "AUTOSAR C++14 A12-8-4" rule finding. This rule states: "Move constructor shall not initialize its
       // class members and base classes using copy semantics."
       // Rationale: False positive - std::move is used which will result in the move constructor of
@@ -39,7 +39,7 @@ SlotDecrementer::SlotDecrementer(SlotDecrementer&& other) noexcept
       control_slot_indicator_{std::move(other.control_slot_indicator_)},
       transaction_log_idx_{other.transaction_log_idx_}
 {
-    other.event_data_control_ = nullptr;
+    other.event_data_control_local_ = nullptr;
 }
 
 // Suppress "AUTOSAR C++14 A6-2-1" rule violation. The rule states "Move and copy assignment operators shall either move
@@ -52,20 +52,20 @@ SlotDecrementer& SlotDecrementer::operator=(SlotDecrementer&& other) noexcept
     if (this != &other)
     {
         internal_delete();
-        event_data_control_ = other.event_data_control_;
+        event_data_control_local_ = other.event_data_control_local_;
         control_slot_indicator_ = other.control_slot_indicator_;
         transaction_log_idx_ = other.transaction_log_idx_;
 
-        other.event_data_control_ = nullptr;
+        other.event_data_control_local_ = nullptr;
     }
     return *this;
 }
 
 void SlotDecrementer::internal_delete() noexcept
 {
-    if (event_data_control_ != nullptr)
+    if (event_data_control_local_ != nullptr)
     {
-        event_data_control_->DereferenceEvent(control_slot_indicator_, transaction_log_idx_);
+        event_data_control_local_->DereferenceEvent(control_slot_indicator_, transaction_log_idx_);
     }
 }
 
diff --git a/score/mw/com/impl/bindings/lola/slot_decrementer.h b/score/mw/com/impl/bindings/lola/slot_decrementer.h
index 90e61a4a2..ccc4cba3c 100644
--- a/score/mw/com/impl/bindings/lola/slot_decrementer.h
+++ b/score/mw/com/impl/bindings/lola/slot_decrementer.h
@@ -14,8 +14,7 @@
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_DECREMENTER_H
 
 #include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
-#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
-#include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
 
 namespace score::mw::com::impl::lola
@@ -24,7 +23,7 @@ namespace score::mw::com::impl::lola
 class SlotDecrementer
 {
   public:
-    SlotDecrementer(EventDataControl* event_data_control,
+    SlotDecrementer(ProxyEventDataControlLocalView<>& event_data_control,
                     ControlSlotIndicator control_slot_indicator,
                     const TransactionLogSet::TransactionLogIndex transaction_log_idx) noexcept;
     ~SlotDecrementer() noexcept;
@@ -37,7 +36,7 @@ class SlotDecrementer
   private:
     void internal_delete() noexcept;
 
-    EventDataControl* event_data_control_;
+    ProxyEventDataControlLocalView<>* event_data_control_local_;
     ControlSlotIndicator control_slot_indicator_;
     TransactionLogSet::TransactionLogIndex transaction_log_idx_;
 };
diff --git a/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp b/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp
index 6fe960732..4c8ad8ff3 100644
--- a/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp
@@ -14,6 +14,8 @@
 
 #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_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_id.h"
 
@@ -39,22 +41,23 @@ class SlotDecrementerFixture : public ::testing::Test
     {
         const auto slot_indicator = AllocateSlotAndReferenceEvent();
         control_slot_indicator_ = slot_indicator;
-        slot_decrementer_ = SlotDecrementer{&event_data_control_, slot_indicator, transaction_log_index_};
+        slot_decrementer_ = SlotDecrementer{proxy_event_data_control_local_, slot_indicator, transaction_log_index_};
         return *this;
     }
 
     ControlSlotIndicator AllocateSlotAndReferenceEvent(EventSlotStatus::EventTimeStamp timestamp = 1)
     {
         // Allocate a slot which will acquire it for writing
-        auto slot = event_data_control_.AllocateNextSlot();
+        auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
         EXPECT_TRUE(slot.IsValid());
 
         // Mark the slot as ready which allows it to be read
-        event_data_control_.EventReady(slot, timestamp);
+        skeleton_event_data_control_local_.EventReady(slot, timestamp);
 
         // Reference the slot which indicates that a consumer is currently reading it. Use timestamp - 1 to ensure that
         // we find the slot that we just marked as ready first.
-        auto current_slot_indicator = event_data_control_.ReferenceNextEvent(timestamp - 1, transaction_log_index_);
+        auto current_slot_indicator =
+            proxy_event_data_control_local_.ReferenceNextEvent(timestamp - 1, transaction_log_index_);
         EXPECT_TRUE(current_slot_indicator.IsValid());
 
         return current_slot_indicator;
@@ -62,13 +65,15 @@ class SlotDecrementerFixture : public ::testing::Test
 
     EventSlotStatus::SubscriberCount GetSlotReferenceCount(const SlotIndexType event_slot_index)
     {
-        return EventSlotStatus{event_data_control_[event_slot_index]}.GetReferenceCount();
+        return EventSlotStatus{skeleton_event_data_control_local_[event_slot_index]}.GetReferenceCount();
     }
 
     FakeMemoryResource memory_{};
     EventDataControl event_data_control_{kMaxSlots, memory_, kMaxSubscribers};
+    ProxyEventDataControlLocalView<> proxy_event_data_control_local_{event_data_control_};
+    SkeletonEventDataControlLocalView<> skeleton_event_data_control_local_{event_data_control_};
     TransactionLogSet::TransactionLogIndex transaction_log_index_{
-        event_data_control_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value()};
+        proxy_event_data_control_local_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value()};
 
     ControlSlotIndicator control_slot_indicator_{};
     score::cpp::optional<SlotDecrementer> slot_decrementer_{};
@@ -114,7 +119,8 @@ TEST_F(SlotDecrementerFixture, MoveAssigningWillDecrementSlotOfMovedToSlotDecrem
 
     // and a second SlotDecrementer referencing a different slot
     const auto second_slot_indicator = AllocateSlotAndReferenceEvent(2);
-    SlotDecrementer second_slot_decrementer{&event_data_control_, second_slot_indicator, transaction_log_index_};
+    SlotDecrementer second_slot_decrementer{
+        proxy_event_data_control_local_, second_slot_indicator, transaction_log_index_};
 
     // When move assigning the second SlotDecrementer to the first
     slot_decrementer_.value() = std::move(second_slot_decrementer);
diff --git a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp
index 66c33d960..e4d96a796 100644
--- a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp
@@ -36,7 +36,7 @@ namespace score::mw::com::impl::lola
 ResultBlank NotSubscribedState::SubscribeEvent(const std::size_t max_sample_count) noexcept
 {
     auto transaction_log_registration_guard_result = TransactionLogRegistrationGuard::Create(
-        state_machine_.event_control_.data_control, state_machine_.transaction_log_id_);
+        state_machine_.event_control_local_.data_control, state_machine_.transaction_log_id_);
     if (!(transaction_log_registration_guard_result.has_value()))
     {
         std::stringstream ss{};
@@ -50,8 +50,8 @@ ResultBlank NotSubscribedState::SubscribeEvent(const std::size_t max_sample_coun
         std::move(transaction_log_registration_guard_result).value());
 
     auto transaction_log_index = state_machine_.transaction_log_registration_guard_->GetTransactionLogIndex();
-    auto& transaction_log =
-        state_machine_.event_control_.data_control.GetTransactionLogSet().GetTransactionLog(transaction_log_index);
+    auto& transaction_log = state_machine_.event_control_local_.data_control.GetTransactionLogSet().GetTransactionLog(
+        transaction_log_index);
     transaction_log.SubscribeTransactionBegin(max_sample_count);
 
     // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall
@@ -60,7 +60,7 @@ ResultBlank NotSubscribedState::SubscribeEvent(const std::size_t max_sample_coun
     // coverity[autosar_cpp14_a4_7_1_violation]
     const auto max_sample_count_uint16 = static_cast<std::uint16_t>(max_sample_count);
     const auto subscription_result =
-        state_machine_.event_control_.subscription_control.Subscribe(max_sample_count_uint16);
+        state_machine_.event_control_local_.subscription_control.get().Subscribe(max_sample_count_uint16);
     if (subscription_result != SubscribeResult::kSuccess)
     {
         SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE(
@@ -77,8 +77,9 @@ ResultBlank NotSubscribedState::SubscribeEvent(const std::size_t max_sample_coun
     }
     transaction_log.SubscribeTransactionCommit();
 
-    SlotCollector slot_collector{
-        state_machine_.event_control_.data_control, static_cast<std::size_t>(max_sample_count), transaction_log_index};
+    SlotCollector slot_collector{state_machine_.event_control_local_.data_control,
+                                 static_cast<std::size_t>(max_sample_count),
+                                 transaction_log_index};
     if (state_machine_.event_receiver_handler_.has_value())
     {
         // Defer handler registration until provider is available to avoid failed registration attempts.
@@ -158,11 +159,11 @@ score::cpp::optional<TransactionLogSet::TransactionLogIndex> NotSubscribedState:
 void NotSubscribedState::OnEntry() noexcept
 {
     const auto transaction_log_index = state_machine_.transaction_log_registration_guard_->GetTransactionLogIndex();
-    auto& transaction_log =
-        state_machine_.event_control_.data_control.GetTransactionLogSet().GetTransactionLog(transaction_log_index);
+    auto& transaction_log = state_machine_.event_control_local_.data_control.GetTransactionLogSet().GetTransactionLog(
+        transaction_log_index);
 
     transaction_log.UnsubscribeTransactionBegin();
-    state_machine_.event_control_.subscription_control.Unsubscribe(
+    state_machine_.event_control_local_.subscription_control.get().Unsubscribe(
         state_machine_.subscription_data_.max_sample_count_.value());
     transaction_log.UnsubscribeTransactionCommit();
 
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 325f0e6e0..87c8795f9 100644
--- a/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp
@@ -26,7 +26,7 @@ namespace score::mw::com::impl::lola
 SubscriptionStateMachine::SubscriptionStateMachine(const QualityType quality_type,
                                                    const ElementFqId element_fq_id,
                                                    const pid_t event_source_pid,
-                                                   EventControl& event_control,
+                                                   ProxyEventControlLocalView& event_control_local,
                                                    const TransactionLogId& transaction_log_id) noexcept
     : std::enable_shared_from_this<SubscriptionStateMachine>{},
       state_mutex_{},
@@ -37,7 +37,7 @@ SubscriptionStateMachine::SubscriptionStateMachine(const QualityType quality_typ
       subscription_data_{},
       event_receiver_handler_{},
       event_receive_handler_manager_{quality_type, element_fq_id, event_source_pid},
-      event_control_{event_control},
+      event_control_local_{event_control_local},
       provider_service_instance_is_available_{true},
       transaction_log_id_{transaction_log_id},
       transaction_log_registration_guard_{},
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 0c8108f24..18f938e6b 100644
--- a/score/mw/com/impl/bindings/lola/subscription_state_machine.h
+++ b/score/mw/com/impl/bindings/lola/subscription_state_machine.h
@@ -13,7 +13,7 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SUBSCRIPTION_STATE_MACHINE_H
 #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/proxy_event_control_local_view.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"
@@ -70,7 +70,7 @@ class SubscriptionStateMachine : public std::enable_shared_from_this<Subscriptio
     SubscriptionStateMachine(const QualityType quality_type,
                              const ElementFqId element_fq_id,
                              const pid_t event_source_pid,
-                             EventControl& event_control,
+                             ProxyEventControlLocalView& event_control_local,
                              const TransactionLogId& transaction_log_id) noexcept;
 
     SubscriptionStateMachine(SubscriptionStateMachine&&) noexcept = delete;
@@ -135,7 +135,7 @@ class SubscriptionStateMachine : public std::enable_shared_from_this<Subscriptio
     SubscriptionData subscription_data_;
     std::optional<std::weak_ptr<ScopedEventReceiveHandler>> event_receiver_handler_;
     EventReceiveHandlerManager event_receive_handler_manager_;
-    EventControl& event_control_;
+    ProxyEventControlLocalView& event_control_local_;
     bool provider_service_instance_is_available_;
 
     const TransactionLogId& transaction_log_id_;
diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp b/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp
index 96d2d426d..5fa760f18 100644
--- a/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp
@@ -44,7 +44,7 @@ class StateMachineEventsFixture : public LolaProxyEventResources
           state_machine_{proxy_->GetQualityType(),
                          element_fq_id_,
                          kDummyPid,
-                         proxy_->GetEventControl(element_fq_id_),
+                         proxy_->GetEventControlLocal(element_fq_id_),
                          kDummyTransactionLogId}
     {
     }
@@ -79,7 +79,7 @@ class StateMachineEventsFixture : public LolaProxyEventResources
     score::cpp::optional<std::reference_wrapper<TransactionLog>> GetTransactionLog(
         const TransactionLogId& transaction_log_id) noexcept
     {
-        auto& transaction_log_set = proxy_->GetEventControl(element_fq_id_).data_control.GetTransactionLogSet();
+        auto& transaction_log_set = proxy_->GetEventControlLocal(element_fq_id_).data_control.GetTransactionLogSet();
         auto& transaction_logs = TransactionLogSetAttorney{transaction_log_set}.GetProxyTransactionLogs();
         auto result =
             std::find_if(transaction_logs.begin(), transaction_logs.end(), [&transaction_log_id](const auto& element) {
@@ -111,7 +111,7 @@ class StateMachineEventsFixture : public LolaProxyEventResources
     score::Result<TransactionLogSet::TransactionLogIndex> RegisterTransactionLog(
         const TransactionLogId& transaction_log_id) noexcept
     {
-        auto& transaction_log_set = proxy_->GetEventControl(element_fq_id_).data_control.GetTransactionLogSet();
+        auto& transaction_log_set = proxy_->GetEventControlLocal(element_fq_id_).data_control.GetTransactionLogSet();
         return transaction_log_set.RegisterProxyElement(transaction_log_id);
     }
 
diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp b/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp
index ac377b7c3..c56948c48 100644
--- a/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp
+++ b/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp
@@ -52,7 +52,7 @@ class StateMachineMethodsFixture : public LolaProxyEventResources
           state_machine_{proxy_->GetQualityType(),
                          element_fq_id_,
                          kDummyPid,
-                         proxy_->GetEventControl(element_fq_id_),
+                         proxy_->GetEventControlLocal(element_fq_id_),
                          kDummyTransactionLogId}
     {
     }
diff --git a/score/mw/com/impl/bindings/lola/test/BUILD b/score/mw/com/impl/bindings/lola/test/BUILD
index 9d1d156a1..8f1bd9976 100644
--- a/score/mw/com/impl/bindings/lola/test/BUILD
+++ b/score/mw/com/impl/bindings/lola/test/BUILD
@@ -170,6 +170,7 @@ cc_test(
         ":skeleton_test_resources",
         "//score/mw/com/impl:runtime_mock",
         "//score/mw/com/impl:service_discovery_mock",
+        "//score/mw/com/impl/bindings/lola:proxy_event_control_local_view",
         "//score/mw/com/impl/bindings/lola:runtime_mock",
         "//score/mw/com/impl/bindings/lola:skeleton",
         "//score/mw/com/impl/bindings/lola/messaging:message_passing_service_mock",
diff --git a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp
index cc0dec27d..2e9ef62b4 100644
--- a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp
+++ b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp
@@ -11,9 +11,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h"
-#include "score/filesystem/details/standard_filesystem.h"
-#include "score/filesystem/i_standard_filesystem.h"
-#include "score/mw/com/impl/bindings/lola/rollback_synchronization.h"
 
 #include "score/memory/shared/memory_resource_registry.h"
 
@@ -127,12 +124,17 @@ void ProxyMockedMemoryFixture::InitialiseDummySkeletonEvent(const ElementFqId el
 {
     std::tie(event_control_, event_data_storage_) =
         fake_data_->AddEvent<SampleType>(element_fq_id, skeleton_event_properties);
+    skeleton_event_control_local_.emplace(*event_control_);
+    proxy_event_control_local_.emplace(*event_control_);
 }
 
 LolaProxyEventResources::LolaProxyEventResources() : ProxyMockedMemoryFixture{}
 {
-    InitialiseProxyWithConstructor(identifier_);
+    // Since the Proxy caches a view on ServiceDataControl (via ProxyServiceDataControlLocalView) on construction, we
+    // have to set ensure that the ServiceDataControl is set up before creating the proxy. Therefore, we call
+    // InitialiseDummySkeletonEvent before InitialiseProxyWithConstructor.
     InitialiseDummySkeletonEvent(element_fq_id_, SkeletonEventProperties{max_num_slots_, max_subscribers_, true});
+    InitialiseProxyWithConstructor(identifier_);
 }
 
 LolaProxyEventResources::~LolaProxyEventResources()
@@ -183,11 +185,12 @@ void LolaProxyEventResources::ExpectUnregisterEventNotification(score::cpp::opti
 SlotIndexType LolaProxyEventResources::PutData(const std::uint32_t value,
                                                const EventSlotStatus::EventTimeStamp timestamp)
 {
-    auto slot_result = event_control_->data_control.AllocateNextSlot();
+    SCORE_LANGUAGE_FUTURECPP_ASSERT(skeleton_event_control_local_.has_value());
+    auto slot_result = skeleton_event_control_local_->data_control.AllocateNextSlot();
     EXPECT_TRUE(slot_result.IsValid());
     auto slot_index = slot_result.GetIndex();
     event_data_storage_->at(slot_index) = value;
-    event_control_->data_control.EventReady(slot_result, timestamp);
+    skeleton_event_control_local_->data_control.EventReady(slot_result, timestamp);
     return slot_index;
 }
 
diff --git a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h
index a5c05181d..e62e86a97 100644
--- a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h
+++ b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h
@@ -19,20 +19,17 @@
 #include "score/mw/com/impl/bindings/lola/messaging/message_passing_service_mock.h"
 #include "score/mw/com/impl/bindings/lola/proxy.h"
 #include "score/mw/com/impl/bindings/lola/proxy_event.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test_doubles/fake_mocked_service_data.h"
 #include "score/mw/com/impl/configuration/global_configuration.h"
 #include "score/mw/com/impl/configuration/quality_type.h"
 #include "score/mw/com/impl/configuration/service_identifier_type.h"
-#include "score/mw/com/impl/handle_type.h"
 #include "score/mw/com/impl/instance_identifier.h"
-#include "score/mw/com/impl/runtime.h"
-#include "score/mw/com/impl/runtime_mock.h"
 #include "score/mw/com/impl/service_discovery_mock.h"
 #include "score/mw/com/impl/test/runtime_mock_guard.h"
 #include "score/mw/com/impl/tracing/i_binding_tracing_runtime.h"
 
 #include "score/filesystem/factory/filesystem_factory_fake.h"
-#include "score/filesystem/i_standard_filesystem.h"
 #include "score/memory/shared/shared_memory_factory.h"
 #include "score/memory/shared/shared_memory_factory_mock.h"
 #include "score/os/mocklib/fcntl_mock.h"
@@ -43,7 +40,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <sys/types.h>
-#include <functional>
 #include <future>
 #include <memory>
 #include <string>
@@ -208,6 +204,8 @@ class ProxyMockedMemoryFixture : public ::testing::Test
 
     std::unique_ptr<FakeMockedServiceData> fake_data_{nullptr};
     EventControl* event_control_{nullptr};
+    std::optional<SkeletonEventControlLocalView> skeleton_event_control_local_{};
+    std::optional<ProxyEventControlLocalView> proxy_event_control_local_{};
     EventDataStorage<SampleType>* event_data_storage_{nullptr};
     RollbackSynchronization rollback_synchronization_{};
 
diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp b/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp
index 30ff16ad8..081e47437 100644
--- a/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp
+++ b/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp
@@ -142,6 +142,7 @@ class SkeletonComponentTestFixture : public ::testing::Test
             .WillByDefault(::testing::Return(&lola_runtime_mock_));
 
         ON_CALL(lola_runtime_mock_, GetLolaMessaging()).WillByDefault(ReturnRef(message_passing_service_mock_));
+        ON_CALL(runtime_mock_, GetTracingRuntime()).WillByDefault(Return(&tracing_runtime_mock_));
     }
 
     void TearDown() override
@@ -221,6 +222,7 @@ class SkeletonComponentTestFixture : public ::testing::Test
     lola::RuntimeMock lola_runtime_mock_{};
 
     MessagePassingServiceMock message_passing_service_mock_{};
+    impl::tracing::TracingRuntimeMock tracing_runtime_mock_{};
 
     mock_binding::SkeletonEvent<TestSampleType> mock_event_binding_{};
     mock_binding::SkeletonEvent<TestSampleType> mock_field_binding_{};
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 54a6dfba2..d8a2c1a4e 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
@@ -10,6 +10,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
+#include "score/mw/com/impl/bindings/lola/proxy_event_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_event.h"
 
 #include "score/mw/com/impl/bindings/lola/event_data_control_composite.h"
@@ -143,8 +145,10 @@ class SkeletonEventComponentTestTemplateFixture : public ::testing::Test
         auto* control_storage = static_cast<ServiceDataControl*>(memory_control->getUsableBaseAddress());
 
         auto& event_data_control = control_storage->event_controls_.find(fake_element_fq_id_)->second.data_control;
-        event_data_control.GetTransactionLogSet().RegisterSkeletonTracingElement();
-        auto slot_indicator = event_data_control.ReferenceNextEvent(0, TransactionLogSet::kSkeletonIndexSentinel);
+        ProxyEventDataControlLocalView<> proxy_event_data_control_local{event_data_control};
+        proxy_event_data_control_local.GetTransactionLogSet().RegisterSkeletonTracingElement();
+        auto slot_indicator =
+            proxy_event_data_control_local.ReferenceNextEvent(0, TransactionLogSet::kSkeletonIndexSentinel);
         EXPECT_TRUE(slot_indicator.IsValid());
         return values->at(slot_indicator.GetIndex());
     }
@@ -165,11 +169,12 @@ class SkeletonEventComponentTestTemplateFixture : public ::testing::Test
         auto* control_storage = static_cast<ServiceDataControl*>(memory_control->getUsableBaseAddress());
         const auto search = control_storage->event_controls_.find(fake_element_fq_id_);
         EXPECT_TRUE(search != control_storage->event_controls_.cend());
-        const auto* event_control = &search->second;
+        auto* event_control = &search->second;
+        ProxyEventControlLocalView proxy_event_control_local{*event_control};
 
         for (SlotIndexType i = 0U; i < MaxSamples; i++)
         {
-            if ((*event_control).data_control[i].IsInvalid())
+            if (proxy_event_control_local.data_control[i].IsInvalid())
             {
                 result++;
             }
@@ -180,11 +185,11 @@ class SkeletonEventComponentTestTemplateFixture : public ::testing::Test
     void AllocateQmSlots(const std::size_t number_of_slots_to_allocate)
     {
         auto& event_data_control_composite = SkeletonEventAttorney{skeleton_event_}.GetEventDataControlComposite();
-        auto& qm_event_data_control = event_data_control_composite.GetQmEventDataControl();
+        auto& qm_event_data_control_local = event_data_control_composite.GetQmEventDataControlLocal();
 
         for (std::size_t counter = 0U; counter < number_of_slots_to_allocate; ++counter)
         {
-            score::cpp::ignore = qm_event_data_control.AllocateNextSlot();
+            score::cpp::ignore = qm_event_data_control_local.AllocateNextSlot();
         }
     }
 
diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_event_test_resources.cpp b/score/mw/com/impl/bindings/lola/test/skeleton_event_test_resources.cpp
index a6d19be60..b971bbd07 100644
--- a/score/mw/com/impl/bindings/lola/test/skeleton_event_test_resources.cpp
+++ b/score/mw/com/impl/bindings/lola/test/skeleton_event_test_resources.cpp
@@ -31,13 +31,6 @@ SkeletonEventFixture::SkeletonEventFixture() : SkeletonMockedMemoryFixture{}
 {
     ON_CALL(lola_runtime_mock_, GetLolaMessaging).WillByDefault(ReturnRef(message_passing_service_mock_));
     ON_CALL(runtime_mock_, GetServiceDiscovery()).WillByDefault(ReturnRef(service_discovery_mock_));
-
-    InitialiseSkeleton(GetValidInstanceIdentifier());
-
-    SkeletonBinding::SkeletonEventBindings events{};
-    SkeletonBinding::SkeletonFieldBindings fields{};
-    std::optional<SkeletonBinding::RegisterShmObjectTraceCallback> register_shm_object_trace_callback{};
-    std::ignore = skeleton_->PrepareOffer(events, fields, std::move(register_shm_object_trace_callback));
 }
 
 void SkeletonEventFixture::InitialiseSkeletonEvent(const ElementFqId element_fq_id,
@@ -47,6 +40,15 @@ void SkeletonEventFixture::InitialiseSkeletonEvent(const ElementFqId element_fq_
                                                    const bool enforce_max_samples,
                                                    impl::tracing::SkeletonEventTracingData skeleton_event_tracing_data)
 {
+    // We defer initialisation of the Skeleton to InitialiseSkeletonEvent to allow test fixtures to set any mocked
+    // expectations before creating the skeleton.
+    InitialiseSkeleton(GetValidInstanceIdentifier());
+
+    SkeletonBinding::SkeletonEventBindings events{};
+    SkeletonBinding::SkeletonFieldBindings fields{};
+    std::optional<SkeletonBinding::RegisterShmObjectTraceCallback> register_shm_object_trace_callback{};
+    std::ignore = skeleton_->PrepareOffer(events, fields, std::move(register_shm_object_trace_callback));
+
     skeleton_event_ = std::make_unique<SkeletonEvent<test::TestSampleType>>(
         *skeleton_,
         element_fq_id,
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 3cf9a9889..b03562097 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
@@ -12,6 +12,8 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h"
 
+#include "score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h"
 #include "score/mw/com/impl/configuration/quality_type.h"
 
 #include "score/memory/shared/memory_resource_proxy.h"
@@ -335,6 +337,16 @@ EventControl& SkeletonMockedMemoryFixture::GetEventControlFromServiceDataControl
     return event_control;
 }
 
+SkeletonEventControlLocalView& SkeletonMockedMemoryFixture::GetEventControlLocalFromServiceDataControlLocal(
+    ElementFqId element_fq_id,
+    SkeletonServiceDataControlLocalView& skeleton_service_data_control_local) noexcept
+{
+    auto event_control_local_it = skeleton_service_data_control_local.event_controls_.find(element_fq_id);
+    EXPECT_NE(event_control_local_it, skeleton_service_data_control_local.event_controls_.cend());
+    auto& event_control_local = event_control_local_it->second;
+    return event_control_local;
+}
+
 void SkeletonMockedMemoryFixture::CleanUpSkeleton()
 {
     // This function needs to be called, when the instance identifier for a class is located on the stack of the test
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 e6ff5b47b..6b7ca5f0e 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
@@ -21,6 +21,8 @@
 #include "score/mw/com/impl/bindings/lola/shm_path_builder.h"
 #include "score/mw/com/impl/bindings/lola/shm_path_builder_mock.h"
 #include "score/mw/com/impl/bindings/lola/skeleton.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_service_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/mock_binding/tracing/tracing_runtime.h"
 #include "score/mw/com/impl/configuration/lola_event_instance_deployment.h"
 #include "score/mw/com/impl/configuration/lola_service_instance_deployment.h"
@@ -411,8 +413,11 @@ class SkeletonMockedMemoryFixture : public ::testing::Test
     void ExpectServiceUsageMarkerFileCreatedOrOpenedAndClosed() noexcept;
 
     ServiceDataControl CreateServiceDataControlWithEvent(ElementFqId element_fq_id, QualityType quality_type) noexcept;
-    EventControl& GetEventControlFromServiceDataControl(ElementFqId element_fq_id,
-                                                        ServiceDataControl& service_data_control) noexcept;
+    static EventControl& GetEventControlFromServiceDataControl(ElementFqId element_fq_id,
+                                                               ServiceDataControl& service_data_control) noexcept;
+    static SkeletonEventControlLocalView& GetEventControlLocalFromServiceDataControlLocal(
+        ElementFqId element_fq_id,
+        SkeletonServiceDataControlLocalView& skeleton_service_data_control_local) noexcept;
 
     template <typename SampleType>
     ServiceDataStorage CreateServiceDataStorageWithEvent(ElementFqId element_fq_id) noexcept
diff --git a/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.cpp b/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.cpp
index ff4e38f4a..13734e13d 100644
--- a/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.cpp
+++ b/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.cpp
@@ -24,27 +24,28 @@ std::uint32_t CreateEventSubscriptionControlState(EventSubscriptionControl::Subs
     return result;
 }
 
-void AddSubscriptionToEventSubscriptionControl(EventControl& event_control,
+void AddSubscriptionToEventSubscriptionControl(ProxyEventControlLocalView& proxy_event_control_local,
                                                const EventSubscriptionControl::SubscriberCountType subscriber_count,
                                                const TransactionLog::MaxSampleCountType max_sample_count) noexcept
 {
     const std::uint32_t current_subscription_state{
         CreateEventSubscriptionControlState(subscriber_count, max_sample_count)};
-    EventSubscriptionControlAttorney<EventSubscriptionControl>{event_control.subscription_control}.SetCurrentState(
-        current_subscription_state);
+    EventSubscriptionControlAttorney<EventSubscriptionControl>{proxy_event_control_local.subscription_control}
+        .SetCurrentState(current_subscription_state);
 }
 
 void InsertProxyTransactionLogWithValidTransactions(
-    EventControl& event_control,
+    ProxyEventControlLocalView& proxy_event_control_local,
     const TransactionLog::MaxSampleCountType subscription_max_sample_count,
     const TransactionLogId transaction_log_id) noexcept
 {
     // Modify the SubscriptionControl so that it currently has a record of a single subscriber which subscribed with
     // a sample count of subscription_max_sample_count_
     const EventSubscriptionControl::SubscriberCountType subscriber_count{1U};
-    AddSubscriptionToEventSubscriptionControl(event_control, subscriber_count, subscription_max_sample_count);
+    AddSubscriptionToEventSubscriptionControl(
+        proxy_event_control_local, subscriber_count, subscription_max_sample_count);
 
-    auto& transaction_log_set = event_control.data_control.GetTransactionLogSet();
+    auto& transaction_log_set = proxy_event_control_local.data_control.GetTransactionLogSet();
     const auto transaction_log_index = transaction_log_set.RegisterProxyElement(transaction_log_id).value();
 
     auto& transaction_log = transaction_log_set.GetTransactionLog(transaction_log_index);
@@ -56,9 +57,10 @@ void InsertProxyTransactionLogWithValidTransactions(
     transaction_log.ReferenceTransactionCommit(slot_index);
 }
 
-void InsertSkeletonTransactionLogWithValidTransactions(EventDataControl& event_data_control) noexcept
+void InsertSkeletonTransactionLogWithValidTransactions(
+    SkeletonEventDataControlLocalView<>& skeleton_event_data_control_local) noexcept
 {
-    auto& transaction_log_set = event_data_control.GetTransactionLogSet();
+    auto& transaction_log_set = skeleton_event_data_control_local.GetTransactionLogSet();
     const auto transaction_log_index = transaction_log_set.RegisterSkeletonTracingElement();
 
     auto& transaction_log = transaction_log_set.GetTransactionLog(transaction_log_index);
@@ -69,16 +71,17 @@ void InsertSkeletonTransactionLogWithValidTransactions(EventDataControl& event_d
 }
 
 void InsertProxyTransactionLogWithInvalidTransactions(
-    EventControl& event_control,
+    ProxyEventControlLocalView& proxy_event_control_local,
     const TransactionLog::MaxSampleCountType subscription_max_sample_count,
     const TransactionLogId transaction_log_id) noexcept
 {
     // Modify the SubscriptionControl so that it currently has a record of a single subscriber which subscribed with
     // a sample count of subscription_max_sample_count_
     const EventSubscriptionControl::SubscriberCountType subscriber_count{1U};
-    AddSubscriptionToEventSubscriptionControl(event_control, subscriber_count, subscription_max_sample_count);
+    AddSubscriptionToEventSubscriptionControl(
+        proxy_event_control_local, subscriber_count, subscription_max_sample_count);
 
-    auto& transaction_log_set = event_control.data_control.GetTransactionLogSet();
+    auto& transaction_log_set = proxy_event_control_local.data_control.GetTransactionLogSet();
     const auto transaction_log_index = transaction_log_set.RegisterProxyElement(transaction_log_id).value();
 
     auto& transaction_log = transaction_log_set.GetTransactionLog(transaction_log_index);
@@ -89,9 +92,10 @@ void InsertProxyTransactionLogWithInvalidTransactions(
     transaction_log.ReferenceTransactionBegin(slot_index);
 }
 
-void InsertSkeletonTransactionLogWithInvalidTransactions(EventDataControl& event_data_control) noexcept
+void InsertSkeletonTransactionLogWithInvalidTransactions(
+    SkeletonEventDataControlLocalView<>& skeleton_event_data_control_local) noexcept
 {
-    auto& transaction_log_set = event_data_control.GetTransactionLogSet();
+    auto& transaction_log_set = skeleton_event_data_control_local.GetTransactionLogSet();
     const auto transaction_log_index = transaction_log_set.RegisterSkeletonTracingElement();
 
     auto& transaction_log = transaction_log_set.GetTransactionLog(transaction_log_index);
@@ -100,9 +104,10 @@ void InsertSkeletonTransactionLogWithInvalidTransactions(EventDataControl& event
     transaction_log.ReferenceTransactionBegin(slot_index);
 }
 
-bool IsProxyTransactionLogIdRegistered(EventControl& event_control, const TransactionLogId& transaction_log_id) noexcept
+bool IsProxyTransactionLogIdRegistered(ProxyEventControlLocalView& proxy_event_control_local,
+                                       const TransactionLogId& transaction_log_id) noexcept
 {
-    auto& transaction_log_set = event_control.data_control.GetTransactionLogSet();
+    auto& transaction_log_set = proxy_event_control_local.data_control.GetTransactionLogSet();
     auto& transaction_logs = TransactionLogSetAttorney{transaction_log_set}.GetProxyTransactionLogs();
     const auto result =
         std::find_if(transaction_logs.begin(), transaction_logs.end(), [&transaction_log_id](const auto& element) {
@@ -111,18 +116,11 @@ bool IsProxyTransactionLogIdRegistered(EventControl& event_control, const Transa
     return result != transaction_logs.cend();
 }
 
-bool IsSkeletonTransactionLogRegistered(EventDataControl& event_data_control) noexcept
+bool IsSkeletonTransactionLogRegistered(SkeletonEventDataControlLocalView<>& skeleton_event_data_control_local) noexcept
 {
-    auto& transaction_log_set = event_data_control.GetTransactionLogSet();
+    auto& transaction_log_set = skeleton_event_data_control_local.GetTransactionLogSet();
     auto& transaction_log = TransactionLogSetAttorney{transaction_log_set}.GetSkeletonTransactionLog();
     return transaction_log.has_value();
 }
 
-bool DoesSkeletonTransactionLogContainTransactions(EventDataControl& event_data_control) noexcept
-{
-    auto& transaction_log_set = event_data_control.GetTransactionLogSet();
-    auto& transaction_log = TransactionLogSetAttorney{transaction_log_set}.GetSkeletonTransactionLog();
-    return transaction_log.has_value() && transaction_log.value().get().ContainsTransactions();
-}
-
 }  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h b/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h
index d7506f033..ff97a7db7 100644
--- a/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h
+++ b/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h
@@ -114,25 +114,27 @@ class TransactionLogSetHelperFixture : public ::testing::Test
 
 std::uint32_t CreateEventSubscriptionControlState(EventSubscriptionControl::SubscriberCountType subscriber_count,
                                                   EventSubscriptionControl::SlotNumberType subscribed_slots);
-void AddSubscriptionToEventSubscriptionControl(EventControl& event_control,
+void AddSubscriptionToEventSubscriptionControl(ProxyEventControlLocalView& proxy_event_control_local,
                                                const EventSubscriptionControl::SubscriberCountType subscriber_count,
                                                const TransactionLog::MaxSampleCountType max_sample_count) noexcept;
 void InsertProxyTransactionLogWithValidTransactions(
-    EventControl& event_control,
+    ProxyEventControlLocalView& proxy_event_control_local,
     const TransactionLog::MaxSampleCountType subscription_max_sample_count,
     const TransactionLogId transaction_log_id) noexcept;
-void InsertSkeletonTransactionLogWithValidTransactions(EventDataControl& event_data_control) noexcept;
+void InsertSkeletonTransactionLogWithValidTransactions(
+    SkeletonEventDataControlLocalView<>& skeleton_event_data_control_local) noexcept;
 
 void InsertProxyTransactionLogWithInvalidTransactions(
-    EventControl& event_control,
+    ProxyEventControlLocalView& proxy_event_control_local,
     const TransactionLog::MaxSampleCountType subscription_max_sample_count,
     const TransactionLogId transaction_log_id) noexcept;
-void InsertSkeletonTransactionLogWithInvalidTransactions(EventDataControl& event_data_control) noexcept;
+void InsertSkeletonTransactionLogWithInvalidTransactions(
+    SkeletonEventDataControlLocalView<>& skeleton_event_data_control_local) noexcept;
 
-bool IsProxyTransactionLogIdRegistered(EventControl& event_control,
+bool IsProxyTransactionLogIdRegistered(ProxyEventControlLocalView& proxy_event_control_local,
                                        const TransactionLogId& transaction_log_id) noexcept;
-bool IsSkeletonTransactionLogRegistered(EventDataControl& event_data_control) noexcept;
-bool DoesSkeletonTransactionLogContainTransactions(EventDataControl& event_data_control) noexcept;
+bool IsSkeletonTransactionLogRegistered(
+    SkeletonEventDataControlLocalView<>& skeleton_event_data_control_local) noexcept;
 
 }  // namespace score::mw::com::impl::lola
 
diff --git a/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.cpp b/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.cpp
index 84452007a..83bac5824 100644
--- a/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.cpp
+++ b/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.cpp
@@ -16,8 +16,6 @@
 
 #include <score/assert.hpp>
 
-#include <utility>
-
 namespace score::mw::com::impl::lola
 {
 
@@ -27,28 +25,30 @@ namespace score::mw::com::impl::lola
 // std::bad_optional_access which leds to std::terminate().
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
 score::Result<TransactionLogRegistrationGuard> TransactionLogRegistrationGuard::Create(
-    EventDataControl& event_data_control,
+    ProxyEventDataControlLocalView<>& event_data_control_local,
     const TransactionLogId& transaction_log_id) noexcept
 {
-    auto transaction_log_index_result =
-        event_data_control.GetTransactionLogSet().RegisterProxyElement(transaction_log_id);
+    auto& transaction_log_set = event_data_control_local.GetTransactionLogSet();
+    auto transaction_log_index_result = transaction_log_set.RegisterProxyElement(transaction_log_id);
     if (!(transaction_log_index_result.has_value()))
     {
         return MakeUnexpected<TransactionLogRegistrationGuard>(transaction_log_index_result.error());
     }
-    return TransactionLogRegistrationGuard{event_data_control, transaction_log_index_result.value()};
+    return TransactionLogRegistrationGuard{transaction_log_set, transaction_log_index_result.value()};
 }
 
-TransactionLogRegistrationGuard TransactionLogRegistrationGuard::Create(EventDataControl& event_data_control) noexcept
+TransactionLogRegistrationGuard TransactionLogRegistrationGuard::Create(
+    SkeletonEventDataControlLocalView<>& event_data_control_local) noexcept
 {
-    auto transaction_log_index_result = event_data_control.GetTransactionLogSet().RegisterSkeletonTracingElement();
-    return TransactionLogRegistrationGuard{event_data_control, transaction_log_index_result};
+    auto& transaction_log_set = event_data_control_local.GetTransactionLogSet();
+    auto transaction_log_index_result = transaction_log_set.RegisterSkeletonTracingElement();
+    return TransactionLogRegistrationGuard{transaction_log_set, transaction_log_index_result};
 }
 
 TransactionLogRegistrationGuard::TransactionLogRegistrationGuard(
-    EventDataControl& event_data_control,
+    TransactionLogSet& transaction_log_set,
     const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept
-    : event_data_control_{event_data_control}, transaction_log_index_{transaction_log_index}
+    : transaction_log_set_{transaction_log_set}, transaction_log_index_{transaction_log_index}
 {
 }
 
@@ -56,7 +56,7 @@ TransactionLogRegistrationGuard::~TransactionLogRegistrationGuard() noexcept
 {
     if (transaction_log_index_.has_value())
     {
-        event_data_control_.get().GetTransactionLogSet().Unregister(*transaction_log_index_);
+        transaction_log_set_.get().Unregister(*transaction_log_index_);
     }
 }
 
@@ -71,7 +71,7 @@ TransactionLogRegistrationGuard::TransactionLogRegistrationGuard(TransactionLogR
     // transaction_log_index_ is an optional of std::uint8_t which is not move-constructible.
     // coverity[autosar_cpp14_a12_8_4_violation]
     // coverity[autosar_cpp14_a18_9_2_violation]
-    : event_data_control_{other.event_data_control_}, transaction_log_index_{other.transaction_log_index_}
+    : transaction_log_set_{other.transaction_log_set_}, transaction_log_index_{other.transaction_log_index_}
 {
     // Suppress "AUTOSAR C++14 A18-9-2" rule findings. This rule stated: "Forwarding values to other functions shall
     // be done via: (1) std::move if the value is an rvalue reference, (2) std::forward if the value is forwarding
diff --git a/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.h b/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.h
index dce3ff38d..dc6207993 100644
--- a/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.h
+++ b/score/mw/com/impl/bindings/lola/transaction_log_registration_guard.h
@@ -13,9 +13,11 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_TRANSACTION_LOG_REGISTRATION_GUARD_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_TRANSACTION_LOG_REGISTRATION_GUARD_H
 
-#include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_id.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
+
 #include "score/result/result.h"
 
 #include <functional>
@@ -35,12 +37,15 @@ class TransactionLogRegistrationGuard
     /// \param event_data_control event data control for the service element
     /// \param transaction_log_id transaction log is identifying the proxy instance
     /// \return
-    static score::Result<TransactionLogRegistrationGuard> Create(EventDataControl& event_data_control,
-                                                                 const TransactionLogId& transaction_log_id) noexcept;
+    static score::Result<TransactionLogRegistrationGuard> Create(
+        ProxyEventDataControlLocalView<>& event_data_control_local,
+        const TransactionLogId& transaction_log_id) noexcept;
+
     /// \brief Create func for TransactionLogRegistrationGuard for SkeletonServiceElementTracingTransactionLog
     /// \param event_data_control event_data_control event data control for the service element
     /// \return
-    static TransactionLogRegistrationGuard Create(EventDataControl& event_data_control) noexcept;
+    static TransactionLogRegistrationGuard Create(
+        SkeletonEventDataControlLocalView<>& event_data_control_local) noexcept;
 
     ~TransactionLogRegistrationGuard() noexcept;
 
@@ -54,10 +59,10 @@ class TransactionLogRegistrationGuard
     TransactionLogSet::TransactionLogIndex GetTransactionLogIndex() const noexcept;
 
   private:
-    TransactionLogRegistrationGuard(EventDataControl& event_data_control,
+    TransactionLogRegistrationGuard(TransactionLogSet& transaction_log_set,
                                     const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
 
-    std::reference_wrapper<EventDataControl> event_data_control_;
+    std::reference_wrapper<TransactionLogSet> transaction_log_set_;
     std::optional<TransactionLogSet::TransactionLogIndex> transaction_log_index_;
 };
 
diff --git a/score/mw/com/impl/bindings/lola/transaction_log_registration_guard_test.cpp b/score/mw/com/impl/bindings/lola/transaction_log_registration_guard_test.cpp
index 7c7e7e1b1..c19737fcd 100644
--- a/score/mw/com/impl/bindings/lola/transaction_log_registration_guard_test.cpp
+++ b/score/mw/com/impl/bindings/lola/transaction_log_registration_guard_test.cpp
@@ -13,6 +13,7 @@
 #include "score/mw/com/impl/bindings/lola/transaction_log_registration_guard.h"
 
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
+#include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h"
 #include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
 
@@ -28,14 +29,28 @@ constexpr std::size_t kMaxSlots{5U};
 constexpr std::size_t kMaxSubscribers{5U};
 const TransactionLogId kDummyTransactionLogId{10U};
 
-using TransactionLogRegistrationGuardFixture = TransactionLogSetHelperFixture;
+class TransactionLogRegistrationGuardFixture : public TransactionLogSetHelperFixture
+{
+  public:
+    TransactionLogRegistrationGuardFixture& GivenAnEventDataControl(
+        const SlotIndexType max_slots,
+        const LolaEventInstanceDeployment::SubscriberCountType max_subscribers)
+    {
+        event_data_control_.emplace(max_slots, memory_, max_subscribers);
+        proxy_event_data_control_local_.emplace(event_data_control_.value());
+        return *this;
+    }
+
+    FakeMemoryResource memory_{};
+    std::optional<EventDataControl> event_data_control_{};
+    std::optional<ProxyEventDataControlLocalView<>> proxy_event_data_control_local_{};
+};
 
 TEST_F(TransactionLogRegistrationGuardFixture, CreatingGuardWithAvailableSlotsWillReturnGuard)
 {
-    FakeMemoryResource memory{};
-    EventDataControl event_data_control{kMaxSlots, memory, kMaxSubscribers};
-
-    auto unit = TransactionLogRegistrationGuard::Create(event_data_control, kDummyTransactionLogId);
+    GivenAnEventDataControl(kMaxSlots, kMaxSubscribers);
+    auto unit =
+        TransactionLogRegistrationGuard::Create(proxy_event_data_control_local_.value(), kDummyTransactionLogId);
     EXPECT_TRUE(unit.has_value());
 }
 
@@ -43,13 +58,13 @@ TEST_F(TransactionLogRegistrationGuardFixture, CreatingGuardWithoutAvailableSlot
 {
     constexpr std::size_t max_subscribers{1U};
 
-    FakeMemoryResource memory{};
-    EventDataControl event_data_control{kMaxSlots, memory, max_subscribers};
-
-    auto unit = TransactionLogRegistrationGuard::Create(event_data_control, kDummyTransactionLogId);
+    GivenAnEventDataControl(kMaxSlots, max_subscribers);
+    auto unit =
+        TransactionLogRegistrationGuard::Create(proxy_event_data_control_local_.value(), kDummyTransactionLogId);
     EXPECT_TRUE(unit.has_value());
 
-    auto unit_2 = TransactionLogRegistrationGuard::Create(event_data_control, kDummyTransactionLogId);
+    auto unit_2 =
+        TransactionLogRegistrationGuard::Create(proxy_event_data_control_local_.value(), kDummyTransactionLogId);
     EXPECT_FALSE(unit_2.has_value());
 }
 
@@ -57,13 +72,14 @@ TEST_F(TransactionLogRegistrationGuardFixture, DestroyingGuardWillUnregisterLog)
 {
     const bool expect_needs_rollback{false};
 
-    FakeMemoryResource memory{};
-    EventDataControl event_data_control{kMaxSlots, memory, kMaxSubscribers};
-    auto& transaction_log_set = event_data_control.GetTransactionLogSet();
+    GivenAnEventDataControl(kMaxSlots, kMaxSubscribers);
+    auto& transaction_log_set = proxy_event_data_control_local_->GetTransactionLogSet();
 
     {
         ExpectTransactionLogSetEmpty(transaction_log_set);
-        auto unit = TransactionLogRegistrationGuard::Create(event_data_control, kDummyTransactionLogId).value();
+        auto unit =
+            TransactionLogRegistrationGuard::Create(proxy_event_data_control_local_.value(), kDummyTransactionLogId)
+                .value();
         const auto transaction_log_index = unit.GetTransactionLogIndex();
         ExpectProxyTransactionLogExistsAtIndex(
             transaction_log_set, kDummyTransactionLogId, transaction_log_index, expect_needs_rollback);
@@ -75,13 +91,14 @@ TEST_F(TransactionLogRegistrationGuardFixture, MoveConstructingGuardWillNotUnreg
 {
     const bool expect_needs_rollback{false};
 
-    FakeMemoryResource memory{};
-    EventDataControl event_data_control{kMaxSlots, memory, kMaxSubscribers};
-    auto& transaction_log_set = event_data_control.GetTransactionLogSet();
+    GivenAnEventDataControl(kMaxSlots, kMaxSubscribers);
+    auto& transaction_log_set = proxy_event_data_control_local_->GetTransactionLogSet();
 
     {
         ExpectTransactionLogSetEmpty(transaction_log_set);
-        auto unit = TransactionLogRegistrationGuard::Create(event_data_control, kDummyTransactionLogId).value();
+        auto unit =
+            TransactionLogRegistrationGuard::Create(proxy_event_data_control_local_.value(), kDummyTransactionLogId)
+                .value();
         const auto transaction_log_index = unit.GetTransactionLogIndex();
 
         TransactionLogRegistrationGuard unit2{std::move(unit)};
diff --git a/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.cpp b/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.cpp
index 852341cad..4f658d925 100644
--- a/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.cpp
+++ b/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.cpp
@@ -34,7 +34,7 @@ namespace
 // std::bad_optional_access." and points on statement `for (auto& element : service_data_control.event_controls_)`.
 // This is a false positive; no optional is involved in this statement.
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-void MarkTransactionLogsNeedRollback(ServiceDataControl& service_data_control,
+void MarkTransactionLogsNeedRollback(ProxyServiceDataControlLocalView& service_data_control,
                                      const TransactionLogId transaction_log_id) noexcept
 {
     for (auto& element : service_data_control.event_controls_)
@@ -47,12 +47,13 @@ void MarkTransactionLogsNeedRollback(ServiceDataControl& service_data_control,
 
 }  // namespace
 
-TransactionLogRollbackExecutor::TransactionLogRollbackExecutor(ServiceDataControl& service_data_control,
-                                                               SkeletonInstanceIdentifier skeleton_instance_identifier,
-                                                               const QualityType asil_level,
-                                                               const pid_t provider_pid,
-                                                               const TransactionLogId transaction_log_id) noexcept
-    : service_data_control_{service_data_control},
+TransactionLogRollbackExecutor::TransactionLogRollbackExecutor(
+    ProxyServiceDataControlLocalView& service_data_control_local,
+    const SkeletonInstanceIdentifier skeleton_instance_identifier,
+    const QualityType asil_level,
+    pid_t provider_pid,
+    const TransactionLogId transaction_log_id) noexcept
+    : service_data_control_local_{service_data_control_local},
       asil_level_{asil_level},
       provider_pid_{provider_pid},
       transaction_log_id_{transaction_log_id},
@@ -71,7 +72,7 @@ void TransactionLogRollbackExecutor::PrepareRollback(lola::IRuntime& lola_runtim
     // Register the application's unique identifier (which is the transaction_log_id_ for this context) and
     // current pid in the shared mapping.
     const auto current_pid = lola_runtime.GetPid();
-    const auto previous_pid = service_data_control_.application_id_pid_mapping_.RegisterPid(
+    const auto previous_pid = service_data_control_local_.application_id_pid_mapping_.RegisterPid(
         static_cast<std::uint32_t>(transaction_log_id_), current_pid);
     if (!(previous_pid.has_value()))
     {
@@ -89,7 +90,7 @@ void TransactionLogRollbackExecutor::PrepareRollback(lola::IRuntime& lola_runtim
     }
 
     // Mark all TransactionLogs for each event that correspond to transaction_log_id as needing to be rolled back.
-    MarkTransactionLogsNeedRollback(service_data_control_, transaction_log_id_);
+    MarkTransactionLogsNeedRollback(service_data_control_local_, transaction_log_id_);
 }
 
 // Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
@@ -116,7 +117,7 @@ ResultBlank TransactionLogRollbackExecutor::RollbackTransactionLogs() noexcept
         PrepareRollback(lola_runtime);
     }
 
-    for (auto& element : service_data_control_.event_controls_)
+    for (auto& element : service_data_control_local_.event_controls_)
     {
         auto& event_control = element.second;
         auto& transaction_log_set = event_control.data_control.GetTransactionLogSet();
@@ -126,7 +127,7 @@ ResultBlank TransactionLogRollbackExecutor::RollbackTransactionLogs() noexcept
                 event_control.data_control.DereferenceEventWithoutTransactionLogging(slot_index);
             },
             [&event_control](const TransactionLog::MaxSampleCountType subscription_max_sample_count) noexcept {
-                event_control.subscription_control.Unsubscribe(subscription_max_sample_count);
+                event_control.subscription_control.get().Unsubscribe(subscription_max_sample_count);
             });
         if (!rollback_result.has_value())
         {
diff --git a/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.h b/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.h
index 41939c128..03d00e00a 100644
--- a/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.h
+++ b/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor.h
@@ -13,8 +13,8 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_TRANSACTION_LOG_ROLLBACK_EXECUTOR_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_TRANSACTION_LOG_ROLLBACK_EXECUTOR_H
 
-#include "score/mw/com/impl/bindings/lola/runtime.h"
-#include "score/mw/com/impl/bindings/lola/service_data_control.h"
+#include "score/mw/com/impl/bindings/lola/i_runtime.h"
+#include "score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_instance_identifier.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_id.h"
 #include "score/mw/com/impl/configuration/quality_type.h"
@@ -30,7 +30,7 @@ class TransactionLogRollbackExecutor
     /// \param asil_level asil level of the proxy instance owning this executor.
     /// \param provider_pid pid/node-id of the service instance provider
     /// \param transaction_log_id id of transaction logs to be rolled back.
-    TransactionLogRollbackExecutor(ServiceDataControl& service_data_control,
+    TransactionLogRollbackExecutor(ProxyServiceDataControlLocalView& service_data_control_local,
                                    const SkeletonInstanceIdentifier skeleton_instance_identifier,
                                    const QualityType asil_level,
                                    const pid_t provider_pid,
@@ -39,8 +39,8 @@ class TransactionLogRollbackExecutor
     /// \brief Does a rollback of all transaction logs (log per service element) related to service_data_control/
     ///        transaction_log_id specific to a proxy instance given in the ctor.
     /// \details Besides the pure transaction rollback, there is also some preparation needed/done once for a given
-    ///          service_data_control (independent from the number of local proxy instances referring to it). This is
-    ///          done by an internal call to #PrepareRollback
+    ///          service_data_control (independent from the number of local proxy instances referring to it). This
+    ///          is done by an internal call to #PrepareRollback
     ResultBlank RollbackTransactionLogs() noexcept;
 
   private:
@@ -57,7 +57,7 @@ class TransactionLogRollbackExecutor
     ///             "to-be-rolled-back".
     void PrepareRollback(lola::IRuntime& lola_runtime) noexcept;
 
-    ServiceDataControl& service_data_control_;
+    ProxyServiceDataControlLocalView& service_data_control_local_;
     /// asil level of the service_data_control_
     const QualityType asil_level_;
     /// pid of the provider of the service instance represented by service_data_control_
diff --git a/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor_test.cpp b/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor_test.cpp
index 8d1886227..ff43ecb9f 100644
--- a/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor_test.cpp
+++ b/score/mw/com/impl/bindings/lola/transaction_log_rollback_executor_test.cpp
@@ -14,6 +14,7 @@
 
 #include "score/mw/com/impl/bindings/lola/application_id_pid_mapping.h"
 #include "score/mw/com/impl/bindings/lola/messaging/message_passing_service_mock.h"
+#include "score/mw/com/impl/bindings/lola/proxy_service_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/register_pid_fake.h"
 #include "score/mw/com/impl/bindings/lola/rollback_synchronization.h"
 #include "score/mw/com/impl/bindings/lola/runtime_mock.h"
@@ -71,13 +72,15 @@ class TransactionLogRollbackExecutorFixture : public ::testing::Test
     TransactionLogRollbackExecutorFixture& WithTransactionLogRollbackExecutor()
     {
         service_data_control_ = std::make_unique<ServiceDataControl>(memory_resource_mock_);
-        unit_ = std::make_unique<TransactionLogRollbackExecutor>(*service_data_control_,
+        AddEvent(kDummyElementFqId, kDummySkeletonEventProperties);
+
+        score::cpp::ignore = proxy_service_data_control_local_.emplace(*service_data_control_);
+        unit_ = std::make_unique<TransactionLogRollbackExecutor>(proxy_service_data_control_local_.value(),
                                                                  kSkeletonInstanceIdentifier,
                                                                  kDummyQualityType,
                                                                  kDummyProviderPid,
                                                                  kDummyTransactionLogId);
 
-        AddEvent(kDummyElementFqId, kDummySkeletonEventProperties);
         return *this;
     }
 
@@ -100,10 +103,10 @@ class TransactionLogRollbackExecutorFixture : public ::testing::Test
         ASSERT_EQ(result_pid.value(), pid);
     }
 
-    EventDataControl& GetEventDataControl(const ElementFqId element_fq_id) noexcept
+    ProxyEventDataControlLocalView<>& GetProxyEventDataControlLocalView(const ElementFqId element_fq_id) noexcept
     {
-        auto find_result = service_data_control_->event_controls_.find(element_fq_id);
-        EXPECT_NE(find_result, service_data_control_->event_controls_.cend());
+        auto find_result = proxy_service_data_control_local_->event_controls_.find(element_fq_id);
+        EXPECT_NE(find_result, proxy_service_data_control_local_->event_controls_.cend());
         return find_result->second.data_control;
     }
 
@@ -118,8 +121,8 @@ class TransactionLogRollbackExecutorFixture : public ::testing::Test
         const ElementFqId& element_fq_id,
         const TransactionLogId& transaction_log_id) noexcept
     {
-        auto& event_data_control = GetEventDataControl(element_fq_id);
-        auto& transaction_log_set = event_data_control.GetTransactionLogSet();
+        auto& proxy_event_data_control_local = GetProxyEventDataControlLocalView(element_fq_id);
+        auto& transaction_log_set = proxy_event_data_control_local.GetTransactionLogSet();
         const auto transaction_log_index = transaction_log_set.RegisterProxyElement(transaction_log_id).value();
 
         auto& transaction_logs = TransactionLogSetAttorney{transaction_log_set}.GetProxyTransactionLogs();
@@ -137,6 +140,7 @@ class TransactionLogRollbackExecutorFixture : public ::testing::Test
     MessagePassingServiceMock message_passing_service_mock_{};
 
     std::unique_ptr<ServiceDataControl> service_data_control_{nullptr};
+    std::optional<ProxyServiceDataControlLocalView> proxy_service_data_control_local_{};
     std::unique_ptr<TransactionLogRollbackExecutor> unit_{nullptr};
     RollbackSynchronization rollback_synchronization_{};
 };
diff --git a/score/mw/com/impl/plumbing/proxy_event_field_binding_factory_test.cpp b/score/mw/com/impl/plumbing/proxy_event_field_binding_factory_test.cpp
index 5fc127b29..465ff432f 100644
--- a/score/mw/com/impl/plumbing/proxy_event_field_binding_factory_test.cpp
+++ b/score/mw/com/impl/plumbing/proxy_event_field_binding_factory_test.cpp
@@ -160,8 +160,8 @@ TEST_P(ProxyServiceElementBindingFactoryParamaterisedFixture, CanConstructProxyS
 
     // Given a created proxy binding and dummy SkeletonEvent which a ProxyEvent can subscribe to
     const auto instance_identifier = kConfigStoreAsilB.GetInstanceIdentifier();
-    InitialiseProxyWithConstructor(instance_identifier);
     InitialiseDummySkeletonEvent(GetElementFqId(), kSkeletonEventProperties);
+    InitialiseProxyWithConstructor(instance_identifier);
 
     // and a Proxy that contains a lola binding
     const auto handle = kConfigStoreAsilB.GetHandle();
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 271bb9fbf..be50bd1a3 100644
--- a/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
+++ b/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
@@ -13,6 +13,7 @@
 #include "score/mw/com/impl/plumbing/sample_allocatee_ptr.h"
 
 #include "score/mw/com/impl/bindings/lola/control_slot_types.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h"
 
 #include "score/mw/com/impl/bindings/mock_binding/sample_allocatee_ptr.h"
@@ -52,7 +53,8 @@ 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::SkeletonEventDataControlLocalView<> skeleton_event_data_ctrl_qm_local_{event_data_ctrl_qm_};
+    lola::EventDataControlComposite<> event_data_ctrl_{&skeleton_event_data_ctrl_qm_local_, nullptr};
     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_))};
@@ -522,7 +524,7 @@ TEST_F(SampleAllocateePtrFixture, UnderlyingLolaPtrIsFreedOnDestruction)
     RecordProperty("DerivationTechnique", "Analysis of requirements");
 
     // Given a SampleAllocateePtr with an underlying lola SampleAllocateePtr
-    lola::EventDataControlComposite event_data_ctrl{&event_data_ctrl_qm_};
+    lola::EventDataControlComposite event_data_ctrl{&skeleton_event_data_ctrl_qm_local_, nullptr};
 
     bool is_destructed{false};
     ObjectDestructionNotifier object_destruction_notifier(is_destructed);
diff --git a/score/mw/com/impl/tracing/skeleton_event_tracing.h b/score/mw/com/impl/tracing/skeleton_event_tracing.h
index 859f10e38..a20c9af7d 100644
--- a/score/mw/com/impl/tracing/skeleton_event_tracing.h
+++ b/score/mw/com/impl/tracing/skeleton_event_tracing.h
@@ -113,16 +113,17 @@ TypeErasedSamplePtr CreateTypeErasedSamplePtr(impl::SampleAllocateePtr<SampleTyp
                 lola::SampleAllocateePtrMutableView{lola_ptr}.GetEventDataControlComposite();
             SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(event_data_control_composite_result.has_value());
 
-            auto& event_data_control = event_data_control_composite_result->GetQmEventDataControl();
+            auto& proxy_event_data_control_local =
+                event_data_control_composite_result->GetProxyEventDataControlLocalView();
 
             auto slot_indicator = lola_ptr.GetReferencedSlot();
-            event_data_control.ReferenceSpecificEvent(slot_indicator.GetIndex(),
-                                                      lola::TransactionLogSet::kSkeletonIndexSentinel);
+            proxy_event_data_control_local.ReferenceSpecificEvent(slot_indicator.GetIndex(),
+                                                                  lola::TransactionLogSet::kSkeletonIndexSentinel);
             const auto* const managed_object = lola::SampleAllocateePtrView{lola_ptr}.GetManagedObject();
 
             lola::SamplePtr<SampleType> sample_ptr{
                 managed_object,
-                event_data_control,
+                proxy_event_data_control_local,
                 lola::ControlSlotIndicator(slot_indicator.GetIndex(), slot_indicator.GetSlotQM()),
                 lola::TransactionLogSet::kSkeletonIndexSentinel};
             return impl::tracing::TypeErasedSamplePtr{std::move(sample_ptr)};

From 59160538667ba1540bdddae020745857b624f03a Mon Sep 17 00:00:00 2001
From: Brendan Emery <brendan.be.emery@bmw.de>
Date: Tue, 17 Mar 2026 18:00:15 +0100
Subject: [PATCH 2/3] lola: Pass reference to EventDataControlComposite

Since we always create a QM EventDataControl, we pass it into the
composite by reference instead of by pointer to avoid doing nullptr
checks within the composite (and for clearer semantics).
---
 .../bindings/lola/control_slot_indicator.h    |  1 +
 .../lola/event_data_control_composite.cpp     | 41 +++++++------------
 .../lola/event_data_control_composite.h       |  9 ++--
 .../event_data_control_composite_test.cpp     | 17 +++-----
 .../event_data_control_test_resources.cpp     |  6 +--
 .../lola/sample_allocatee_ptr_test.cpp        |  2 +-
 score/mw/com/impl/bindings/lola/skeleton.cpp  |  2 +-
 score/mw/com/impl/bindings/lola/skeleton.h    | 16 ++++----
 .../plumbing/sample_allocatee_ptr_test.cpp    |  4 +-
 9 files changed, 40 insertions(+), 58 deletions(-)

diff --git a/score/mw/com/impl/bindings/lola/control_slot_indicator.h b/score/mw/com/impl/bindings/lola/control_slot_indicator.h
index b67141660..9ab8b74b3 100644
--- a/score/mw/com/impl/bindings/lola/control_slot_indicator.h
+++ b/score/mw/com/impl/bindings/lola/control_slot_indicator.h
@@ -22,6 +22,7 @@
 namespace score::mw::com::impl::lola
 {
 
+/// GTODO: Remove!!!
 /// \brief Helper class which identifies a slot in our "control slot array" using both the slot index and a raw pointer
 ///        to the element.
 /// \details We combine identification by the index of the slot and a (raw) pointer to the slot. Reasoning:
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 d0584f77c..43c87a87b 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
@@ -27,7 +27,7 @@ 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>
 EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(
-    SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+    SkeletonEventDataControlLocalView<>& asil_qm_control_local,
     ProxyEventDataControlLocalView<>* const proxy_control_local)
     : EventDataControlComposite{asil_qm_control_local, nullptr, proxy_control_local}
 {
@@ -35,7 +35,7 @@ EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(
 
 template <template <class> class AtomicIndirectorType>
 EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(
-    SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+    SkeletonEventDataControlLocalView<>& asil_qm_control_local,
     SkeletonEventDataControlLocalView<>* const asil_b_control_local,
     ProxyEventDataControlLocalView<>* const proxy_control_local)
     : asil_qm_control_local_{asil_qm_control_local},
@@ -43,7 +43,6 @@ EventDataControlComposite<AtomicIndirectorType>::EventDataControlComposite(
       proxy_control_local_{proxy_control_local},
       ignore_qm_control_{false}
 {
-    CheckForValidDataControls();
 }
 
 template <template <class> class AtomicIndirectorType>
@@ -82,7 +81,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::GetNextFreeMultiSlot() con
     for (auto [current_index, it_slots_qm, it_slots_asil_b] = std::make_tuple(
              // coverity[autosar_cpp14_a5_2_2_violation]
              std::size_t{0U},
-             asil_qm_control_local_->state_slots_.begin(),
+             asil_qm_control_local_.get().state_slots_.begin(),
              asil_b_control_local_->state_slots_.begin());
          current_index != asil_b_control_local_->state_slots_.size();
          // coverity[autosar_cpp14_m6_5_5_violation]
@@ -116,10 +115,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::GetNextFreeMultiSlot() con
     {
         return {possible_index.value(), *qm_slot_ptr, *asil_b_slot_ptr};
     }
-    else
-    {
-        return {};
-    }
+    return {};
 }
 
 template <template <class> class AtomicIndirectorType>
@@ -196,7 +192,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcep
 {
     if (asil_b_control_local_ == nullptr)
     {
-        auto qm_control_slot_indicator = asil_qm_control_local_->AllocateNextSlot();
+        auto qm_control_slot_indicator = asil_qm_control_local_.get().AllocateNextSlot();
         if (qm_control_slot_indicator.IsValid())
         {
             return {qm_control_slot_indicator.GetIndex(),
@@ -251,7 +247,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::EventReady(ControlSlotComp
 
     if (!ignore_qm_control_)
     {
-        asil_qm_control_local_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, time_stamp);
+        asil_qm_control_local_.get().EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, time_stamp);
     }
 }
 
@@ -265,7 +261,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::Discard(ControlSlotComposi
 
     if (!ignore_qm_control_)
     {
-        asil_qm_control_local_->Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()});
+        asil_qm_control_local_.get().Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()});
     }
 }
 
@@ -279,7 +275,7 @@ template <template <class> class AtomicIndirectorType>
 SkeletonEventDataControlLocalView<>& EventDataControlComposite<AtomicIndirectorType>::GetQmEventDataControlLocal()
     const noexcept
 {
-    return *asil_qm_control_local_;
+    return asil_qm_control_local_;
 }
 
 template <template <class> class AtomicIndirectorType>
@@ -309,21 +305,12 @@ EventSlotStatus::EventTimeStamp EventDataControlComposite<AtomicIndirectorType>:
     }
     else
     {
-        const EventSlotStatus event_slot_status{(*asil_qm_control_local_)[slot]};
+        const EventSlotStatus event_slot_status{asil_qm_control_local_.get()[slot]};
         const EventSlotStatus::EventTimeStamp sample_timestamp{event_slot_status.GetTimeStamp()};
         return sample_timestamp;
     }
 }
 
-template <template <class> class AtomicIndirectorType>
-void EventDataControlComposite<AtomicIndirectorType>::CheckForValidDataControls() const noexcept
-{
-    if (asil_qm_control_local_ == nullptr)
-    {
-        std::terminate();
-    }
-}
-
 template <template <class> class AtomicIndirectorType>
 // Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
 // implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
@@ -333,17 +320,17 @@ template <template <class> class AtomicIndirectorType>
 EventSlotStatus::EventTimeStamp EventDataControlComposite<AtomicIndirectorType>::GetLatestTimestamp() const noexcept
 {
     EventSlotStatus::EventTimeStamp latest_time_stamp{1U};
-    SkeletonEventDataControlLocalView<>* control =
-        (asil_b_control_local_ != nullptr) ? asil_b_control_local_ : asil_qm_control_local_;
+    SkeletonEventDataControlLocalView<>& control =
+        (asil_b_control_local_ != nullptr) ? *asil_b_control_local_ : asil_qm_control_local_.get();
     for (SlotIndexType slot_index = 0U;
          // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall not lead to
          // loss.". As the maximum number of slots is std::uint16_t, so there is no case for a data loss here.
          // coverity[autosar_cpp14_a4_7_1_violation]
-         slot_index < static_cast<SlotIndexType>(control->state_slots_.size());
+         slot_index < static_cast<SlotIndexType>(control.state_slots_.size());
          ++slot_index)
     {
-        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < control->state_slots_.size());
-        const EventSlotStatus slot{control->state_slots_[slot_index].load(std::memory_order_acquire)};
+        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < control.state_slots_.size());
+        const EventSlotStatus slot{control.state_slots_[slot_index].load(std::memory_order_acquire)};
         if (!slot.IsInvalid() && !slot.IsInWriting())
         {
             const auto slot_time_stamp = slot.GetTimeStamp();
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 b636a194c..cb3512493 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
@@ -15,14 +15,13 @@
 
 #include "score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h"
 #include "score/mw/com/impl/bindings/lola/control_slot_types.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_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 
 #include "score/memory/shared/atomic_indirector.h"
 
-#include <optional>
+#include <functional>
 
 namespace score::mw::com::impl::lola
 {
@@ -47,11 +46,11 @@ class EventDataControlComposite
 
   public:
     /// \brief Constructs a composite which will only manage a single QM control (no ASIL use-case)
-    explicit EventDataControlComposite(SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+    explicit EventDataControlComposite(SkeletonEventDataControlLocalView<>& asil_qm_control_local,
                                        ProxyEventDataControlLocalView<>* const proxy_control_local);
 
     /// \brief Constructs a composite which will manage QM and ASIL control at the same time
-    explicit EventDataControlComposite(SkeletonEventDataControlLocalView<>* const asil_qm_control_local,
+    explicit EventDataControlComposite(SkeletonEventDataControlLocalView<>& asil_qm_control_local,
                                        SkeletonEventDataControlLocalView<>* const asil_b_control_local,
                                        ProxyEventDataControlLocalView<>* const proxy_control_local);
 
@@ -104,7 +103,7 @@ class EventDataControlComposite
     EventSlotStatus::EventTimeStamp GetLatestTimestamp() const noexcept;
 
   private:
-    SkeletonEventDataControlLocalView<>* asil_qm_control_local_;
+    std::reference_wrapper<SkeletonEventDataControlLocalView<>> asil_qm_control_local_;
     SkeletonEventDataControlLocalView<>* asil_b_control_local_;
 
     ProxyEventDataControlLocalView<>* proxy_control_local_;
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 a3008e3e9..902ffdaa0 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
@@ -107,7 +107,7 @@ class EventDataControlCompositeFixture : public ::testing::Test
         SCORE_LANGUAGE_FUTURECPP_ASSERT(skeleton_qm_local_.has_value());
 
         auto* const asil_control = skeleton_asil_local_.has_value() ? &skeleton_asil_local_.value() : nullptr;
-        unit_ = std::make_unique<EventDataControlComposite<>>(&skeleton_qm_local_.value(), asil_control, nullptr);
+        unit_ = std::make_unique<EventDataControlComposite<>>(skeleton_qm_local_.value(), asil_control, nullptr);
         return *this;
     }
 
@@ -120,7 +120,7 @@ class EventDataControlCompositeFixture : public ::testing::Test
 
         auto* const asil_control = skeleton_asil_local_.has_value() ? &skeleton_asil_local_.value() : nullptr;
         unit_mock_ = std::make_unique<EventDataControlComposite<memory::shared::AtomicIndirectorMock>>(
-            &skeleton_qm_local_.value(), asil_control, nullptr);
+            skeleton_qm_local_.value(), asil_control, nullptr);
 
         return *this;
     }
@@ -597,7 +597,7 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
     SkeletonEventDataControlLocalView skeleton_asil_local{asil};
     SkeletonEventDataControlLocalView skeleton_qm_local{qm};
 
-    EventDataControlComposite unit{&skeleton_qm_local, &skeleton_asil_local, nullptr};
+    EventDataControlComposite unit{skeleton_qm_local, &skeleton_asil_local, nullptr};
 
     std::mutex allocated_slots_mutex{};
     std::vector<ControlSlotCompositeIndicator> allocated_slots{};
@@ -765,7 +765,7 @@ TEST_F(EventDataControlCompositeFixture, GetProxyEventDataControlLocalView)
     EventDataControl qm{kMaxSlots, memory_, kMaxSubscribers};
     SkeletonEventDataControlLocalView<> skeleton_qm_local{qm};
     ProxyEventDataControlLocalView<> proxy_qm_local{qm};
-    EventDataControlComposite<> unit{&skeleton_qm_local, &proxy_qm_local};
+    EventDataControlComposite<> unit{skeleton_qm_local, &proxy_qm_local};
 
     // When getting the ASIL-B event data control
     auto& returned_proxy_qm_local = unit.GetProxyEventDataControlLocalView();
@@ -782,7 +782,7 @@ TEST_F(EventDataControlCompositeFixture, GetProxyEventDataControlLocalViewWithAs
     SkeletonEventDataControlLocalView<> skeleton_qm_local{qm};
     SkeletonEventDataControlLocalView<> skeleton_asil_b_local{asil_b};
     ProxyEventDataControlLocalView<> proxy_qm_local{qm};
-    EventDataControlComposite<> unit{&skeleton_qm_local, &skeleton_asil_b_local, &proxy_qm_local};
+    EventDataControlComposite<> unit{skeleton_qm_local, &skeleton_asil_b_local, &proxy_qm_local};
 
     // When getting the ASIL-B event data control
     auto& returned_proxy_qm_local = unit.GetProxyEventDataControlLocalView();
@@ -797,18 +797,13 @@ TEST_F(EventDataControlCompositeFixture,
     // Given an EventDataControlComposite constructed without a ProxyEventDataControlLocalView
     EventDataControl qm{kMaxSlots, memory_, kMaxSubscribers};
     SkeletonEventDataControlLocalView<> skeleton_qm_local{qm};
-    EventDataControlComposite<> unit{&skeleton_qm_local, nullptr};
+    EventDataControlComposite<> unit{skeleton_qm_local, nullptr};
 
     // When getting the ASIL-B event data control
     // Then the program terminates
     EXPECT_DEATH(score::cpp::ignore = unit.GetProxyEventDataControlLocalView(), ".*");
 }
 
-TEST(EventDataControlCompositeDeathTest, DiesOnConstructionWithNullptr)
-{
-    EXPECT_DEATH(EventDataControlComposite(nullptr, nullptr), ".*");
-}
-
 using EventDataControlCompositeGetTimestampFixture = EventDataControlCompositeFixture;
 TEST_F(EventDataControlCompositeGetTimestampFixture, CanAllocateOneSlot)
 {
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 49d454eda..f1b2d5985 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
@@ -32,7 +32,7 @@ void EventDataControlCompositeAttorney::PrepareAllocateNextSlot(
     // we want, that event_data_control_composite_ returns slot_index from call to AllocateNextSlot().
     // To achieve this, we set the reference-count of all slots but slot_index to a value > 0.
     EventSlotStatus::EventTimeStamp timestamp{1};
-    const auto number_states_slots = event_data_control_composite_.asil_qm_control_local_->state_slots_.size();
+    const auto number_states_slots = event_data_control_composite_.asil_qm_control_local_.get().state_slots_.size();
     for (std::size_t index{0}; index < number_states_slots; index++)
     {
         EventSlotStatus status{};
@@ -46,7 +46,7 @@ void EventDataControlCompositeAttorney::PrepareAllocateNextSlot(
         {
             status.SetReferenceCount(1U);
         }
-        event_data_control_composite_.asil_qm_control_local_->state_slots_[index].store(
+        event_data_control_composite_.asil_qm_control_local_.get().state_slots_[index].store(
             static_cast<EventSlotStatus::value_type>(status));
         if (event_data_control_composite_.asil_b_control_local_ != nullptr)
         {
@@ -64,7 +64,7 @@ void EventDataControlCompositeAttorney::SetQmControlDisconnected(const bool expe
 std::pair<EventSlotStatus, score::cpp::optional<EventSlotStatus>> EventDataControlCompositeAttorney::GetSlotStatus(
     const SlotIndexType slot_index) const noexcept
 {
-    return {EventSlotStatus(event_data_control_composite_.asil_qm_control_local_->state_slots_[slot_index]),
+    return {EventSlotStatus(event_data_control_composite_.asil_qm_control_local_.get().state_slots_[slot_index]),
             event_data_control_composite_.asil_b_control_local_ != nullptr
                 ? score::cpp::optional<EventSlotStatus>(
                       event_data_control_composite_.asil_b_control_local_->state_slots_[slot_index])
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 a9cd6323f..47a155a1a 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
@@ -41,7 +41,7 @@ class SampleAllocateePtrFixture : public ::testing::Test
     FakeMemoryResource memory_{};
     EventDataControl control_block_{kMaxSlots, memory_, kMaxSubscribers};
     SkeletonEventDataControlLocalView<> skeleton_event_data_control_local_{control_block_};
-    EventDataControlComposite<> control_composite_{&skeleton_event_data_control_local_, nullptr};
+    EventDataControlComposite<> control_composite_{skeleton_event_data_control_local_, nullptr, nullptr};
 };
 
 TEST_F(SampleAllocateePtrFixture, PtrContainingInvalidSlotIsNotDestroyingAnything)
diff --git a/score/mw/com/impl/bindings/lola/skeleton.cpp b/score/mw/com/impl/bindings/lola/skeleton.cpp
index 7e8e8baa5..0b7929d33 100644
--- a/score/mw/com/impl/bindings/lola/skeleton.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton.cpp
@@ -1133,7 +1133,7 @@ EventDataControlComposite<> Skeleton::CreateEventControlComposite(
     // coverity[autosar_cpp14_m7_5_1_violation]
     // coverity[autosar_cpp14_m7_5_2_violation]
     // coverity[autosar_cpp14_a3_8_1_violation]
-    return EventDataControlComposite{&skeleton_event_data_control_local_qm.get().data_control,
+    return EventDataControlComposite{skeleton_event_data_control_local_qm.get().data_control,
                                      control_asil_local_result,
                                      proxy_event_data_control_local};
 }
diff --git a/score/mw/com/impl/bindings/lola/skeleton.h b/score/mw/com/impl/bindings/lola/skeleton.h
index 8f9338d91..435bd8168 100644
--- a/score/mw/com/impl/bindings/lola/skeleton.h
+++ b/score/mw/com/impl/bindings/lola/skeleton.h
@@ -451,14 +451,14 @@ auto Skeleton::OpenEventDataFromOpenedSharedMemory(const ElementFqId element_fq_
     // The "event_data_control_asil_b" and "typed_event_data_storage_ptr" are still valid lifetime even returned pointer
     // to internal state until Skeleton object is alive.
     // coverity[autosar_cpp14_a3_8_1_violation]
-    return {typed_event_data_storage_ptr,
-            // The lifetime of the "event_data_control_asil_b" object lasts as long as the Skeleton is alive.
-            // coverity[autosar_cpp14_m7_5_1_violation]
-            // coverity[autosar_cpp14_m7_5_2_violation]
-            // coverity[autosar_cpp14_a3_8_1_violation]
-            EventDataControlComposite{&event_control_qm_it->second.data_control,
-                                      event_data_control_asil_b_local,
-                                      proxy_event_data_control_local}};
+    return {
+        typed_event_data_storage_ptr,
+        // The lifetime of the "event_data_control_asil_b" object lasts as long as the Skeleton is alive.
+        // coverity[autosar_cpp14_m7_5_1_violation]
+        // coverity[autosar_cpp14_m7_5_2_violation]
+        // coverity[autosar_cpp14_a3_8_1_violation]
+        EventDataControlComposite{
+            event_control_qm_it->second.data_control, event_data_control_asil_b_local, proxy_event_data_control_local}};
 }
 
 template <typename SampleType>
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 be50bd1a3..a036a6c98 100644
--- a/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
+++ b/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
@@ -54,7 +54,7 @@ class SampleAllocateePtrFixture : public ::testing::Test
     lola::FakeMemoryResource fake_memory_resource_{};
     lola::EventDataControl event_data_ctrl_qm_{0, fake_memory_resource_, 1U};
     lola::SkeletonEventDataControlLocalView<> skeleton_event_data_ctrl_qm_local_{event_data_ctrl_qm_};
-    lola::EventDataControlComposite<> event_data_ctrl_{&skeleton_event_data_ctrl_qm_local_, nullptr};
+    lola::EventDataControlComposite<> event_data_ctrl_{skeleton_event_data_ctrl_qm_local_, nullptr};
     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_))};
@@ -524,7 +524,7 @@ TEST_F(SampleAllocateePtrFixture, UnderlyingLolaPtrIsFreedOnDestruction)
     RecordProperty("DerivationTechnique", "Analysis of requirements");
 
     // Given a SampleAllocateePtr with an underlying lola SampleAllocateePtr
-    lola::EventDataControlComposite event_data_ctrl{&skeleton_event_data_ctrl_qm_local_, nullptr};
+    lola::EventDataControlComposite event_data_ctrl{skeleton_event_data_ctrl_qm_local_, nullptr};
 
     bool is_destructed{false};
     ObjectDestructionNotifier object_destruction_notifier(is_destructed);

From 5dc4dba4886c6a8454ded67c662d904e5839e28f Mon Sep 17 00:00:00 2001
From: Brendan Emery <brendan.be.emery@bmw.de>
Date: Thu, 19 Mar 2026 17:50:51 +0100
Subject: [PATCH 3/3] Remove ControlSlotIndicator and
 ControlSlotCompositeIndicator

We previously introduced these classes to avoid additional bounds
checking done when indexing into a DynamicArray in shared memory. Since
we now are using the local views into shared memory, we no longer need
this optimisation and can revert to simply accessing slots using their
indices.
---
 score/mw/com/impl/bindings/lola/BUILD         |  47 ----
 .../lola/control_slot_composite_indicator.cpp | 109 --------
 .../lola/control_slot_composite_indicator.h   |  75 ------
 .../control_slot_composite_indicator_test.cpp | 245 ------------------
 .../bindings/lola/control_slot_indicator.cpp  |  52 ----
 .../bindings/lola/control_slot_indicator.h    |  56 ----
 .../lola/control_slot_indicator_test.cpp      | 113 --------
 .../lola/event_data_control_composite.cpp     | 125 +++------
 .../lola/event_data_control_composite.h       |  39 ++-
 .../event_data_control_composite_test.cpp     | 166 ++++++------
 .../bindings/lola/generic_proxy_event.cpp     |  15 +-
 .../bindings/lola/generic_skeleton_event.cpp  |  40 +--
 score/mw/com/impl/bindings/lola/proxy_event.h |  13 +-
 .../impl/bindings/lola/proxy_event_common.cpp |   2 +-
 .../impl/bindings/lola/proxy_event_common.h   |   4 +-
 .../proxy_event_data_control_local_view.cpp   |  32 +--
 .../proxy_event_data_control_local_view.h     |  15 +-
 ...oxy_event_data_control_local_view_test.cpp |  63 ++---
 .../impl/bindings/lola/sample_allocatee_ptr.h |  36 +--
 .../lola/sample_allocatee_ptr_test.cpp        | 125 +++------
 score/mw/com/impl/bindings/lola/sample_ptr.h  |   9 +-
 .../impl/bindings/lola/sample_ptr_test.cpp    |  42 +--
 .../com/impl/bindings/lola/skeleton_event.h   |  19 +-
 ...skeleton_event_data_control_local_view.cpp |  92 +++----
 .../skeleton_event_data_control_local_view.h  |  15 +-
 ...ton_event_data_control_local_view_test.cpp |  66 +++--
 .../bindings/lola/skeleton_event_test.cpp     |  12 +-
 .../com/impl/bindings/lola/skeleton_test.cpp  |  22 +-
 .../com/impl/bindings/lola/slot_collector.cpp |  21 +-
 .../com/impl/bindings/lola/slot_collector.h   |  15 +-
 .../bindings/lola/slot_collector_test.cpp     |  14 +-
 .../impl/bindings/lola/slot_decrementer.cpp   |  14 +-
 .../com/impl/bindings/lola/slot_decrementer.h |   6 +-
 .../bindings/lola/slot_decrementer_test.cpp   |  38 +--
 .../lola/test/proxy_event_test_resources.cpp  |   6 +-
 .../test/skeleton_event_component_test.cpp    |   6 +-
 .../plumbing/rust/sample_allocatee_ptr.rs     |  21 +-
 score/mw/com/impl/plumbing/rust/sample_ptr.rs |  19 +-
 .../rust/test_support/test_helper_size_ffi.rs |  10 -
 .../test_helper_size_provider.cpp             |  22 --
 .../test_support/test_helper_size_provider.h  |   6 -
 .../plumbing/sample_allocatee_ptr_test.cpp    |  12 +-
 .../com/impl/tracing/skeleton_event_tracing.h |  16 +-
 43 files changed, 495 insertions(+), 1380 deletions(-)
 delete mode 100644 score/mw/com/impl/bindings/lola/control_slot_composite_indicator.cpp
 delete mode 100644 score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h
 delete mode 100644 score/mw/com/impl/bindings/lola/control_slot_composite_indicator_test.cpp
 delete mode 100644 score/mw/com/impl/bindings/lola/control_slot_indicator.cpp
 delete mode 100644 score/mw/com/impl/bindings/lola/control_slot_indicator.h
 delete mode 100644 score/mw/com/impl/bindings/lola/control_slot_indicator_test.cpp

diff --git a/score/mw/com/impl/bindings/lola/BUILD b/score/mw/com/impl/bindings/lola/BUILD
index c56230618..bef169f46 100644
--- a/score/mw/com/impl/bindings/lola/BUILD
+++ b/score/mw/com/impl/bindings/lola/BUILD
@@ -559,26 +559,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "control_slot_indicator",
-    srcs = [
-        "control_slot_composite_indicator.cpp",
-        "control_slot_indicator.cpp",
-    ],
-    hdrs = [
-        "control_slot_composite_indicator.h",
-        "control_slot_indicator.h",
-    ],
-    features = COMPILER_WARNING_FEATURES,
-    tags = ["FFI"],
-    visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
-    deps = [
-        ":control_slot_types",
-        ":event_slot_status",
-        "@score_baselibs//score/language/futurecpp",
-    ],
-)
-
 cc_library(
     name = "event_data_control",
     srcs = ["event_data_control.cpp"],
@@ -587,7 +567,6 @@ cc_library(
     tags = ["FFI"],
     visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
     deps = [
-        ":control_slot_indicator",
         ":control_slot_types",
         ":event_slot_status",
         ":transaction_log",
@@ -607,7 +586,6 @@ cc_library(
     tags = ["FFI"],
     visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
     deps = [
-        ":control_slot_indicator",
         ":control_slot_types",
         ":event_data_control",
         ":event_slot_status",
@@ -624,7 +602,6 @@ cc_library(
     tags = ["FFI"],
     visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
     deps = [
-        ":control_slot_indicator",
         ":control_slot_types",
         ":event_data_control",
         ":event_slot_status",
@@ -1234,28 +1211,6 @@ cc_gtest_unit_test(
     ],
 )
 
-cc_gtest_unit_test(
-    name = "control_slot_composite_indicator_test",
-    srcs = [
-        "control_slot_composite_indicator_test.cpp",
-    ],
-    features = COMPILER_WARNING_FEATURES,
-    deps = [
-        ":control_slot_indicator",
-    ],
-)
-
-cc_gtest_unit_test(
-    name = "control_slot_indicator_test",
-    srcs = [
-        "control_slot_indicator_test.cpp",
-    ],
-    features = COMPILER_WARNING_FEATURES,
-    deps = [
-        ":control_slot_indicator",
-    ],
-)
-
 cc_gtest_unit_test(
     name = "element_fq_id_test",
     srcs = [
@@ -1552,8 +1507,6 @@ cc_unit_test(
 cc_unit_test_suites_for_host_and_qnx(
     name = "unit_test_suite",
     cc_unit_tests = [
-        ":control_slot_composite_indicator_test",
-        ":control_slot_indicator_test",
         ":element_fq_id_test",
         ":event_data_storage_test",
         ":event_slot_status_test",
diff --git a/score/mw/com/impl/bindings/lola/control_slot_composite_indicator.cpp b/score/mw/com/impl/bindings/lola/control_slot_composite_indicator.cpp
deleted file mode 100644
index c43ca995a..000000000
--- a/score/mw/com/impl/bindings/lola/control_slot_composite_indicator.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-#include "score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h"
-
-#include <score/assert.hpp>
-
-namespace score::mw::com::impl::lola
-{
-
-// Suppress "AUTOSAR C++14 A12-1-5" rule finding. This rule declares: "Common class initialization for non-constant
-// members shall be done by a delegating constructor.".
-// Here we can not delegate to the 2nd ctor as it needs VALID references forControlSlotType args!
-// coverity[autosar_cpp14_a12_1_5_violation]
-ControlSlotCompositeIndicator::ControlSlotCompositeIndicator() noexcept
-    : slot_index_{0U}, slot_pointer_qm_{nullptr}, slot_pointer_asil_b_{nullptr}
-{
-}
-
-ControlSlotCompositeIndicator::ControlSlotCompositeIndicator(SlotIndexType slot_index,
-                                                             ControlSlotType& slot_qm,
-                                                             ControlSlotType& slot_asil_b)
-    : slot_index_{slot_index}, slot_pointer_qm_{&slot_qm}, slot_pointer_asil_b_{&slot_asil_b}
-{
-}
-
-ControlSlotCompositeIndicator::ControlSlotCompositeIndicator(SlotIndexType slot_index,
-                                                             ControlSlotType& slot,
-                                                             CompositeSlotTagType type)
-    : slot_index_{slot_index},
-      slot_pointer_qm_{type == CompositeSlotTagType::QM ? &slot : nullptr},
-      slot_pointer_asil_b_{type == CompositeSlotTagType::ASIL_B ? &slot : nullptr}
-{
-}
-
-bool ControlSlotCompositeIndicator::IsValidQmAndAsilB() const
-{
-    return ((slot_pointer_qm_ != nullptr) && (slot_pointer_asil_b_ != nullptr));
-}
-
-bool ControlSlotCompositeIndicator::IsValidQM() const
-{
-    return (slot_pointer_qm_ != nullptr);
-}
-
-bool ControlSlotCompositeIndicator::IsValidAsilB() const
-{
-    return (slot_pointer_asil_b_ != nullptr);
-}
-
-SlotIndexType ControlSlotCompositeIndicator::GetIndex() const
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD((slot_pointer_qm_ != nullptr) || (slot_pointer_asil_b_ != nullptr));
-    return slot_index_;
-}
-
-ControlSlotType& ControlSlotCompositeIndicator::GetSlotQM()
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_pointer_qm_ != nullptr);
-    return *slot_pointer_qm_;
-}
-
-const ControlSlotType& ControlSlotCompositeIndicator::GetSlotQM() const
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_pointer_qm_ != nullptr);
-    return *slot_pointer_qm_;
-}
-
-ControlSlotType& ControlSlotCompositeIndicator::GetSlotAsilB()
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_pointer_asil_b_ != nullptr);
-    return *slot_pointer_asil_b_;
-}
-
-const ControlSlotType& ControlSlotCompositeIndicator::GetSlotAsilB() const
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_pointer_asil_b_ != nullptr);
-    return *slot_pointer_asil_b_;
-}
-
-void ControlSlotCompositeIndicator::Reset()
-{
-    slot_pointer_qm_ = nullptr;
-    slot_pointer_asil_b_ = nullptr;
-}
-
-bool operator==(const ControlSlotCompositeIndicator& lhs, const ControlSlotCompositeIndicator& rhs) noexcept
-{
-    // Suppress "AUTOSAR C++14 A5-2-6" rule finding. This rule states:"The operands of a logical && or \\ shall be
-    // parenthesized if the operands contain binary operators".
-    // This a false-positive, all operands are parenthesized.
-    // A bug ticket has been created to track this: [Ticket-165315](broken_link_j/Ticket-165315)
-    // coverity[autosar_cpp14_a5_2_6_violation : FALSE]
-    return (lhs.IsValidQM() == rhs.IsValidQM()) && (lhs.IsValidAsilB() == rhs.IsValidAsilB()) &&
-           ((lhs.IsValidQM() == false) || (lhs.GetIndex() == rhs.GetIndex())) &&
-           ((lhs.IsValidQM() == false) || (&(lhs.GetSlotQM()) == &(rhs.GetSlotQM()))) &&
-           ((lhs.IsValidAsilB() == false) || (&(lhs.GetSlotAsilB()) == &(rhs.GetSlotAsilB())));
-}
-
-}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h b/score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h
deleted file mode 100644
index b9817e951..000000000
--- a/score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-#ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_COMPOSITE_INDICATOR_H
-#define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_COMPOSITE_INDICATOR_H
-
-#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
-#include "score/mw/com/impl/bindings/lola/event_slot_status.h"
-
-#include <atomic>
-#include <cstddef>
-
-namespace score::mw::com::impl::lola
-{
-
-/// \brief Helper class (similar to ControlSlotIndicator), which identifies a slot in our "control slot array" using
-///        both the slot index and a raw pointer to the element.
-/// \details Opposed to ControlSlotIndicator, this is an slot indicator for QM slots AND ASIL-B slots! Normally such a
-///          ControlSlotCompositeIndicator returned e.g. by a slot allocation for an event/field supporting QM and
-///          ASIL-B contains a slot-pointer for a QM slot and an ASIL-B slot. If the underlying event/field just has
-///          QM support only a valid slot-pointer for QM is contained. In case only a ASIL-B slot pointer is contained
-///          (#IsValidAsilB() = true), but no QM slot pointer is contained (#IsValidQM() = false), then we have the
-///          case, where QM consumers have been disconnected and the composite is falling back to ASIL-B only.
-class ControlSlotCompositeIndicator
-{
-  public:
-    enum class CompositeSlotTagType : std::uint8_t
-    {
-        QM,
-        ASIL_B
-    };
-    ControlSlotCompositeIndicator() noexcept;
-
-    ControlSlotCompositeIndicator(SlotIndexType slot_index, ControlSlotType& slot_qm, ControlSlotType& slot_asil_b);
-
-    ControlSlotCompositeIndicator(SlotIndexType slot_index, ControlSlotType& slot, CompositeSlotTagType type);
-
-    bool IsValidQmAndAsilB() const;
-
-    bool IsValidQM() const;
-
-    bool IsValidAsilB() const;
-
-    SlotIndexType GetIndex() const;
-
-    ControlSlotType& GetSlotQM();
-
-    const ControlSlotType& GetSlotQM() const;
-
-    ControlSlotType& GetSlotAsilB();
-
-    const ControlSlotType& GetSlotAsilB() const;
-
-    void Reset();
-
-  private:
-    SlotIndexType slot_index_;
-    ControlSlotType* slot_pointer_qm_;
-    ControlSlotType* slot_pointer_asil_b_;
-};
-
-bool operator==(const ControlSlotCompositeIndicator& lhs, const ControlSlotCompositeIndicator& rhs) noexcept;
-
-}  // namespace score::mw::com::impl::lola
-
-#endif  // SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_COMPOSITE_INDICATOR_H
diff --git a/score/mw/com/impl/bindings/lola/control_slot_composite_indicator_test.cpp b/score/mw/com/impl/bindings/lola/control_slot_composite_indicator_test.cpp
deleted file mode 100644
index 1839675c0..000000000
--- a/score/mw/com/impl/bindings/lola/control_slot_composite_indicator_test.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-#include "score/mw/com/impl/bindings/lola/control_slot_composite_indicator.h"
-#include <cstdint>
-
-#include <gtest/gtest.h>
-
-namespace score::mw::com::impl::lola
-{
-namespace
-{
-
-TEST(ControlSlotCompositeIndicator, Creation_Default)
-{
-    // given a default constructed ControlSlotIndicator
-    ControlSlotCompositeIndicator unit{};
-
-    // expect it to be completely invalid
-    EXPECT_FALSE(unit.IsValidQM());
-    EXPECT_FALSE(unit.IsValidAsilB());
-    EXPECT_FALSE(unit.IsValidQmAndAsilB());
-}
-
-TEST(ControlSlotCompositeIndicator, Creation_ValidQM)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    // given a ControlSlotCompositeIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, ControlSlotCompositeIndicator::CompositeSlotTagType::QM};
-
-    // expect QM to be valid
-    EXPECT_TRUE(unit.IsValidQM());
-    // but ASIL-B not
-    EXPECT_FALSE(unit.IsValidAsilB());
-    EXPECT_FALSE(unit.IsValidQmAndAsilB());
-}
-
-TEST(ControlSlotCompositeIndicator, Creation_ValidAsilB)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotCompositeIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{
-        slot_index, slot_asilb, ControlSlotCompositeIndicator::CompositeSlotTagType::ASIL_B};
-
-    // expect ASIL-B to be valid
-    EXPECT_TRUE(unit.IsValidAsilB());
-    // but QM not
-    EXPECT_FALSE(unit.IsValidQM());
-    EXPECT_FALSE(unit.IsValidQmAndAsilB());
-}
-
-TEST(ControlSlotCompositeIndicator, Creation_ValidQmAndAsilB)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_asilb{27U};
-    ControlSlotType slot_qm{28U};
-    // given a ControlSlotCompositeIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, slot_asilb};
-
-    // expect ASIL-B and QM to be valid
-    EXPECT_TRUE(unit.IsValidAsilB());
-    EXPECT_TRUE(unit.IsValidQM());
-    EXPECT_TRUE(unit.IsValidQmAndAsilB());
-}
-
-TEST(ControlSlotCompositeIndicator, GetSlotQM)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    // given a ControlSlotCompositeIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, ControlSlotCompositeIndicator::CompositeSlotTagType::QM};
-
-    // expect slot being accessible and containing expected value
-    EXPECT_EQ(unit.GetSlotQM(), 27U);
-}
-
-TEST(ControlSlotCompositeIndicator, GetSlotAsilB)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotCompositeIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{
-        slot_index, slot_asilb, ControlSlotCompositeIndicator::CompositeSlotTagType::ASIL_B};
-
-    // expect slot being accessible and containing expected value
-    EXPECT_EQ(unit.GetSlotAsilB(), 27U);
-}
-
-TEST(ControlSlotCompositeIndicator, GetIndex_QmOnly)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    // given a ControlSlotCompositeIndicator created with a given index/slot for QM
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, ControlSlotCompositeIndicator::CompositeSlotTagType::QM};
-
-    // expect index being accessible and containing expected value
-    EXPECT_EQ(unit.GetIndex(), slot_index);
-}
-
-TEST(ControlSlotCompositeIndicator, GetIndex_AsilBOnly)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotCompositeIndicator created with a given index/slot for ASIL-B
-    ControlSlotCompositeIndicator unit{
-        slot_index, slot_asilb, ControlSlotCompositeIndicator::CompositeSlotTagType::ASIL_B};
-
-    // expect index being accessible and containing expected value
-    EXPECT_EQ(unit.GetIndex(), slot_index);
-}
-
-TEST(ControlSlotCompositeIndicator, Copy)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, slot_asilb};
-
-    // and a copy from it
-    ControlSlotCompositeIndicator unit2{unit};
-
-    // expect the members of both being equal
-    EXPECT_EQ(unit.GetIndex(), unit2.GetIndex());
-    EXPECT_EQ(unit.GetSlotQM(), unit2.GetSlotQM());
-    EXPECT_EQ(unit.GetSlotAsilB(), unit2.GetSlotAsilB());
-}
-
-TEST(ControlSlotCompositeIndicator, Equal)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, slot_asilb};
-
-    // and a copy from it
-    ControlSlotCompositeIndicator unit2{unit};
-
-    // expect both comparing equal
-    EXPECT_EQ(unit, unit2);
-}
-
-TEST(ControlSlotCompositeIndicator, NotEqual)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, slot_asilb};
-
-    // and a 2nd unit with a different qm-slot
-    ControlSlotType slot_qm2{27U};
-    ControlSlotCompositeIndicator unit2{slot_index, slot_qm2, slot_asilb};
-
-    // expect both NOT comparing equal
-    EXPECT_FALSE(unit == unit2);
-}
-
-TEST(ControlSlotCompositeIndicator, Reset)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, slot_asilb};
-
-    // when calling Reset()
-    unit.Reset();
-
-    // expect, that the unit is invalid
-    EXPECT_FALSE(unit.IsValidQM());
-    EXPECT_FALSE(unit.IsValidAsilB());
-}
-
-TEST(ControlSlotCompositeIndicatorDeathTest, QmSlotAccessDies)
-{
-    // given a default constructed ControlSlotCompositeIndicator
-    ControlSlotCompositeIndicator unit{};
-
-    // expect it to die, when accessing the qm-slot
-    EXPECT_DEATH(unit.GetSlotQM(), ".*");
-}
-
-TEST(ControlSlotCompositeIndicatorDeathTest, AsilBSlotAccessDies)
-{
-    // given a default constructed ControlSlotCompositeIndicator
-    ControlSlotCompositeIndicator unit{};
-
-    // expect it to die, when accessing the asil-b slot
-    EXPECT_DEATH(unit.GetSlotAsilB(), ".*");
-}
-
-TEST(ControlSlotCompositeIndicatorDeathTest, IndexAccessDies)
-{
-    // given a default constructed ControlSlotCompositeIndicator
-    ControlSlotCompositeIndicator unit{};
-
-    // expect it to die, when accessing the index
-    EXPECT_DEATH(unit.GetIndex(), ".*");
-}
-
-TEST(ControlSlotCompositeIndicatorDeathTest, IndexAccessAfterResetDies)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, slot_asilb};
-
-    // when calling Reset()
-    unit.Reset();
-
-    // expect it to die, when accessing the index afterwards
-    EXPECT_DEATH(unit.GetIndex(), ".*");
-}
-
-TEST(ControlSlotCompositeIndicatorDeathTest, SlotAccessAfterResetDies)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot_qm{27U};
-    ControlSlotType slot_asilb{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotCompositeIndicator unit{slot_index, slot_qm, slot_asilb};
-
-    // when calling Reset()
-    unit.Reset();
-
-    // expect it to die, when accessing a slot afterwards
-    EXPECT_DEATH(unit.GetSlotQM(), ".*");
-}
-
-}  // namespace
-}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/control_slot_indicator.cpp b/score/mw/com/impl/bindings/lola/control_slot_indicator.cpp
deleted file mode 100644
index 2cc25bae6..000000000
--- a/score/mw/com/impl/bindings/lola/control_slot_indicator.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
-
-#include <score/assert.hpp>
-
-namespace score::mw::com::impl::lola
-{
-// Suppress "AUTOSAR C++14 A12-1-5" rule finding. This rule declares: "Common class initialization for non-constant
-// members shall be done by a delegating constructor.".
-// Here we can not delegate to the 2nd ctor as it needs VALID reference for ControlSlotType!
-// coverity[autosar_cpp14_a12_1_5_violation]
-ControlSlotIndicator::ControlSlotIndicator() : slot_index_{0U}, slot_pointer_{nullptr} {}
-
-ControlSlotIndicator::ControlSlotIndicator(SlotIndexType slot_index, ControlSlotType& slot)
-    : slot_index_{slot_index}, slot_pointer_{&slot}
-{
-}
-
-bool ControlSlotIndicator::IsValid() const
-{
-    return (slot_pointer_ != nullptr);
-}
-
-SlotIndexType ControlSlotIndicator::GetIndex() const
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_pointer_ != nullptr);
-    return slot_index_;
-}
-
-ControlSlotType& ControlSlotIndicator::GetSlot()
-{
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_pointer_ != nullptr);
-    return *slot_pointer_;
-}
-
-void ControlSlotIndicator::Reset()
-{
-    slot_pointer_ = nullptr;
-}
-
-}  // namespace score::mw::com::impl::lola
diff --git a/score/mw/com/impl/bindings/lola/control_slot_indicator.h b/score/mw/com/impl/bindings/lola/control_slot_indicator.h
deleted file mode 100644
index 9ab8b74b3..000000000
--- a/score/mw/com/impl/bindings/lola/control_slot_indicator.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-#ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_INDICATOR_H
-#define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_INDICATOR_H
-
-#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
-#include "score/mw/com/impl/bindings/lola/event_slot_status.h"
-
-#include <atomic>
-#include <cstddef>
-
-namespace score::mw::com::impl::lola
-{
-
-/// GTODO: Remove!!!
-/// \brief Helper class which identifies a slot in our "control slot array" using both the slot index and a raw pointer
-///        to the element.
-/// \details We combine identification by the index of the slot and a (raw) pointer to the slot. Reasoning:
-///          Sometimes the index is more appropriate - as we have a 1:1 relation between slot indices in DATA and
-///          CONTROL arrays. But the slot access via index might be not as efficient! (Hint: DynamicArrays based
-///          on OffsetPtr, which represent our "control slot array", will give you the penalty of bounds-checking, when
-///          doing index based access). If the access can be performance critical, the access via the raw-pointer is
-///          preferred (and if its safe as the slot has been already bounds-checked.
-class ControlSlotIndicator
-{
-  public:
-    ControlSlotIndicator();
-
-    ControlSlotIndicator(SlotIndexType slot_index, ControlSlotType& slot);
-
-    bool IsValid() const;
-
-    SlotIndexType GetIndex() const;
-
-    ControlSlotType& GetSlot();
-
-    void Reset();
-
-  private:
-    SlotIndexType slot_index_;
-    ControlSlotType* slot_pointer_;
-};
-
-}  // namespace score::mw::com::impl::lola
-
-#endif  // SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_INDICATOR_H
diff --git a/score/mw/com/impl/bindings/lola/control_slot_indicator_test.cpp b/score/mw/com/impl/bindings/lola/control_slot_indicator_test.cpp
deleted file mode 100644
index 82a135b24..000000000
--- a/score/mw/com/impl/bindings/lola/control_slot_indicator_test.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
-#include <cstdint>
-
-#include <gtest/gtest.h>
-
-namespace score::mw::com::impl::lola
-{
-namespace
-{
-
-TEST(ControlSlotIndicator, Creation_Default)
-{
-    // given a default constructed ControlSlotIndicator
-    ControlSlotIndicator unit{};
-
-    // expect it to be invalid
-    EXPECT_FALSE(unit.IsValid());
-}
-
-TEST(ControlSlotIndicator, Creation_Valid)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotIndicator unit{slot_index, slot};
-
-    // expect it to be valid
-    EXPECT_TRUE(unit.IsValid());
-}
-
-TEST(ControlSlotIndicator, GetSlot)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotIndicator unit{slot_index, slot};
-
-    // expect slot being accessible and containing expected value
-    EXPECT_EQ(unit.GetSlot(), 27U);
-}
-
-TEST(ControlSlotIndicator, GetIndex)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotIndicator unit{slot_index, slot};
-
-    // expect it to be valid
-    EXPECT_EQ(unit.GetIndex(), 42U);
-}
-
-TEST(ControlSlotIndicator, Copy)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotIndicator unit{slot_index, slot};
-
-    // and a copy from it
-    ControlSlotIndicator unit2{unit};
-
-    // expect the members of both being equal
-    EXPECT_EQ(unit.GetIndex(), unit2.GetIndex());
-    EXPECT_EQ(unit.GetSlot(), unit2.GetSlot());
-}
-
-TEST(ControlSlotIndicator, Reset)
-{
-    SlotIndexType slot_index{42U};
-    ControlSlotType slot{27U};
-    // given a ControlSlotIndicator created with a given index/slot
-    ControlSlotIndicator unit{slot_index, slot};
-
-    // when calling Reset()
-    unit.Reset();
-
-    // expect, that the unit is invalid
-    EXPECT_FALSE(unit.IsValid());
-}
-
-TEST(ControlSlotIndicatorDeathTest, SlotAccessDies)
-{
-    // given a default constructed ControlSlotIndicator
-    ControlSlotIndicator unit{};
-
-    // expect it to die, when accessing the slot
-    EXPECT_DEATH(unit.GetSlot(), ".*");
-}
-
-TEST(ControlSlotIndicatorDeathTest, IndexAccessDies)
-{
-    // given a default constructed ControlSlotIndicator
-    ControlSlotIndicator unit{};
-
-    // expect it to die, when accessing the index
-    EXPECT_DEATH(unit.GetIndex(), ".*");
-}
-
-}  // namespace
-}  // namespace score::mw::com::impl::lola
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 43c87a87b..13308552a 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,8 +11,9 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/event_data_control_composite.h"
+#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
 
-#include <utility>
+#include <optional>
 
 namespace score::mw::com::impl::lola
 {
@@ -53,59 +54,29 @@ template <template <class> class AtomicIndirectorType>
 // [Ticket-173043](broken_link_j/Ticket-173043)
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
 auto EventDataControlComposite<AtomicIndirectorType>::GetNextFreeMultiSlot() const noexcept
-    -> ControlSlotCompositeIndicator
+    -> std::optional<SlotWithTimeStamp>
 {
     EventSlotStatus::EventTimeStamp oldest_time_stamp{EventSlotStatus::TIMESTAMP_MAX};
     score::cpp::optional<SlotIndexType> possible_index{};
     SkeletonEventDataControlLocalView<>::LocalEventControlSlots::iterator qm_slot_ptr{};
     SkeletonEventDataControlLocalView<>::LocalEventControlSlots::iterator asil_b_slot_ptr{};
 
-    // Here we are explicitly iterating via iterators/raw-pointers over the slots as it avoids unnecessary
-    // bounds-checks, which index access would apply!
-    // Suppress "AUTOSAR C++14 A5-2-2" finding rule. This rule states: "Traditional C-style casts shall not be used".
-    // There is no C-style cast happening here! "current_index" and "it" are automatically deduced.
-    // Suppress "AUTOSAR C++14 M6-5-5" finding rule. This rule states: "A loop-control-variable other than the
-    // loop-counter shall not be modified within condition or expression".
-    // Both variables (current_index, it) depict exactly the same element once via index addressing and once via
-    // iterator/raw-pointer! The func has to return both, and we want both to be fully in sync, therefore we increment
-    // them both symmetrically, since in this case, it is less error-prone!
-    // Suppress "AUTOSAR C++14 M5-0-15". This rule states:"indexing shall be the only form of pointer arithmetic.".
-    // Rationale: Tolerated due to containers providing pointer-like iterators.
-    // The Coverity tool considers these iterators as raw pointers.
-    // Suppress "AUTOSAR C++14 A12-8-3". This rule states:"Moved-from object shall not be read-accessed.".
-    // Rationale: This is a false positive, object is not moved-from.
-    // Suppress "AUTOSAR C++14 M5-2-10". This rule states: "The increment (++) and decrement (--) operators shall not be
-    // mixed with other operators in an expression".
-    // Rationale: We are only using increment operators here on separate variables! That we use it on separate variables
-    // is explained above for M6-5-5.
-    for (auto [current_index, it_slots_qm, it_slots_asil_b] = std::make_tuple(
-             // coverity[autosar_cpp14_a5_2_2_violation]
-             std::size_t{0U},
-             asil_qm_control_local_.get().state_slots_.begin(),
-             asil_b_control_local_->state_slots_.begin());
-         current_index != asil_b_control_local_->state_slots_.size();
-         // coverity[autosar_cpp14_m6_5_5_violation]
-         // coverity[autosar_cpp14_m5_0_15_violation]
-         // coverity[autosar_cpp14_a12_8_3_violation : FALSE]
-         // coverity[autosar_cpp14_m5_2_10_violation]
-         ++it_slots_qm,
-                                           // coverity[autosar_cpp14_m5_0_15_violation]
-                                           // coverity[autosar_cpp14_m6_5_5_violation]
-         ++it_slots_asil_b,
-                                           // coverity[autosar_cpp14_a12_8_3_violation : FALSE]
-                                           // coverity[autosar_cpp14_m6_5_5_violation]
-         ++current_index)
+    for (SlotIndexType slot_index = 0U;
+         // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall not lead to
+         // loss.". As the maximum number of slots is std::uint16_t, so there is no case for a data loss here.
+         // coverity[autosar_cpp14_a4_7_1_violation]
+         slot_index < static_cast<SlotIndexType>(asil_b_control_local_->state_slots_.size());
+         ++slot_index)
     {
-        const EventSlotStatus slot_qm{it_slots_qm->load(std::memory_order_acquire)};
-        const EventSlotStatus slot_b{it_slots_asil_b->load(std::memory_order_acquire)};
+        const EventSlotStatus slot_qm{
+            asil_qm_control_local_.get().state_slots_[slot_index].load(std::memory_order_acquire)};
+        const EventSlotStatus slot_b{asil_b_control_local_->state_slots_[slot_index].load(std::memory_order_acquire)};
         if (slot_b.IsInvalid() || ((slot_qm.IsUsed() == false) && (slot_b.IsUsed() == false)))
         {
             const auto time_stamp = slot_b.GetTimeStamp();
             if (time_stamp < oldest_time_stamp)
             {
-                possible_index = current_index;
-                qm_slot_ptr = it_slots_qm;
-                asil_b_slot_ptr = it_slots_asil_b;
+                possible_index = slot_index;
                 oldest_time_stamp = time_stamp;
             }
         }
@@ -113,7 +84,7 @@ auto EventDataControlComposite<AtomicIndirectorType>::GetNextFreeMultiSlot() con
 
     if (possible_index.has_value())
     {
-        return {possible_index.value(), *qm_slot_ptr, *asil_b_slot_ptr};
+        return {{possible_index.value(), oldest_time_stamp}};
     }
     return {};
 }
@@ -124,16 +95,21 @@ 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 EventDataControlComposite<AtomicIndirectorType>::TryLockSlot(ControlSlotCompositeIndicator slot_indicator) noexcept
-    -> bool
+auto EventDataControlComposite<AtomicIndirectorType>::TryLockSlot(
+    const SlotWithTimeStamp expected_slot_with_timestamp) noexcept -> bool
 {
-    auto& slot_value_qm = slot_indicator.GetSlotQM();
-    auto& slot_value_asil_b = slot_indicator.GetSlotAsilB();
+    const auto [slot_index, expected_time_stamp] = expected_slot_with_timestamp;
+
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) <
+                                        asil_qm_control_local_.get().state_slots_.size());
+    auto& slot_value_qm = asil_qm_control_local_.get().state_slots_[slot_index];
+    auto& slot_value_asil_b = asil_b_control_local_->state_slots_[slot_index];
 
     EventSlotStatus asil_qm_old{slot_value_qm.load(std::memory_order_acquire)};
     EventSlotStatus asil_b_old{slot_value_asil_b.load(std::memory_order_acquire)};
 
-    if (asil_qm_old.IsUsed() || asil_b_old.IsUsed())
+    if ((asil_qm_old.IsUsed() || (asil_qm_old.GetTimeStamp() > expected_time_stamp)) ||
+        (asil_b_old.IsUsed() || (asil_b_old.GetTimeStamp() > expected_time_stamp)))
     {
         return false;
     }
@@ -167,7 +143,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 EventDataControlComposite<AtomicIndirectorType>::AllocateNextMultiSlot() noexcept -> ControlSlotCompositeIndicator
+auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextMultiSlot() noexcept -> std::optional<SlotIndexType>
 {
     // \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
@@ -175,11 +151,11 @@ auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextMultiSlot() no
     for (std::size_t counter{0U}; counter < MAX_MULTI_ALLOCATE_RETRY_COUNT; ++counter)
     {
         const auto possible_slot = GetNextFreeMultiSlot();
-        if (possible_slot.IsValidQmAndAsilB())
+        if (possible_slot.has_value())
         {
-            if (TryLockSlot(possible_slot))
+            if (TryLockSlot(possible_slot.value()))
             {
-                return possible_slot;
+                return possible_slot->slot_index;
             }
         }
     }
@@ -188,34 +164,20 @@ auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextMultiSlot() no
 }
 
 template <template <class> class AtomicIndirectorType>
-auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcept -> ControlSlotCompositeIndicator
+auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcept -> AllocationResult
 {
     if (asil_b_control_local_ == nullptr)
     {
-        auto qm_control_slot_indicator = asil_qm_control_local_.get().AllocateNextSlot();
-        if (qm_control_slot_indicator.IsValid())
-        {
-            return {qm_control_slot_indicator.GetIndex(),
-                    qm_control_slot_indicator.GetSlot(),
-                    ControlSlotCompositeIndicator::CompositeSlotTagType::QM};
-        }
-        return {};
+        return {asil_qm_control_local_.get().AllocateNextSlot(), false};
     }
 
     if (ignore_qm_control_)
     {
-        auto asil_b_control_slot_indicator = asil_b_control_local_->AllocateNextSlot();
-        if (asil_b_control_slot_indicator.IsValid())
-        {
-            return {asil_b_control_slot_indicator.GetIndex(),
-                    asil_b_control_slot_indicator.GetSlot(),
-                    ControlSlotCompositeIndicator::CompositeSlotTagType::ASIL_B};
-        }
-        return {};
+        return {asil_b_control_local_->AllocateNextSlot(), true};
     }
 
     auto slot = AllocateNextMultiSlot();
-    if (!(slot.IsValidQmAndAsilB()))
+    if (!(slot.has_value()))
     {
         // we failed to allocate a "multi-slot". This is per our definition a misbehaviour of the QM consumers.
         // Even if it could be, that the ASIL-B side (ASIL-B producer and ASIL-B consumers are occupying all slots!
@@ -223,45 +185,38 @@ auto EventDataControlComposite<AtomicIndirectorType>::AllocateNextSlot() noexcep
         // to be able to allocate a further slot ...
         ignore_qm_control_ = true;
         // fall back to allocation solely within asil_b control.
-        auto asil_b_control_slot_indicator = asil_b_control_local_->AllocateNextSlot();
-        if (asil_b_control_slot_indicator.IsValid())
-        {
-            return {asil_b_control_slot_indicator.GetIndex(),
-                    asil_b_control_slot_indicator.GetSlot(),
-                    ControlSlotCompositeIndicator::CompositeSlotTagType::ASIL_B};
-        }
-        return {};
+        slot = asil_b_control_local_->AllocateNextSlot();
     }
-    return slot;
+    return {slot, ignore_qm_control_};
 }
 
 template <template <class> class AtomicIndirectorType>
-auto EventDataControlComposite<AtomicIndirectorType>::EventReady(ControlSlotCompositeIndicator slot_indicator,
+auto EventDataControlComposite<AtomicIndirectorType>::EventReady(const SlotIndexType slot_index,
                                                                  EventSlotStatus::EventTimeStamp time_stamp) noexcept
     -> void
 {
     if (asil_b_control_local_ != nullptr)
     {
-        asil_b_control_local_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotAsilB()}, time_stamp);
+        asil_b_control_local_->EventReady(slot_index, time_stamp);
     }
 
     if (!ignore_qm_control_)
     {
-        asil_qm_control_local_.get().EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, time_stamp);
+        asil_qm_control_local_.get().EventReady(slot_index, time_stamp);
     }
 }
 
 template <template <class> class AtomicIndirectorType>
-auto EventDataControlComposite<AtomicIndirectorType>::Discard(ControlSlotCompositeIndicator slot_indicator) -> void
+auto EventDataControlComposite<AtomicIndirectorType>::Discard(const SlotIndexType slot_index) -> void
 {
     if (asil_b_control_local_ != nullptr)
     {
-        asil_b_control_local_->Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotAsilB()});
+        asil_b_control_local_->Discard(slot_index);
     }
 
     if (!ignore_qm_control_)
     {
-        asil_qm_control_local_.get().Discard({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()});
+        asil_qm_control_local_.get().Discard(slot_index);
     }
 }
 
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 cb3512493..4acc9874b 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
@@ -13,7 +13,6 @@
 #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"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
 #include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
@@ -45,6 +44,18 @@ class EventDataControlComposite
     friend class lola::EventDataControlCompositeAttorney;
 
   public:
+    /// \brief Result returned by AllocateNextSlot()
+    struct AllocationResult
+    {
+        // \brief the index of the slot reserved for writing (potentially in QM and ASIL-B control section) if a slot
+        // could be found. Otherwise, an empty optional.
+        std::optional<SlotIndexType> allocated_slot_index;
+
+        // \brief A flag indicating whether QM consumers should be ignored due to misbehaviour. In this case, QM
+        // consumers have been disconnected and therefore the QM related slots are ignored.
+        bool qm_misbehaved;
+    };
+
     /// \brief Constructs a composite which will only manage a single QM control (no ASIL use-case)
     explicit EventDataControlComposite(SkeletonEventDataControlLocalView<>& asil_qm_control_local,
                                        ProxyEventDataControlLocalView<>* const proxy_control_local);
@@ -66,20 +77,18 @@ class EventDataControlComposite
     /// rollback mechanisms are in place. Thus, if this function returns positively, it is guaranteed that the slot has
     /// been allocated in all underlying control structures.
     ///
-    /// \return A valid ControlSlotCompositeIndicator "pointing" to a reserved slot for writing (potentially in QM and
-    ///         ASIL-B control section) if successful. If the underlying event was enabled for QM AND ASIL-B and the
-    ///         returned ControlSlotCompositeIndicator has no valid QM pointer, it means, that QM consumers have been
-    ///         disconnected and therefore the QM related slots are ignored.
+    /// \return Struct containing index of slot which was marked for writing if possible and a flag indicating whether a
+    /// qm consumer misbehaved.
     /// \post EventReady() is invoked to withdraw write-ownership
-    ControlSlotCompositeIndicator AllocateNextSlot() noexcept;
+    AllocationResult AllocateNextSlot() noexcept;
 
     /// \brief Indicates that a slot is ready for reading - writing has finished. (thread-safe, wait-free)
     /// \pre AllocateNextSlot() was invoked to obtain write-ownership
-    void EventReady(ControlSlotCompositeIndicator slot_indicator, EventSlotStatus::EventTimeStamp time_stamp) noexcept;
+    void EventReady(const SlotIndexType slot_index, EventSlotStatus::EventTimeStamp time_stamp) noexcept;
 
     /// \brief Marks selected slot as invalid, if it was not yet marked as ready (thread-safe, wait-free)
     /// \pre AllocateNextSlot() was invoked to obtain write-ownership
-    void Discard(ControlSlotCompositeIndicator slot_indicator);
+    void Discard(const SlotIndexType slot_index);
 
     /// \brief Indicates, whether the QM control part of the composite has been disconnected due to QM consumer mis-
     ///        behaviour or not.
@@ -98,11 +107,17 @@ class EventDataControlComposite
     ProxyEventDataControlLocalView<>& GetProxyEventDataControlLocalView() noexcept;
 
     /// \brief Returns the timestamp of the provided slot index
-    EventSlotStatus::EventTimeStamp GetEventSlotTimestamp(const SlotIndexType slot) const noexcept;
+    EventSlotStatus::EventTimeStamp GetEventSlotTimestamp(const SlotIndexType slot_index) const noexcept;
 
     EventSlotStatus::EventTimeStamp GetLatestTimestamp() const noexcept;
 
   private:
+    struct SlotWithTimeStamp
+    {
+        SlotIndexType slot_index;
+        EventSlotStatus::EventTimeStamp timestamp;
+    };
+
     std::reference_wrapper<SkeletonEventDataControlLocalView<>> asil_qm_control_local_;
     SkeletonEventDataControlLocalView<>* asil_b_control_local_;
 
@@ -113,10 +128,10 @@ class EventDataControlComposite
     bool ignore_qm_control_;
 
     // Algorithms that operate on multiple control blocks
-    ControlSlotCompositeIndicator GetNextFreeMultiSlot() const noexcept;
+    std::optional<SlotWithTimeStamp> GetNextFreeMultiSlot() const noexcept;
 
-    bool TryLockSlot(ControlSlotCompositeIndicator slot_indicator) noexcept;
-    ControlSlotCompositeIndicator AllocateNextMultiSlot() noexcept;
+    bool TryLockSlot(const SlotWithTimeStamp expected_slot_with_timestamp) noexcept;
+    std::optional<SlotIndexType> AllocateNextMultiSlot() noexcept;
     void CheckForValidDataControls() const noexcept;
 };
 
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 902ffdaa0..2b3be217f 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
@@ -143,7 +143,7 @@ class EventDataControlCompositeFixture : public ::testing::Test
     {
         for (auto counter = 0U; counter < kSlotCount; ++counter)
         {
-            slot_indicators_[counter] = unit_->AllocateNextSlot();
+            score::cpp::ignore = unit_->AllocateNextSlot();
         }
     }
 
@@ -151,7 +151,7 @@ class EventDataControlCompositeFixture : public ::testing::Test
     {
         for (SlotIndexType counter = 0; counter < kSlotCount; ++counter)
         {
-            unit_->EventReady(slot_indicators_[counter], counter + 1u);
+            unit_->EventReady(counter, counter + 1u);
         }
     }
 
@@ -159,13 +159,11 @@ class EventDataControlCompositeFixture : public ::testing::Test
     {
         for (SlotIndexType counter = 0; counter < kSlotCount; ++counter)
         {
-            auto slot_indicator = slot_indicators_[counter];
-            skeleton_qm_local_->EventReady({slot_indicator.GetIndex(), slot_indicator.GetSlotQM()}, counter + 1u);
+            skeleton_qm_local_->EventReady(counter, counter + 1u);
         }
     }
 
     memory::shared::NewDeleteDelegateMemoryResource memory_{kMemoryResourceId};
-    std::array<ControlSlotCompositeIndicator, kSlotCount> slot_indicators_{};
 
     std::unique_ptr<EventDataControl> asil_{nullptr};
     std::unique_ptr<EventDataControl> qm_{nullptr};
@@ -194,19 +192,19 @@ TEST_F(EventDataControlCompositeFixture, CanAllocateOneSlot)
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the first slot is used
-    EXPECT_EQ(allocation.GetIndex(), 0);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 0);
 
     // And there was no indication of QM misbehaviour
-    EXPECT_TRUE(allocation.IsValidQmAndAsilB());
+    EXPECT_FALSE(allocation.qm_misbehaved);
 }
 
 TEST_F(EventDataControlCompositeFixture, GetLatestTimeStampReturnCorrectValue)
 {
     // Given an EventDataControlComposite with 1 allocated slots that are set to ready
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
-    auto slot_indicator = unit_->AllocateNextSlot();
+    score::cpp::ignore = unit_->AllocateNextSlot();
     const EventSlotStatus::EventTimeStamp time_stamp{2};
-    unit_->EventReady(slot_indicator, time_stamp);
+    unit_->EventReady(SlotIndexType{0U}, time_stamp);
 
     // When acquiring the latest timestamp
     const auto time_stamp_obtained = unit_->GetLatestTimestamp();
@@ -223,10 +221,10 @@ TEST_F(EventDataControlCompositeFixture, CanAllocateMultipleSlots)
     // Then it is possible to allocate 2 slots.
     const auto allocation_slot_1 = unit_->AllocateNextSlot();
     const SlotIndexType slot_1_index{0};
-    ASSERT_EQ(allocation_slot_1.GetIndex(), slot_1_index);
+    ASSERT_EQ(allocation_slot_1.allocated_slot_index.value(), slot_1_index);
     const auto allocation_slot_2 = unit_->AllocateNextSlot();
     const SlotIndexType slot_2_index{1};
-    ASSERT_EQ(allocation_slot_2.GetIndex(), slot_2_index);
+    ASSERT_EQ(allocation_slot_2.allocated_slot_index.value(), slot_2_index);
 }
 
 TEST_F(EventDataControlCompositeFixture, GetLatestTimeStampReturnCorrectValueIfOneSlotIsMarkedAsInvalid)
@@ -235,15 +233,15 @@ TEST_F(EventDataControlCompositeFixture, GetLatestTimeStampReturnCorrectValueIfO
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
 
     // When allocating 2 slots
-    auto slot_indicator_1 = unit_->AllocateNextSlot();
-    auto slot_indicator_2 = unit_->AllocateNextSlot();
+    auto allocation_result = unit_->AllocateNextSlot();
+    auto allocation_result_2 = unit_->AllocateNextSlot();
 
     // and set slot 1 to ready
     EventSlotStatus::EventTimeStamp time_stamp{2};
-    unit_->EventReady(slot_indicator_1, time_stamp);
+    unit_->EventReady(allocation_result.allocated_slot_index.value(), time_stamp);
 
     // and discarding slot 2
-    unit_->Discard(slot_indicator_2);
+    unit_->Discard(allocation_result.allocated_slot_index.value());
 
     // Then the timestamp is equal to 2
     time_stamp = unit_->GetLatestTimestamp();
@@ -257,12 +255,12 @@ TEST_F(EventDataControlCompositeFixture, GetLatestTimeStampReturnsDefaultValuesI
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
 
     // When allocating 2 slots
-    auto slot_indicator_1 = unit_->AllocateNextSlot();
-    auto slot_indicator_2 = unit_->AllocateNextSlot();
+    auto allocation_result = unit_->AllocateNextSlot();
+    auto allocation_result_2 = unit_->AllocateNextSlot();
 
     // and discarding them
-    unit_->Discard(slot_indicator_1);
-    unit_->Discard(slot_indicator_2);
+    unit_->Discard(allocation_result.allocated_slot_index.value());
+    unit_->Discard(allocation_result_2.allocated_slot_index.value());
 
     // Then the timestamp equal to 1
     auto time_stamp = unit_->GetLatestTimestamp();
@@ -312,11 +310,11 @@ TEST_F(EventDataControlCompositeFixture, FailingToLockQmMultiSlotAllocatesOnlyAs
     const auto allocation = unit_mock_->AllocateNextSlot();
 
     // Then it tries to allocate the asil b slot again and the first slot is still used
-    EXPECT_EQ(allocation.GetIndex(), 0);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 0);
 
     // And there is an indication of QM misbehaviour. I.e. allocation only contains a valid ASIL-B slot pointer, but no
     // QM slot pointer.
-    EXPECT_TRUE(allocation.IsValidAsilB() && !allocation.IsValidQM());
+    EXPECT_TRUE(allocation.qm_misbehaved);
 }
 
 TEST_F(EventDataControlCompositeFixture, FailingToLockAsilMultiSlotStillAllocatesAsilBSlot)
@@ -339,10 +337,10 @@ TEST_F(EventDataControlCompositeFixture, FailingToLockAsilMultiSlotStillAllocate
     const auto allocation = unit_mock_->AllocateNextSlot();
 
     // Then it tries to allocate the asil b slot again and the first slot is still used
-    EXPECT_EQ(allocation.GetIndex(), 0);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 0);
 
     // And there is an indication of QM misbehaviour
-    EXPECT_TRUE(allocation.IsValidAsilB() && !allocation.IsValidQM());
+    EXPECT_TRUE(allocation.qm_misbehaved);
 }
 
 TEST_F(EventDataControlCompositeFixture, CanAllocateOneSlotOnlyForQm)
@@ -354,11 +352,7 @@ TEST_F(EventDataControlCompositeFixture, CanAllocateOneSlotOnlyForQm)
     auto allocation = unit_->AllocateNextSlot();
 
     // Then the first slot is used
-    EXPECT_EQ(allocation.GetIndex(), 0);
-    // and the QM slot ptr is valid
-    EXPECT_TRUE(allocation.IsValidQM());
-    // and the QM slot can be accessed without assert.
-    score::cpp::ignore = allocation.GetSlotQM();
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 0);
 }
 
 TEST_F(EventDataControlCompositeFixture, CanAllocateOneSlotWhenAlreadyOneIsAllocated)
@@ -371,7 +365,7 @@ TEST_F(EventDataControlCompositeFixture, CanAllocateOneSlotWhenAlreadyOneIsAlloc
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the second slot is used
-    EXPECT_EQ(allocation.GetIndex(), 1);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 1);
 }
 
 TEST_F(EventDataControlCompositeFixture, OverWritesOldestSample)
@@ -379,13 +373,13 @@ TEST_F(EventDataControlCompositeFixture, OverWritesOldestSample)
     // Given an EventDataControlComposite with all slots written at one time, and only one unused
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
     AllocateAllSlots();
-    unit_->EventReady(slot_indicators_[3], 1);
+    unit_->EventReady(3, 1);
 
     // When allocating one additional slot
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the slot is allocated, which was marked ready
-    EXPECT_EQ(allocation.GetIndex(), 3);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 3);
 }
 
 TEST_F(EventDataControlCompositeFixture, OverWritesDiscardedEvent)
@@ -393,13 +387,13 @@ TEST_F(EventDataControlCompositeFixture, OverWritesDiscardedEvent)
     // Given an EventDataControlComposite with all slots written at one time, and only one unused
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
     AllocateAllSlots();
-    unit_->Discard(slot_indicators_[3]);
+    unit_->Discard(3);
 
     // When allocating one additional slot
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the slot is allocated, which was marked ready
-    EXPECT_EQ(allocation.GetIndex(), 3);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 3);
 }
 
 TEST_F(EventDataControlCompositeFixture, OverWritesOldestSampleOnlyForQm)
@@ -407,13 +401,13 @@ TEST_F(EventDataControlCompositeFixture, OverWritesOldestSampleOnlyForQm)
     // Given an EventDataControlComposite with all slots written at one time, and only one unused
     WithQmOnlyEventDataControl().WithRealEventDataControlComposite();
     AllocateAllSlots();
-    unit_->EventReady(slot_indicators_[3], 1);
+    unit_->EventReady(3, 1);
 
     // When allocating one additional slot
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the slot is allocated, which was marked ready
-    EXPECT_EQ(allocation.GetIndex(), 3);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 3);
 }
 
 TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInQmList)
@@ -422,8 +416,8 @@ TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInQmList)
     // transaction log
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite().WithARegisteredTransactionLog();
     AllocateAllSlots();
-    unit_->EventReady(slot_indicators_[2], 1);
-    unit_->EventReady(slot_indicators_[4], 2);
+    unit_->EventReady(2, 1);
+    unit_->EventReady(4, 2);
 
     score::cpp::ignore =
         proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_);  // slot 4 is used in QM list
@@ -432,7 +426,7 @@ TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInQmList)
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the slot is allocated, which was only unused
-    EXPECT_EQ(allocation.GetIndex(), 2);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 2);
 }
 
 TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInAsilList)
@@ -440,8 +434,8 @@ TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInAsilList)
     // Given an EventDataControlComposite with all slots written at one time, and only one unused
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite().WithARegisteredTransactionLog();
     AllocateAllSlots();
-    unit_->EventReady(slot_indicators_[2], 1);
-    unit_->EventReady(slot_indicators_[4], 2);
+    unit_->EventReady(2, 1);
+    unit_->EventReady(4, 2);
     score::cpp::ignore =
         proxy_asil_local_->ReferenceNextEvent(0, *transaction_log_index_asil_);  // slot 4 is used in ASIL list
 
@@ -449,7 +443,7 @@ TEST_F(EventDataControlCompositeFixture, SkipsEventIfUsedInAsilList)
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the slot is allocated, which was only unused
-    EXPECT_EQ(allocation.GetIndex(), 2);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 2);
 }
 
 TEST_F(EventDataControlCompositeFixture, ReturnsNoSlotIfAllUsed)
@@ -462,8 +456,7 @@ TEST_F(EventDataControlCompositeFixture, ReturnsNoSlotIfAllUsed)
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then no slot is found
-    EXPECT_FALSE(allocation.IsValidQM());
-    EXPECT_FALSE(allocation.IsValidAsilB());
+    EXPECT_FALSE(allocation.allocated_slot_index.has_value());
 }
 
 TEST_F(EventDataControlCompositeFixture, ReturnsNoSlotIfAllUsedQMOnly)
@@ -476,8 +469,7 @@ TEST_F(EventDataControlCompositeFixture, ReturnsNoSlotIfAllUsedQMOnly)
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then no slot is found
-    EXPECT_FALSE(allocation.IsValidQM());
-    EXPECT_FALSE(allocation.IsValidAsilB());
+    EXPECT_FALSE(allocation.allocated_slot_index.has_value());
 }
 
 TEST_F(EventDataControlCompositeFixture, QmConsumerViolation)
@@ -497,17 +489,15 @@ TEST_F(EventDataControlCompositeFixture, QmConsumerViolation)
     auto upper_limit = EventSlotStatus::TIMESTAMP_MAX;
     for (auto counter = 0; counter < 5; ++counter)
     {
-        auto slot_indicator = proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
-        upper_limit = (*proxy_qm_local_)[slot_indicator.GetIndex()].GetTimeStamp();
+        auto slot_index = proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
+        upper_limit = (*proxy_qm_local_)[slot_index.value()].GetTimeStamp();
     }
 
     // When allocating one additional slot
     const auto allocation = unit_->AllocateNextSlot();
 
-    // Then still a slot could be allocated for ASIL-B
-    EXPECT_TRUE(allocation.IsValidAsilB());
-    // but not for QM
-    EXPECT_FALSE(allocation.IsValidQM());
+    // Then still a slot is found
+    EXPECT_TRUE(allocation.allocated_slot_index.has_value());
 }
 
 TEST_F(EventDataControlCompositeFixture, AllocationIgnoresQMAfterContractViolation)
@@ -527,8 +517,8 @@ TEST_F(EventDataControlCompositeFixture, AllocationIgnoresQMAfterContractViolati
     auto upper_limit = EventSlotStatus::TIMESTAMP_MAX;
     for (auto counter = 0; counter < 5; ++counter)
     {
-        auto slot_indicator = proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
-        upper_limit = (*proxy_qm_local_)[slot_indicator.GetIndex()].GetTimeStamp();
+        auto slot_index = proxy_qm_local_->ReferenceNextEvent(0, *transaction_log_index_qm_, upper_limit);
+        upper_limit = (*proxy_qm_local_)[slot_index.value()].GetTimeStamp();
     }
     score::cpp::ignore = unit_->AllocateNextSlot();
     ASSERT_TRUE(unit_->IsQmControlDisconnected());
@@ -537,7 +527,7 @@ TEST_F(EventDataControlCompositeFixture, AllocationIgnoresQMAfterContractViolati
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then still a slot could be allocated for ASIL-B
-    EXPECT_TRUE(allocation.IsValidAsilB());
+    EXPECT_TRUE(allocation.allocated_slot_index.has_value());
 }
 
 TEST_F(EventDataControlCompositeFixture, ReturnsNoSlotIfAllUsedAfterQmDisconnect)
@@ -553,8 +543,7 @@ TEST_F(EventDataControlCompositeFixture, ReturnsNoSlotIfAllUsedAfterQmDisconnect
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then no slot is found
-    EXPECT_FALSE(allocation.IsValidQM());
-    EXPECT_FALSE(allocation.IsValidAsilB());
+    EXPECT_FALSE(allocation.allocated_slot_index.has_value());
 }
 
 TEST_F(EventDataControlCompositeFixture, AsilBConsumerViolation)
@@ -568,15 +557,15 @@ TEST_F(EventDataControlCompositeFixture, AsilBConsumerViolation)
     auto upper_limit = EventSlotStatus::TIMESTAMP_MAX;
     for (auto counter = 0; counter < 5; ++counter)
     {
-        auto slot_indicator = proxy_asil_local_->ReferenceNextEvent(0, *transaction_log_index_asil_, upper_limit);
-        upper_limit = (*proxy_asil_local_)[slot_indicator.GetIndex()].GetTimeStamp();
+        auto slot_index = proxy_asil_local_->ReferenceNextEvent(0, *transaction_log_index_asil_, upper_limit);
+        upper_limit = (*proxy_asil_local_)[slot_index.value()].GetTimeStamp();
     }
 
     // When allocating one additional slot
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then NO slot is found
-    EXPECT_FALSE(allocation.IsValidQmAndAsilB());
+    EXPECT_FALSE(allocation.allocated_slot_index.has_value());
 }
 
 /// Test is currently disabled as it violates a lola invariant that a given ProxyEvent instance should only
@@ -600,7 +589,7 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
     EventDataControlComposite unit{skeleton_qm_local, &skeleton_asil_local, nullptr};
 
     std::mutex allocated_slots_mutex{};
-    std::vector<ControlSlotCompositeIndicator> allocated_slots{};
+    std::set<std::uint8_t> allocated_slots{};
     std::atomic<EventSlotStatus::EventTimeStamp> last_send_time_stamp{1};
 
     auto sender = [&allocated_slots, &allocated_slots_mutex, &unit, &last_send_time_stamp]() {
@@ -610,10 +599,10 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
             {
                 // Allocate Slots
                 const auto allocation = unit.AllocateNextSlot();
-                if (allocation.IsValidQmAndAsilB())
+                if (allocation.allocated_slot_index.has_value())
                 {
                     std::lock_guard<std::mutex> lock{allocated_slots_mutex};
-                    allocated_slots.push_back(allocation);
+                    allocated_slots.emplace(allocation.allocated_slot_index.value());
                 }
             }
             else
@@ -625,9 +614,9 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
                     const auto index = RandomNumberBetween(0, allocated_slots.size() - 1);
                     auto iterator = allocated_slots.begin();
                     std::advance(iterator, index);
-                    auto slot_indicator = *iterator;
+                    auto slot_index = *iterator;
                     score::cpp::ignore = allocated_slots.erase(iterator);
-                    unit.EventReady(slot_indicator, last_send_time_stamp++);
+                    unit.EventReady(slot_index, last_send_time_stamp++);
                 }
             }
         }
@@ -636,8 +625,8 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
     auto receiver = [&last_send_time_stamp, &qm, &asil]() {
         ProxyEventDataControlLocalView proxy_asil_local{asil};
         ProxyEventDataControlLocalView proxy_qm_local{qm};
-        std::vector<ControlSlotIndicator> used_slots_qm{};
-        std::vector<ControlSlotIndicator> used_slots_asil{};
+        std::set<SlotIndexType> used_slots_qm{};
+        std::set<SlotIndexType> used_slots_asil{};
         EventSlotStatus::EventTimeStamp start_ts{1};
 
         TransactionLogSet::TransactionLogIndex transaction_log_index_qm =
@@ -655,11 +644,11 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
                 // QM List
                 if (used_slots_qm.size() < 5 && RandomTrueOrFalse())
                 {
-                    auto slot_indicator = proxy_qm_local.ReferenceNextEvent(start_ts, transaction_log_index_qm);
-                    if (slot_indicator.IsValid())
+                    auto slot = proxy_qm_local.ReferenceNextEvent(start_ts, transaction_log_index_qm);
+                    if (slot.has_value())
                     {
-                        score::cpp::ignore = used_slots_qm.emplace_back(slot_indicator);
-                        start_ts = EventSlotStatus{slot_indicator.GetSlot().load()}.GetTimeStamp();
+                        score::cpp::ignore = used_slots_qm.emplace(slot.value());
+                        start_ts = EventSlotStatus{proxy_qm_local[slot.value()]}.GetTimeStamp();
                     }
                 }
                 else
@@ -680,11 +669,11 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
                 // ASIL List
                 if (used_slots_asil.size() < 5 && RandomTrueOrFalse())
                 {
-                    auto slot_indicator = proxy_asil_local.ReferenceNextEvent(start_ts, transaction_log_index_asil);
-                    if (slot_indicator.IsValid())
+                    auto slot = proxy_asil_local.ReferenceNextEvent(start_ts, transaction_log_index_asil);
+                    if (slot.has_value())
                     {
-                        score::cpp::ignore = used_slots_asil.emplace_back(slot_indicator);
-                        start_ts = EventSlotStatus{slot_indicator.GetSlot().load()}.GetTimeStamp();
+                        score::cpp::ignore = used_slots_asil.emplace(slot.value());
+                        start_ts = EventSlotStatus{proxy_asil_local[slot.value()]}.GetTimeStamp();
                     }
                 }
                 else
@@ -814,12 +803,10 @@ TEST_F(EventDataControlCompositeGetTimestampFixture, CanAllocateOneSlot)
     const auto allocation = unit_->AllocateNextSlot();
 
     // Then the first slot is used
-    ASSERT_TRUE(allocation.IsValidQmAndAsilB());
-    const auto slot = allocation.GetIndex();
-    EXPECT_EQ(slot, 0);
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 0);
 
     // And there was no indication of QM misbehaviour
-    EXPECT_TRUE(allocation.IsValidQM());
+    EXPECT_FALSE(allocation.qm_misbehaved);
 }
 
 TEST_F(EventDataControlCompositeGetTimestampFixture, GetEventSlotTimestampReturnsTimestampOfAllocatedSlot)
@@ -827,10 +814,10 @@ TEST_F(EventDataControlCompositeGetTimestampFixture, GetEventSlotTimestampReturn
     // Given an EventDataControlComposite with a single allocated slot which is marked as ready
     WithQmAndAsilBEventDataControls().WithRealEventDataControlComposite();
     const auto allocation = unit_->AllocateNextSlot();
-    const auto slot = allocation.GetIndex();
+    const auto slot = allocation.allocated_slot_index.value();
 
     const EventSlotStatus::EventTimeStamp slot_timestamp{10U};
-    unit_->EventReady(allocation, slot_timestamp);
+    unit_->EventReady(slot, slot_timestamp);
 
     // When retrieving the timestamp of the slot
     const auto actual_timestamp = unit_->GetEventSlotTimestamp(slot);
@@ -855,10 +842,10 @@ TEST_F(EventDataControlCompositeGetTimestampFixture, CanRetrieveTimestampsAsilB)
     AllocateAllSlots();
 
     // And all except for 1 are marked as ready
-    unit_->EventReady(slot_indicators_[0], slot_timestamp_0);
-    unit_->EventReady(slot_indicators_[1], slot_timestamp_1);
-    unit_->EventReady(slot_indicators_[2], slot_timestamp_2);
-    unit_->EventReady(slot_indicators_[4], slot_timestamp_4);
+    unit_->EventReady(0, slot_timestamp_0);
+    unit_->EventReady(1, slot_timestamp_1);
+    unit_->EventReady(2, slot_timestamp_2);
+    unit_->EventReady(4, slot_timestamp_4);
 
     // When retrieving the timestamp of the slots
     const auto actual_timestamp_0 = unit_->GetEventSlotTimestamp(0);
@@ -891,16 +878,15 @@ TEST_F(EventDataControlCompositeGetTimestampFixture, CanRetrieveTimestampsAsilQM
     const EventSlotStatus::EventTimeStamp in_writing_slot_timestamp_3{0U};
 
     // Given an EventDataControlComposite with all slots written at one time, and only one unused
-    std::array<ControlSlotCompositeIndicator, 5U> slot_indicators{};
     for (auto counter = 0U; counter < 5U; ++counter)
     {
-        slot_indicators[counter] = unit_->AllocateNextSlot();
+        unit_->AllocateNextSlot();
     }
 
-    unit_->EventReady(slot_indicators[0], slot_timestamp_0);
-    unit_->EventReady(slot_indicators[1], slot_timestamp_1);
-    unit_->EventReady(slot_indicators[2], slot_timestamp_2);
-    unit_->EventReady(slot_indicators[4], slot_timestamp_4);
+    unit_->EventReady(0, slot_timestamp_0);
+    unit_->EventReady(1, slot_timestamp_1);
+    unit_->EventReady(2, slot_timestamp_2);
+    unit_->EventReady(4, slot_timestamp_4);
 
     // When retrieving the timestamp of the slots
     const auto actual_timestamp_0 = unit_->GetEventSlotTimestamp(0);
diff --git a/score/mw/com/impl/bindings/lola/generic_proxy_event.cpp b/score/mw/com/impl/bindings/lola/generic_proxy_event.cpp
index 8b3739234..1bf176dd3 100644
--- a/score/mw/com/impl/bindings/lola/generic_proxy_event.cpp
+++ b/score/mw/com/impl/bindings/lola/generic_proxy_event.cpp
@@ -125,7 +125,7 @@ Result<std::size_t> GenericProxyEvent::GetNewSamplesImpl(Callback&& receiver, Tr
 {
     const auto max_sample_count = tracker.GetNumAvailableGuards();
 
-    const auto slot_indicators = proxy_event_common_.GetNewSamplesSlotIndices(max_sample_count);
+    const auto slot_indices = proxy_event_common_.GetNewSamplesSlotIndices(max_sample_count);
 
     auto& event_control = proxy_event_common_.GetEventControl();
 
@@ -151,8 +151,10 @@ Result<std::size_t> GenericProxyEvent::GetNewSamplesImpl(Callback&& receiver, Tr
     const void* const event_slots_raw_array = meta_info_.event_slots_raw_array_.get(event_slots_raw_array_size.value());
 
     // AMP assert that the event_slots_raw_array address is according to sample_alignment
-    for (auto slot_indicator = slot_indicators.begin; slot_indicator != slot_indicators.end; ++slot_indicator)
+    for (auto slot_it = slot_indices.begin; slot_it != slot_indices.end; ++slot_it)
     {
+        const auto slot_index = *slot_it;
+
         // NOLINTBEGIN(cppcoreguidelines-pro-bounds-pointer-arithmetic) The pointer event_slots_raw_array points
         // to the memory managed by a DynamicArray which has been type erased. The DynamicArray wraps a regular pointer
         // array so elements may be accessed by using offsets to regular pointers to elements. Therefore, the pointer
@@ -173,14 +175,14 @@ Result<std::size_t> GenericProxyEvent::GetNewSamplesImpl(Callback&& receiver, Tr
         // coverity[autosar_cpp14_a5_3_2_violation] The check above ensures that array is not NULL
         // coverity[autosar_cpp14_m5_0_15_violation] False-positive, get access through array indexing
         // coverity[autosar_cpp14_a4_7_1_violation]
-        const auto* const object_start_address = &event_slots_array[aligned_size * slot_indicator->GetIndex()];
+        const auto* const object_start_address = &event_slots_array[aligned_size * slot_index];
         /* NOLINTEND(cppcoreguidelines-pro-bounds-pointer-arithmetic) deviation ends here */
 
-        const EventSlotStatus event_slot_status{slot_indicator->GetSlot().load()};
+        const EventSlotStatus event_slot_status{event_control.data_control[slot_index]};
         const EventSlotStatus::EventTimeStamp sample_timestamp{event_slot_status.GetTimeStamp()};
 
         SamplePtr<void> sample{
-            object_start_address, event_control.data_control, *slot_indicator, transaction_log_index.value()};
+            object_start_address, event_control.data_control, slot_index, transaction_log_index.value()};
 
         auto guard = std::move(*tracker.TakeGuard());
         auto sample_binding_independent = this->MakeSamplePtr(std::move(sample), std::move(guard));
@@ -198,8 +200,7 @@ Result<std::size_t> GenericProxyEvent::GetNewSamplesImpl(Callback&& receiver, Tr
         receiver(std::move(sample_binding_independent), sample_timestamp);
     }
 
-    const auto num_collected_slots =
-        static_cast<std::size_t>(std::distance(slot_indicators.begin, slot_indicators.end));
+    const auto num_collected_slots = static_cast<std::size_t>(std::distance(slot_indices.begin, slot_indices.end));
     return num_collected_slots;
 }
 
diff --git a/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp b/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp
index 03cbe4f9e..752efa9c0 100644
--- a/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp
+++ b/score/mw/com/impl/bindings/lola/generic_skeleton_event.cpp
@@ -78,9 +78,10 @@ Result<score::mw::com::impl::SampleAllocateePtr<void>> GenericSkeletonEvent::All
         ::score::mw::log::LogError("lola") << "Tried to allocate event, but the EventDataControl does not exist!";
         return MakeUnexpected(ComErrc::kBindingFailure);
     }
-    const auto slot = control_.value().AllocateNextSlot();
+    const auto allocated_slot_result = control_.value().AllocateNextSlot();
 
-    if (!qm_disconnect_ && (control_->GetAsilBEventDataControlLocal() != nullptr) && !slot.IsValidQM())
+    if (!qm_disconnect_ && (control_->GetAsilBEventDataControlLocal() != nullptr) &&
+        allocated_slot_result.qm_misbehaved)
     {
         qm_disconnect_ = true;
         score::mw::log::LogWarn("lola")
@@ -90,24 +91,7 @@ Result<score::mw::com::impl::SampleAllocateePtr<void>> GenericSkeletonEvent::All
         event_shared_impl_.GetParent().DisconnectQmConsumers();
     }
 
-    if (slot.IsValidQM() || slot.IsValidAsilB())
-    {
-        //  Get the actual CONTAINER object (using the max_align_t type we allocated it with!)
-        using StorageType = lola::EventDataStorage<std::max_align_t>;
-        StorageType* storage_ptr = data_storage_.get<StorageType>();
-        SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(storage_ptr != nullptr);
-
-        std::uint8_t* byte_ptr = reinterpret_cast<std::uint8_t*>(storage_ptr->data());
-
-        // Calculate the exact slot spacing based on alignment padding
-        const auto aligned_size = memory::shared::CalculateAlignedSize(size_info_.size, size_info_.alignment);
-        std::size_t offset = static_cast<std::size_t>(slot.GetIndex()) * aligned_size;
-        void* data_ptr = byte_ptr + offset;
-
-        auto lola_ptr = lola::SampleAllocateePtr<void>(data_ptr, control_.value(), slot);
-        return impl::MakeSampleAllocateePtr(std::move(lola_ptr));
-    }
-    else
+    if (!allocated_slot_result.allocated_slot_index.has_value())
     {
         if (!event_properties_.enforce_max_samples)
         {
@@ -117,6 +101,22 @@ Result<score::mw::com::impl::SampleAllocateePtr<void>> GenericSkeletonEvent::All
         }
         return MakeUnexpected(ComErrc::kBindingFailure);
     }
+
+    //  Get the actual CONTAINER object (using the max_align_t type we allocated it with!)
+    using StorageType = lola::EventDataStorage<std::max_align_t>;
+    StorageType* storage_ptr = data_storage_.get<StorageType>();
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(storage_ptr != nullptr);
+
+    std::uint8_t* byte_ptr = reinterpret_cast<std::uint8_t*>(storage_ptr->data());
+
+    // Calculate the exact slot spacing based on alignment padding
+    const auto aligned_size = memory::shared::CalculateAlignedSize(size_info_.size, size_info_.alignment);
+    std::size_t offset = static_cast<std::size_t>(*allocated_slot_result.allocated_slot_index) * aligned_size;
+    void* data_ptr = byte_ptr + offset;
+
+    auto lola_ptr =
+        lola::SampleAllocateePtr<void>(data_ptr, control_.value(), *allocated_slot_result.allocated_slot_index);
+    return impl::MakeSampleAllocateePtr(std::move(lola_ptr));
 }
 
 std::pair<size_t, size_t> GenericSkeletonEvent::GetSizeInfo() const noexcept
diff --git a/score/mw/com/impl/bindings/lola/proxy_event.h b/score/mw/com/impl/bindings/lola/proxy_event.h
index 85b612061..7f451bc1f 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event.h
+++ b/score/mw/com/impl/bindings/lola/proxy_event.h
@@ -180,7 +180,7 @@ inline Result<std::size_t> ProxyEvent<SampleType>::GetNewSamplesImpl(Callback&&
                                                                      TrackerGuardFactory& tracker) noexcept
 {
     const auto max_sample_count = tracker.GetNumAvailableGuards();
-    const auto slot_indicators = proxy_event_common_.GetNewSamplesSlotIndices(max_sample_count);
+    const auto slot_indices = proxy_event_common_.GetNewSamplesSlotIndices(max_sample_count);
 
     auto& event_control = proxy_event_common_.GetEventControl();
     auto transaction_log_index = proxy_event_common_.GetTransactionLogIndex();
@@ -188,14 +188,14 @@ inline Result<std::size_t> ProxyEvent<SampleType>::GetNewSamplesImpl(Callback&&
         transaction_log_index.has_value(),
         "GetNewSamplesImpl should only be called after a TransactionLog has been registered.");
 
-    for (auto slot_indicator_it = slot_indicators.begin; slot_indicator_it != slot_indicators.end; ++slot_indicator_it)
+    for (auto slot_index_it = slot_indices.begin; slot_index_it != slot_indices.end; ++slot_index_it)
     {
-        const SampleType& sample_data{samples_.at(static_cast<std::size_t>(slot_indicator_it->GetIndex()))};
-        const EventSlotStatus event_slot_status{slot_indicator_it->GetSlot().load()};
+        const SampleType& sample_data{samples_.at(static_cast<std::size_t>(*slot_index_it))};
+        const EventSlotStatus event_slot_status{event_control.data_control[*slot_index_it]};
         const EventSlotStatus::EventTimeStamp sample_timestamp{event_slot_status.GetTimeStamp()};
 
         SamplePtr<SampleType> sample{
-            &sample_data, event_control.data_control, *slot_indicator_it, transaction_log_index.value()};
+            &sample_data, event_control.data_control, *slot_index_it, transaction_log_index.value()};
 
         auto guard = std::move(*tracker.TakeGuard());
         auto sample_binding_independent = this->MakeSamplePtr(std::move(sample), std::move(guard));
@@ -211,8 +211,7 @@ inline Result<std::size_t> ProxyEvent<SampleType>::GetNewSamplesImpl(Callback&&
                  static_cast<impl::tracing::ITracingRuntime::TracePointDataId>(sample_timestamp));
     }
 
-    const auto num_collected_slots =
-        static_cast<std::size_t>(std::distance(slot_indicators.begin, slot_indicators.end));
+    const auto num_collected_slots = static_cast<std::size_t>(std::distance(slot_indices.begin, slot_indices.end));
     return num_collected_slots;
 }
 
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_common.cpp b/score/mw/com/impl/bindings/lola/proxy_event_common.cpp
index bfd6527b6..9c7b5c4e6 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_common.cpp
+++ b/score/mw/com/impl/bindings/lola/proxy_event_common.cpp
@@ -87,7 +87,7 @@ Result<std::size_t> ProxyEventCommon::GetNumNewSamplesAvailable() const noexcept
     return slot_collector.value().GetNumNewSamplesAvailable();
 }
 
-SlotCollector::SlotIndicators ProxyEventCommon::GetNewSamplesSlotIndices(const std::size_t max_count) noexcept
+SlotCollector::SlotIndices ProxyEventCommon::GetNewSamplesSlotIndices(const std::size_t max_count) noexcept
 {
     auto& slot_collector = test_slot_collector_.has_value()
                                ? test_slot_collector_
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_common.h b/score/mw/com/impl/bindings/lola/proxy_event_common.h
index cf79008fa..12bc42d08 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_common.h
+++ b/score/mw/com/impl/bindings/lola/proxy_event_common.h
@@ -72,12 +72,12 @@ class ProxyEventCommon final
     Result<std::size_t> GetNumNewSamplesAvailable() const noexcept;
 
     /// \brief Get the indicators of the slots containing samples that are pending for reception in ascending order.
-    ///        I.e. returned SlotIndicators begin with the oldest slots/events (lowest timestamp) first and end at the
+    ///        I.e. returned SlotIndices begin with the oldest slots/events (lowest timestamp) first and end at the
     ///        newest/youngest (largest timestamp) slots.
     ///
     /// The call is dispatched to SlotCollector. It is the responsibility of the calling code to ensure that
     /// GetNewSamplesSlotIndices() is only called when the event is in the subscribed state.
-    SlotCollector::SlotIndicators GetNewSamplesSlotIndices(const std::size_t max_count) noexcept;
+    SlotCollector::SlotIndices GetNewSamplesSlotIndices(const std::size_t max_count) noexcept;
 
     ResultBlank SetReceiveHandler(std::weak_ptr<ScopedEventReceiveHandler> handler);
     ResultBlank UnsetReceiveHandler();
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp
index d8a315524..fcefc3a71 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp
+++ b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.cpp
@@ -12,6 +12,7 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 
+#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
 
 #include <score/assert.hpp>
@@ -47,10 +48,10 @@ template <template <class> class AtomicIndirectorType>
 auto ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceNextEvent(
     const EventSlotStatus::EventTimeStamp last_search_time,
     const TransactionLogSet::TransactionLogIndex transaction_log_index,
-    const EventSlotStatus::EventTimeStamp upper_limit) noexcept -> ControlSlotIndicator
+    const EventSlotStatus::EventTimeStamp upper_limit) noexcept -> std::optional<SlotIndexType>
 {
     // function can only finish with result, if use count was able to be increased
-    ControlSlotIndicator possible_slot{};
+    std::optional<SlotIndexType> possible_index{};
 
     auto& transaction_log = transaction_log_set_.get().GetTransactionLog(transaction_log_index);
 
@@ -58,8 +59,7 @@ auto ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceNextEvent(
     std::uint64_t counter = 0U;
     for (; counter < MAX_REFERENCE_RETRIES; counter++)
     {
-        // resetting possible slot for this iteration
-        possible_slot.Reset();
+        possible_index.reset();
 
         // initialize candidate_slot_status with last_search_time. candidate_slot_status.timestamp always reflects
         // "highest new timestamp". The sentinel, if we did find a possible candidate is always possible_index.
@@ -70,13 +70,13 @@ auto ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceNextEvent(
         // The "slot" variable must never be a null pointer, since DynamicArray allocates its elements when it is
         // created.
         // coverity[autosar_cpp14_a5_3_2_violation]
-        for (auto& slot : state_slots_)
+        for (const auto& slot : state_slots_)
         {
             // coverity[autosar_cpp14_a5_3_2_violation]
             const EventSlotStatus slot_status{slot.load(std::memory_order_relaxed)};
             if (slot_status.IsTimeStampBetween(candidate_slot_status.GetTimeStamp(), upper_limit))
             {
-                possible_slot = {current_index, slot};
+                possible_index = current_index;
                 candidate_slot_status = slot_status;
             }
 
@@ -88,7 +88,7 @@ auto ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceNextEvent(
             ++current_index;
         }
 
-        if (!possible_slot.IsValid())
+        if (!possible_index.has_value())
         {
             return {};  // no sample within searched timestamp range exists.
         }
@@ -112,10 +112,11 @@ auto ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceNextEvent(
         // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
         ++status_new_val;
 
-        auto& candidate_slot_status_value = static_cast<EventSlotStatus::value_type&>(candidate_slot_status);
+        /// gtodo: Should this really be cast to a reference?
+        auto candidate_slot_status_value = static_cast<EventSlotStatus::value_type&>(candidate_slot_status);
 
-        auto possible_index_value = possible_slot.GetIndex();
-        auto& slot_value = possible_slot.GetSlot();
+        auto possible_index_value = possible_index.value();
+        auto& slot_value = state_slots_[possible_index_value];
 
         transaction_log.ReferenceTransactionBegin(possible_index_value);
         if (AtomicIndirectorType<EventSlotStatus::value_type>::compare_exchange_weak(
@@ -131,7 +132,7 @@ auto ProxyEventDataControlLocalView<AtomicIndirectorType>::ReferenceNextEvent(
 
     if (counter < MAX_REFERENCE_RETRIES)
     {
-        return possible_slot;
+        return possible_index;
     }
 
     ++num_ref_misses;
@@ -205,14 +206,13 @@ std::size_t ProxyEventDataControlLocalView<AtomicIndirectorType>::GetNumNewEvent
 
 template <template <class> class AtomicIndirectorType>
 auto ProxyEventDataControlLocalView<AtomicIndirectorType>::DereferenceEvent(
-    ControlSlotIndicator slot_indicator,
+    const SlotIndexType event_slot_index,
     const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept -> void
 {
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
     auto& transaction_log = transaction_log_set_.get().GetTransactionLog(transaction_log_index);
-    transaction_log.DereferenceTransactionBegin(slot_indicator.GetIndex());
-    score::cpp::ignore = slot_indicator.GetSlot().fetch_sub(1U, std::memory_order_acq_rel);
-    transaction_log.DereferenceTransactionCommit(slot_indicator.GetIndex());
+    transaction_log.DereferenceTransactionBegin(event_slot_index);
+    DereferenceEventWithoutTransactionLogging(event_slot_index);
+    transaction_log.DereferenceTransactionCommit(event_slot_index);
 }
 
 template <template <class> class AtomicIndirectorType>
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h
index 728aa2b56..ceba778dc 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h
+++ b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h
@@ -13,7 +13,6 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_DATA_CONTROL_LOCAL_VIEW_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_PROXY_EVENT_DATA_CONTROL_LOCAL_VIEW_H
 
-#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
 #include "score/mw/com/impl/bindings/lola/control_slot_types.h"
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
@@ -25,6 +24,7 @@
 
 #include <atomic>
 #include <cstddef>
+#include <optional>
 
 namespace score::mw::com::impl::lola
 {
@@ -92,13 +92,12 @@ class ProxyEventDataControlLocalView final
     /// \details This method will perform retries (bounded) on data-races. I.e. if a viable slot failed to be marked
     /// for reading because of a data race, retries are made.
     ///
-    /// \return Will return a valid ControlSlotIndicator indicating/pointing to an event, which is the youngest/newest
-    ///         one between last_search_time and upper_limit. I.e. its timestamp is between last_search_time and
-    ///         upper_limit and all other events with timestamps between last_search_time and upper_limit have a smaller
-    ///         timestamp (are older).
-    ///         If no such event exists, an invalid ControlSlotIndicator is returned.
+    /// \return Will return the index of an event, which is the youngest/newest one between last_search_time and
+    ///         upper_limit. I.e. its timestamp is between last_search_time and upper_limit and all other events with
+    ///         timestamps between last_search_time and upper_limit have a smaller timestamp (are older). If no such
+    ///         event exists, an empty optional is returned.
     /// \post DereferenceEvent() is invoked to withdraw read-ownership
-    ControlSlotIndicator ReferenceNextEvent(
+    std::optional<SlotIndexType> ReferenceNextEvent(
         const EventSlotStatus::EventTimeStamp last_search_time,
         const TransactionLogSet::TransactionLogIndex transaction_log_index,
         const EventSlotStatus::EventTimeStamp upper_limit = EventSlotStatus::TIMESTAMP_MAX) noexcept;
@@ -127,7 +126,7 @@ class ProxyEventDataControlLocalView final
     /// \pre ReferenceNextEvent() was invoked to obtain read-ownership
     ///
     /// \details Will also record the transaction in the TransactionLog corresponding to transaction_log_index
-    void DereferenceEvent(ControlSlotIndicator slot_indicator,
+    void DereferenceEvent(const SlotIndexType slot_index,
                           const TransactionLogSet::TransactionLogIndex transaction_log_index) noexcept;
 
     /// \brief Indicates that a consumer is finished reading (thread-safe, wait-free).
diff --git a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp
index d09027bb1..8f4f2c89a 100644
--- a/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp
+++ b/score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view_test.cpp
@@ -11,6 +11,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/control_slot_types.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/skeleton_event_data_control_local_view.h"
@@ -110,10 +111,11 @@ class ProxyEventDataControlLocalViewFixture : public ::testing::Test
     SlotIndexType WithAnAllocatedSlot(EventSlotStatus::EventTimeStamp timestamp = 1)
     {
         SCORE_LANGUAGE_FUTURECPP_ASSERT(skeleton_event_data_control_local_ != nullptr);
-        auto slot = skeleton_event_data_control_local_->AllocateNextSlot();
-        EXPECT_TRUE(slot.IsValid());
-        skeleton_event_data_control_local_->EventReady(slot, timestamp);
-        return slot.GetIndex();
+        const auto slot_index = skeleton_event_data_control_local_->AllocateNextSlot();
+        EXPECT_TRUE(slot_index.has_value());
+        std::cout << "slot index : " << slot_index.value() << std::endl;
+        skeleton_event_data_control_local_->EventReady(slot_index.value(), timestamp);
+        return slot_index.value();
     }
 
     FakeMemoryResource memory_{};
@@ -151,10 +153,10 @@ TEST_F(ProxyEventDataControlLocalViewFixture, FindNextSlotBlocksAllocation)
 
     // When finding the next slot
     auto event = unit_->ReferenceNextEvent(0, transaction_log_index);
-    ASSERT_TRUE(event.IsValid());
+    ASSERT_TRUE(event.has_value());
 
     // Then we cannot allocate the slot again
-    ASSERT_FALSE(skeleton_event_data_control_local_->AllocateNextSlot().IsValid());
+    ASSERT_FALSE(skeleton_event_data_control_local_->AllocateNextSlot().has_value());
 }
 
 // Re-enable when the test is fixed in Ticket-128552
@@ -172,11 +174,11 @@ TEST_F(ProxyEventDataControlLocalViewFixture, DISABLED_MultipleReceiverRefCountC
         {
             // We can increase the ref-count
             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);
+            ASSERT_TRUE(receive_slot.has_value());
+            EXPECT_EQ((*unit_)[receive_slot.value()].GetTimeStamp(), 1);
 
             // and decrease the ref-count
-            unit_->DereferenceEvent(receive_slot, transaction_log_index);
+            unit_->DereferenceEvent(receive_slot.value(), transaction_log_index);
         }
     };
 
@@ -192,7 +194,7 @@ TEST_F(ProxyEventDataControlLocalViewFixture, DISABLED_MultipleReceiverRefCountC
     }
 
     // Then the reference count is zero and we can overwrite the slot if no memory corruption or race occurred
-    ASSERT_TRUE(skeleton_event_data_control_local_->AllocateNextSlot().IsValid());
+    ASSERT_TRUE(skeleton_event_data_control_local_->AllocateNextSlot().has_value());
 }
 
 TEST_F(ProxyEventDataControlLocalViewFixture, FailingToUpdateSlotValueCausesReferenceNextEventToReturnNull)
@@ -210,7 +212,8 @@ TEST_F(ProxyEventDataControlLocalViewFixture, FailingToUpdateSlotValueCausesRefe
 
     // and a EventDataControlUnit with one ready slot
     auto slot = skeleton_event_data_control_local_mocked_->AllocateNextSlot();
-    skeleton_event_data_control_local_mocked_->EventReady(slot, 1);
+    ASSERT_TRUE(slot.has_value());
+    skeleton_event_data_control_local_mocked_->EventReady(slot.value(), 1);
 
     const auto transaction_log_index =
         unit_mock_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
@@ -219,7 +222,7 @@ TEST_F(ProxyEventDataControlLocalViewFixture, FailingToUpdateSlotValueCausesRefe
     auto event = unit_mock_->ReferenceNextEvent(0, transaction_log_index);
 
     // No event will be found
-    ASSERT_FALSE(event.IsValid());
+    ASSERT_FALSE(event.has_value());
 }
 using EventDataControlReferenceSpecificEventFixture = ProxyEventDataControlLocalViewFixture;
 TEST_F(EventDataControlReferenceSpecificEventFixture, ReferenceSpecificEvents)
@@ -266,8 +269,8 @@ TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_S
     // Given an EventDataControl with one in_writing slot
     GivenARealProxyEventDataControlLocalView(1, kMaxSubscribers);
     auto slot = skeleton_event_data_control_local_->AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInWriting());
+    ASSERT_TRUE(slot.has_value());
+    EXPECT_TRUE((*unit_)[slot.value()].IsInWriting());
 
     const auto transaction_log_index =
         unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
@@ -292,7 +295,7 @@ TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_R
     // Given an EventDataControl with one slot
     GivenAMockedEventDataControl(1, kMaxSubscribers);
     auto slot = skeleton_event_data_control_local_mocked_->AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
+    ASSERT_TRUE(slot.has_value());
 
     const auto transaction_log_index =
         unit_mock_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
@@ -326,7 +329,7 @@ TEST_F(ProxyEventDataControlLocalViewFixture, GetNumNewEvents_Many)
     GivenARealProxyEventDataControlLocalView(6, kMaxSubscribers);
     for (unsigned int i = 1; i <= 6; i++)
     {
-        WithAnAllocatedSlot(i);
+        std::cout << "I " << WithAnAllocatedSlot(i) << std::endl;
     }
 
     // When checking for new samples since timestamp 0 to 6 expect, that 6 up to 0 is returned.
@@ -385,9 +388,9 @@ TEST_P(MultiSenderMultiReceiverTest, MultiSenderMultiReceiver)
         for (std::size_t counter = 0; counter < params.num_actions_per_sender; ++counter)
         {
             auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-            ASSERT_TRUE(slot.IsValid());
+            ASSERT_TRUE(slot.has_value());
 
-            skeleton_event_data_control_local_.EventReady(slot, ++ts);
+            skeleton_event_data_control_local_.EventReady(slot.value(), ++ts);
         }
     };
 
@@ -395,7 +398,7 @@ TEST_P(MultiSenderMultiReceiverTest, MultiSenderMultiReceiver)
         // randomly increases or decreases ref-count
         const auto& params = GetParam();
 
-        std::vector<ControlSlotIndicator> used_slots{};
+        std::vector<SlotIndexType> used_slots{};
         EventSlotStatus::EventTimeStamp start_ts{1};
 
         TransactionLogSet::TransactionLogIndex transaction_log_index =
@@ -406,10 +409,10 @@ TEST_P(MultiSenderMultiReceiverTest, MultiSenderMultiReceiver)
             if (used_slots.size() < params.max_referenced_samples_per_receiver && RandomTrueOrFalse())
             {
                 auto slot = unit_.ReferenceNextEvent(start_ts, transaction_log_index);
-                if (slot.IsValid())
+                if (slot.has_value())
                 {
-                    start_ts = EventSlotStatus{unit_[slot.GetIndex()]}.GetTimeStamp();
-                    used_slots.push_back(slot);
+                    start_ts = EventSlotStatus{unit_[slot.value()]}.GetTimeStamp();
+                    used_slots.push_back(slot.value());
                 }
             }
             else
@@ -457,16 +460,16 @@ TEST_P(MultiSenderMultiReceiverTest, DISABLED_MultiSenderMultiReceiverMaxReceive
         {
             auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
             ASSERT_NE(ts, std::numeric_limits<std::uint32_t>::max());
-            if (!slot.IsValid())
+            if (!slot.has_value())
             {
                 ProxyEventDataControlLocalView<>::DumpPerformanceCounters();
                 std::terminate();
             }
             else
             {
-                skeleton_event_data_control_local_.EventReady(slot, ++ts);
+                skeleton_event_data_control_local_.EventReady(slot.value(), ++ts);
             }
-            EXPECT_TRUE(slot.IsValid());
+            EXPECT_TRUE(slot.has_value());
         }
     };
 
@@ -474,7 +477,7 @@ TEST_P(MultiSenderMultiReceiverTest, DISABLED_MultiSenderMultiReceiverMaxReceive
         // randomly increases or decreases ref-count
         const auto& params = GetParam();
 
-        std::vector<ControlSlotIndicator> used_slots{};
+        std::vector<SlotIndexType> used_slots{};
         EventSlotStatus::EventTimeStamp start_ts{0};
 
         TransactionLogSet::TransactionLogIndex transaction_log_index =
@@ -489,11 +492,11 @@ TEST_P(MultiSenderMultiReceiverTest, DISABLED_MultiSenderMultiReceiverMaxReceive
                    used_slots.size() < params.max_referenced_samples_per_receiver)
             {
                 auto slot = unit_.ReferenceNextEvent(start_ts, transaction_log_index, highest_ts);
-                if (slot.IsValid())
+                if (slot.has_value())
                 {
-                    highest_ts = EventSlotStatus{unit_[slot.GetIndex()]}.GetTimeStamp();
-                    used_slots.push_back(slot);
-                    slot_last = slot.GetIndex();
+                    highest_ts = EventSlotStatus{unit_[slot.value()]}.GetTimeStamp();
+                    used_slots.push_back(slot.value());
+                    slot_last = slot.value();
                 }
                 counter1++;
             }
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 306d94e73..589c28475 100644
--- a/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h
+++ b/score/mw/com/impl/bindings/lola/sample_allocatee_ptr.h
@@ -67,7 +67,7 @@ class SampleAllocateePtr
     // reference. So we need to have two different class initializations. coverity[autosar_cpp14_m3_2_2_violation]
     // coverity[autosar_cpp14_a12_1_5_violation]
     explicit SampleAllocateePtr(std::nullptr_t /* ptr */) noexcept
-        : managed_object_{nullptr}, event_slot_indicator_{}, event_data_control_{std::nullopt}
+        : managed_object_{nullptr}, event_slot_index_{kUninitialisedEventSlotIndex}, event_data_control_{std::nullopt}
     {
     }
 
@@ -75,10 +75,10 @@ class SampleAllocateePtr
     /// \param ptr pointer to managed object
     /// \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,
-                                ControlSlotCompositeIndicator slot_indicator) noexcept
-        : managed_object_{ptr}, event_slot_indicator_{slot_indicator}, event_data_control_{event_data_ctrl}
+    SampleAllocateePtr(pointer ptr,
+                       const EventDataControlComposite<>& event_data_ctrl,
+                       const SlotIndexType slot_index) noexcept
+        : managed_object_{ptr}, event_slot_index_{slot_index}, event_data_control_{event_data_ctrl}
     {
     }
 
@@ -118,7 +118,7 @@ class SampleAllocateePtr
         using std::swap;
 
         swap(this->managed_object_, other.managed_object_);
-        swap(this->event_slot_indicator_, other.event_slot_indicator_);
+        swap(this->event_slot_index_, other.event_slot_index_);
         swap(this->event_data_control_, other.event_data_control_);
     }
 
@@ -159,33 +159,35 @@ class SampleAllocateePtr
         return *this;
     };
 
-    /// \brief access to internal control-slot-indicator
-    /// \return ControlSlotCompositeIndicator pointing to the underlying shmem event slot.
-    ControlSlotCompositeIndicator GetReferencedSlot() const noexcept
+    /// \brief access to nternal slot index
+    /// \return slot index of underlying shmem event slot.
+    SlotIndexType GetReferencedSlot() const noexcept
     {
-        return event_slot_indicator_;
+        return event_slot_index_;
     };
 
   private:
+    static constexpr SlotIndexType kUninitialisedEventSlotIndex = std::numeric_limits<SlotIndexType>::max();
+
     void internal_delete()
     {
         managed_object_ = nullptr;
-        if (event_slot_indicator_.IsValidQM() || event_slot_indicator_.IsValidAsilB())
+        if (event_slot_index_ < kUninitialisedEventSlotIndex)
         {
-            // LCOV_EXCL_BR_START: Defensive programming: The only time that event_data_control_ does not have a value
-            // is if the SampleAllocateePtr is default initialised or initialised with a nullptr. In both these cases
-            // IsValidQM/IsValidAsilB will return false, so we will never enter this branch.
+            // LCOV_EXCL_BR_LINE: Defensive programming: The only time that event_data_control_ does not have a value is
+            // if the SampleAllocateePtr is default initialised or initialised with a nullptr. In both these, cases
+            // event_slot_index_ == kUninitialisedEventSlotIndex so we will never enter this branch.
             if (event_data_control_.has_value())
             {
                 // LCOV_EXCL_BR_STOP
-                event_data_control_->Discard(event_slot_indicator_);
+                event_data_control_->Discard(event_slot_index_);
             }
-            event_slot_indicator_.Reset();
+            event_slot_index_ = kUninitialisedEventSlotIndex;
         }
     }
 
     pointer managed_object_;
-    ControlSlotCompositeIndicator event_slot_indicator_;
+    SlotIndexType event_slot_index_;
     std::optional<EventDataControlComposite<>> 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 47a155a1a..da7b0c3f1 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
@@ -44,21 +44,6 @@ class SampleAllocateePtrFixture : public ::testing::Test
     EventDataControlComposite<> control_composite_{skeleton_event_data_control_local_, nullptr, nullptr};
 };
 
-TEST_F(SampleAllocateePtrFixture, PtrContainingInvalidSlotIsNotDestroyingAnything)
-{
-    // Given an SampleAllocateePtr on an allocated slot
-    auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    std::uint8_t data{};
-    {
-        auto unit(SampleAllocateePtr<uint8_t>(&data, control_composite_, {}));
-    }
-    // When it goes out of scope
-
-    // Then the underlying slot is not marked invalid
-    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
-}
-
 TEST_F(SampleAllocateePtrFixture, MarksSlotAsInvalidOnDestruction)
 {
     RecordProperty("Verifies", "SCR-6244646");
@@ -72,56 +57,47 @@ TEST_F(SampleAllocateePtrFixture, MarksSlotAsInvalidOnDestruction)
 
     // Given an SampleAllocateePtr on an allocated slot
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
+    ASSERT_TRUE(slot.has_value());
     std::uint8_t data{};
     {
-        auto unit = SampleAllocateePtr<std::uint8_t>(
-            &data,
-            control_composite_,
-            {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+        auto unit = SampleAllocateePtr<std::uint8_t>(&data, control_composite_, slot.value());
     }
     // When it goes out of scope
 
     // Then the underlying slot is marked invalid
-    EXPECT_TRUE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
+    EXPECT_TRUE(skeleton_event_data_control_local_[slot.value()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, DoesNotMarkSlotAsInvalidOnMove)
 {
     // Given an SampleAllocateePtr on an allocated slot
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
+    ASSERT_TRUE(slot.has_value());
     std::uint8_t data{};
-    auto unit = SampleAllocateePtr<std::uint8_t>(
-        &data,
-        control_composite_,
-        {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit = SampleAllocateePtr<std::uint8_t>(&data, control_composite_, slot.value());
 
     // When moving it
     auto unit2 = std::move(unit);
 
     // Then the underlying slot is _not_ marked invalid
-    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.value()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, ReadySlotIsNotMarkedInvalidOnDestruction)
 {
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    skeleton_event_data_control_local_.EventReady(slot, 0x42);
+    ASSERT_TRUE(slot.has_value());
+    skeleton_event_data_control_local_.EventReady(slot.value(), 0x42);
     std::uint8_t data{};
     {
-        auto unit = SampleAllocateePtr<std::uint8_t>(
-            &data,
-            control_composite_,
-            {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+        auto unit = SampleAllocateePtr<std::uint8_t>(&data, control_composite_, slot.value());
     }
     // When it goes out of scope
 
     // Then the underlying slot is _not_ marked invalid
-    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
-    EXPECT_EQ(skeleton_event_data_control_local_[slot.GetIndex()].GetTimeStamp(), 0x42);
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.value()].IsInvalid());
+    EXPECT_EQ(skeleton_event_data_control_local_[slot.value()].GetTimeStamp(), 0x42);
 }
 
 TEST_F(SampleAllocateePtrFixture, CanAccessUnderlyingSlot)
@@ -134,20 +110,17 @@ TEST_F(SampleAllocateePtrFixture, CanAccessUnderlyingSlot)
 
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    skeleton_event_data_control_local_.EventReady(slot, 0x42);
+    ASSERT_TRUE(slot.has_value());
+    skeleton_event_data_control_local_.EventReady(slot.value(), 0x42);
     std::uint8_t data{};
-    auto unit = SampleAllocateePtr<std::uint8_t>(
-        &data,
-        control_composite_,
-        {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit = SampleAllocateePtr<std::uint8_t>(&data, control_composite_, slot.value());
 
     // When accessing which slot is associated with the SampleAllocateePtr
     auto referenced_slot = unit.GetReferencedSlot();
 
     // Then the underlying slot is the expected one and is valid
-    EXPECT_EQ(referenced_slot.GetIndex(), slot.GetIndex());
-    EXPECT_FALSE(EventSlotStatus(referenced_slot.GetSlotQM().load()).IsInvalid());
+    EXPECT_EQ(referenced_slot, slot.value());
+    EXPECT_FALSE(skeleton_event_data_control_local_[referenced_slot].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, ObeysOwnershipProperties)
@@ -162,57 +135,50 @@ TEST_F(SampleAllocateePtrFixture, MoveConstruct)
 {
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    skeleton_event_data_control_local_.EventReady(slot, 0x42);
+    ASSERT_TRUE(slot.has_value());
+    skeleton_event_data_control_local_.EventReady(slot.value(), 0x42);
     std::uint8_t data{};
-    auto unit = SampleAllocateePtr<std::uint8_t>(
-        &data,
-        control_composite_,
-        {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit = SampleAllocateePtr<std::uint8_t>(&data, control_composite_, slot.value());
 
     // When move constructing another SampleAllocateePtr from it
     SampleAllocateePtr<std::uint8_t> unit2(std::move(unit));
 
     // Then the move constructed instance contains the original members
-    EXPECT_EQ(unit2.GetReferencedSlot().GetIndex(), slot.GetIndex());
+    EXPECT_EQ(unit2.GetReferencedSlot(), slot.value());
     EXPECT_TRUE(unit2);
 
     // ... and the underlying slot is still valid.
-    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.value()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, MoveAssign)
 {
     // Given an SampleAllocateePtr on an allocated slot that is already marked as ready
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    skeleton_event_data_control_local_.EventReady(slot, 0x42);
+    ASSERT_TRUE(slot.has_value());
+    skeleton_event_data_control_local_.EventReady(slot.value(), 0x42);
     std::uint8_t data{};
-    auto unit = SampleAllocateePtr<std::uint8_t>(
-        &data,
-        control_composite_,
-        {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit = SampleAllocateePtr<std::uint8_t>(&data, control_composite_, slot.value());
 
     // When move assigning to another SampleAllocateePtr
     SampleAllocateePtr<std::uint8_t> unit2 = std::move(unit);
 
     // Then the move constructed instance contains the original members
-    EXPECT_EQ(unit2.GetReferencedSlot().GetIndex(), slot.GetIndex());
+    EXPECT_EQ(unit2.GetReferencedSlot(), slot.value());
     EXPECT_TRUE(unit2);
 
     // ... and the underlying slot is still valid.
-    EXPECT_FALSE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
+    EXPECT_FALSE(skeleton_event_data_control_local_[slot.value()].IsInvalid());
 }
 
 TEST_F(SampleAllocateePtrFixture, ConstructFromNullptr)
 {
-    ControlSlotCompositeIndicator invalid_control_slot_composite_indicator{};
     // Given a SampleAllocateePtr constructed from nullptr
     auto unit = SampleAllocateePtr<std::uint8_t>(nullptr);
 
     // expect that ...
     EXPECT_FALSE(unit);
-    EXPECT_EQ(unit.GetReferencedSlot(), invalid_control_slot_composite_indicator);
+    EXPECT_EQ(unit.GetReferencedSlot(), std::numeric_limits<SlotIndexType>::max());
     EXPECT_EQ(unit.get(), nullptr);
 }
 
@@ -220,18 +186,15 @@ TEST_F(SampleAllocateePtrFixture, AssignNullptr)
 {
     // Given an SampleAllocateePtr on an allocated slot
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
+    ASSERT_TRUE(slot.has_value());
     std::uint8_t data{};
-    auto unit = SampleAllocateePtr<std::uint8_t>(
-        &data,
-        control_composite_,
-        {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit = SampleAllocateePtr<std::uint8_t>(&data, control_composite_, slot.value());
 
     // When assigning a nullptr to it
     unit = nullptr;
 
     // Then the underlying slot is marked invalid
-    EXPECT_TRUE(skeleton_event_data_control_local_[slot.GetIndex()].IsInvalid());
+    EXPECT_TRUE(skeleton_event_data_control_local_[slot.value()].IsInvalid());
     // and the SamplePtr doesn't hold a valid managed object.
     EXPECT_FALSE(unit);
 }
@@ -240,12 +203,9 @@ TEST_F(SampleAllocateePtrFixture, ArrayOp)
 {
     // Given an SampleAllocateePtr on an allocated slot
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
+    ASSERT_TRUE(slot.has_value());
     DummyStruct data{99, 42};
-    auto unit = SampleAllocateePtr<DummyStruct>(
-        &data,
-        control_composite_,
-        {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit = SampleAllocateePtr<DummyStruct>(&data, control_composite_, slot.value());
 
     // When accessing the data via ->
     auto val1 = unit->member1_;
@@ -260,12 +220,9 @@ TEST_F(SampleAllocateePtrFixture, StarOp)
 {
     // Given an SampleAllocateePtr on an allocated slot
     auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
+    ASSERT_TRUE(slot.has_value());
     DummyStruct data{99, 42};
-    auto unit = SampleAllocateePtr<DummyStruct>(
-        &data,
-        control_composite_,
-        {slot.GetIndex(), slot.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit = SampleAllocateePtr<DummyStruct>(&data, control_composite_, slot.value());
 
     // When accessing the data via *
     auto val1 = *unit;
@@ -279,20 +236,14 @@ TEST_F(SampleAllocateePtrFixture, SwapOp)
 {
     // Given two SampleAllocateePtrs on allocated slots
     auto slot1 = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot1.IsValid());
+    ASSERT_TRUE(slot1.has_value());
     DummyStruct data1{99, 42};
-    auto unit1 = SampleAllocateePtr<DummyStruct>(
-        &data1,
-        control_composite_,
-        {slot1.GetIndex(), slot1.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit1 = SampleAllocateePtr<DummyStruct>(&data1, control_composite_, slot1.value());
 
     auto slot2 = skeleton_event_data_control_local_.AllocateNextSlot();
-    ASSERT_TRUE(slot2.IsValid());
+    ASSERT_TRUE(slot2.has_value());
     DummyStruct data2{10, 100};
-    auto unit2 = SampleAllocateePtr<DummyStruct>(
-        &data2,
-        control_composite_,
-        {slot2.GetIndex(), slot2.GetSlot(), ControlSlotCompositeIndicator::CompositeSlotTagType::QM});
+    auto unit2 = SampleAllocateePtr<DummyStruct>(&data2, control_composite_, slot2.value());
 
     // When swapping the SampleAllocateePtrs
     swap(unit1, unit2);
diff --git a/score/mw/com/impl/bindings/lola/sample_ptr.h b/score/mw/com/impl/bindings/lola/sample_ptr.h
index 2c5f1e084..3eb54d32d 100644
--- a/score/mw/com/impl/bindings/lola/sample_ptr.h
+++ b/score/mw/com/impl/bindings/lola/sample_ptr.h
@@ -13,7 +13,7 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SAMPLE_PTR_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SAMPLE_PTR_H
 
-#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
+#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
 #include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/slot_decrementer.h"
 
@@ -43,13 +43,12 @@ class SamplePtr final
     /// \brief ctor creates valid SamplePtr from its members.
     /// \param ptr pointer to managed object
     /// \param event_data_ctrl event data control structure, which manages the underlying event/sample in shmem.
-    /// \param slot_indicator indicator of event slot
+    /// \param slot_index index of event slot
     SamplePtr(pointer ptr,
               ProxyEventDataControlLocalView<>& event_data_ctrl_local,
-              ControlSlotIndicator slot_indicator,
+              const SlotIndexType slot_index,
               TransactionLogSet::TransactionLogIndex transaction_log_idx) noexcept
-        : SamplePtr{ptr,
-                    std::make_optional<SlotDecrementer>(event_data_ctrl_local, slot_indicator, transaction_log_idx)}
+        : SamplePtr{ptr, std::make_optional<SlotDecrementer>(event_data_ctrl_local, slot_index, transaction_log_idx)}
     {
     }
 
diff --git a/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp b/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp
index 1aa4db08f..15e93c985 100644
--- a/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp
+++ b/score/mw/com/impl/bindings/lola/sample_ptr_test.cpp
@@ -51,9 +51,9 @@ class SamplePtrTest : public ::testing::Test
     SlotIndexType AllocateSlot(EventSlotStatus::EventTimeStamp timestamp = 1)
     {
         auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-        EXPECT_TRUE(slot.IsValid());
-        skeleton_event_data_control_local_.EventReady(slot, timestamp);
-        return slot.GetIndex();
+        EXPECT_TRUE(slot.has_value());
+        skeleton_event_data_control_local_.EventReady(slot.value(), timestamp);
+        return slot.value();
     }
 };
 
@@ -75,13 +75,13 @@ TYPED_TEST(SamplePtrGenericTypeTest, DereferencesAssignedSlot)
 {
     auto slot_index = SamplePtrTest::AllocateSlot();
 
-    auto client_slot_indicator =
+    auto client_slot_result =
         SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
-    ASSERT_TRUE(client_slot_indicator.IsValid());
+    ASSERT_TRUE(client_slot_result.has_value());
     uint8_t dummy_val{};
     SamplePtr<TypeParam> sample_ptr{&dummy_val,
                                     SamplePtrTest::proxy_event_data_control_local_,
-                                    client_slot_indicator,
+                                    client_slot_result.value(),
                                     SamplePtrTest::transaction_log_index_};
 
     EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot_index]}.GetReferenceCount(), 1);
@@ -93,13 +93,13 @@ TYPED_TEST(SamplePtrGenericTypeTest, ProperMoveConstruction)
 {
     auto slot_index = SamplePtrTest::AllocateSlot();
 
-    auto client_slot_indicator =
+    auto client_slot_result =
         SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
-    ASSERT_TRUE(client_slot_indicator.IsValid());
+    ASSERT_TRUE(client_slot_result.has_value());
     uint8_t dummy_val{};
     SamplePtr<TypeParam> sample_ptr{&dummy_val,
                                     SamplePtrTest::proxy_event_data_control_local_,
-                                    client_slot_indicator,
+                                    client_slot_result.value(),
                                     SamplePtrTest::transaction_log_index_};
 
     EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot_index]}.GetReferenceCount(), 1);
@@ -114,23 +114,23 @@ TYPED_TEST(SamplePtrGenericTypeTest, ProperMoveAssignment)
 {
     auto slot = SamplePtrTest::AllocateSlot(1);
 
-    auto client_slot_indicator =
+    auto client_slot_result =
         SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(0, SamplePtrTest::transaction_log_index_);
-    ASSERT_TRUE(client_slot_indicator.IsValid());
+    ASSERT_TRUE(client_slot_result.has_value());
     uint8_t dummy_val{};
     SamplePtr<TypeParam> sample_ptr{&dummy_val,
                                     SamplePtrTest::proxy_event_data_control_local_,
-                                    client_slot_indicator,
+                                    client_slot_result.value(),
                                     SamplePtrTest::transaction_log_index_};
 
     auto slot2 = SamplePtrTest::AllocateSlot(2);
 
-    auto client_slot2_indicator =
+    auto client_slot_result_2 =
         SamplePtrTest::proxy_event_data_control_local_.ReferenceNextEvent(1, SamplePtrTest::transaction_log_index_);
-    ASSERT_TRUE(client_slot2_indicator.IsValid());
+    ASSERT_TRUE(client_slot_result_2.has_value());
     SamplePtr<TypeParam> sample_ptr2{&dummy_val,
                                      SamplePtrTest::proxy_event_data_control_local_,
-                                     client_slot2_indicator,
+                                     client_slot_result_2.value(),
                                      SamplePtrTest::transaction_log_index_};
 
     EXPECT_EQ(EventSlotStatus{SamplePtrTest::proxy_event_data_control_local_[slot]}.GetReferenceCount(), 1);
@@ -164,11 +164,11 @@ TEST_F(SamplePtrTest, ArrayOp)
 {
     // Given an SamplePtr on an allocated slot
     AllocateSlot();
-    auto client_slot_indicator = proxy_event_data_control_local_.ReferenceNextEvent(0, transaction_log_index_);
-    ASSERT_TRUE(client_slot_indicator.IsValid());
+    auto slot_index = proxy_event_data_control_local_.ReferenceNextEvent(0, transaction_log_index_);
+    ASSERT_TRUE(slot_index.has_value());
     DummyStruct dummy_val{22, 44};
     SamplePtr<DummyStruct> sample_ptr{
-        &dummy_val, proxy_event_data_control_local_, client_slot_indicator, transaction_log_index_};
+        &dummy_val, proxy_event_data_control_local_, slot_index.value(), transaction_log_index_};
 
     // When accessing the data via ->
     auto val1 = sample_ptr->member1_;
@@ -183,11 +183,11 @@ TEST_F(SamplePtrTest, StarOp)
 {
     // Given an SamplePtr on an allocated slot
     AllocateSlot();
-    auto client_slot_indicator = proxy_event_data_control_local_.ReferenceNextEvent(0, transaction_log_index_);
-    ASSERT_TRUE(client_slot_indicator.IsValid());
+    auto slot_index = proxy_event_data_control_local_.ReferenceNextEvent(0, transaction_log_index_);
+    ASSERT_TRUE(slot_index.has_value());
     DummyStruct dummy_val{22, 44};
     SamplePtr<DummyStruct> sample_ptr{
-        &dummy_val, proxy_event_data_control_local_, client_slot_indicator, transaction_log_index_};
+        &dummy_val, proxy_event_data_control_local_, slot_index.value(), transaction_log_index_};
 
     // When accessing the data via *
     auto val1 = *sample_ptr;
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event.h b/score/mw/com/impl/bindings/lola/skeleton_event.h
index a41ef3449..139ae91d7 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event.h
+++ b/score/mw/com/impl/bindings/lola/skeleton_event.h
@@ -214,7 +214,7 @@ Result<impl::SampleAllocateePtr<SampleType>> SkeletonEvent<SampleType>::Allocate
         ::score::mw::log::LogError("lola") << "Tried to allocate event, but the EventDataControl does not exist!";
         return MakeUnexpected(ComErrc::kBindingFailure);
     }
-    const auto slot = event_data_control_composite_->AllocateNextSlot();
+    const auto allocated_slot_result = event_data_control_composite_->AllocateNextSlot();
 
     // Suppress "AUTOSAR C++14 A5-2-6" rule finding. This rule states:"The operands of a logical && or \\ shall be
     // parenthesized if the operands contain binary operators".
@@ -222,7 +222,7 @@ Result<impl::SampleAllocateePtr<SampleType>> SkeletonEvent<SampleType>::Allocate
     // A bug ticket has been created to track this: [Ticket-165315](broken_link_j/Ticket-165315)
     // coverity[autosar_cpp14_a5_2_6_violation : FALSE]
     if (!qm_disconnect_ && (event_data_control_composite_->GetAsilBEventDataControlLocal() != nullptr) &&
-        !slot.IsValidQM())
+        allocated_slot_result.qm_misbehaved)
     {
         qm_disconnect_ = true;
         score::mw::log::LogWarn("lola")
@@ -232,17 +232,10 @@ Result<impl::SampleAllocateePtr<SampleType>> SkeletonEvent<SampleType>::Allocate
         event_shared_impl_.GetParent().DisconnectQmConsumers();
     }
 
-    if (slot.IsValidQM() || slot.IsValidAsilB())
-    {
-        return MakeSampleAllocateePtr(
-            SampleAllocateePtr<SampleType>(&event_data_storage_->at(static_cast<std::uint64_t>(slot.GetIndex())),
-                                           *event_data_control_composite_,
-                                           slot));
-    }
-    else
+    if (!allocated_slot_result.allocated_slot_index.has_value())
     {
         // we didn't get a slot, which is a sign, that too few slots have been configured.
-        if (event_properties_.enforce_max_samples == false)
+        if (!event_properties_.enforce_max_samples)
         {
             ::score::mw::log::LogError("lola")
                 << "SkeletonEvent: Allocation of event slot failed. Hint: enforceMaxSamples was "
@@ -250,6 +243,10 @@ Result<impl::SampleAllocateePtr<SampleType>> SkeletonEvent<SampleType>::Allocate
         }
         return MakeUnexpected(ComErrc::kBindingFailure);
     }
+    return MakeSampleAllocateePtr(SampleAllocateePtr<SampleType>(
+        &event_data_storage_->at(static_cast<std::uint64_t>(*allocated_slot_result.allocated_slot_index)),
+        *event_data_control_composite_,
+        allocated_slot_result.allocated_slot_index.value()));
 }
 
 template <typename SampleType>
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp
index 3451bd1b1..a0671662e 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.cpp
@@ -12,6 +12,7 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 
+#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
 
 #include <score/assert.hpp>
@@ -44,24 +45,23 @@ 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 SkeletonEventDataControlLocalView<AtomicIndirectorType>::AllocateNextSlot() noexcept -> ControlSlotIndicator
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::AllocateNextSlot() noexcept
+    -> std::optional<SlotIndexType>
 {
-    // initially we have a default constructed "invalid" control-slot-indicator
-    ControlSlotIndicator selected_slot{};
+    std::optional<SlotIndexType> selected_index{};
     std::uint64_t retry_counter{0U};
 
     for (; retry_counter <= MAX_ALLOCATE_RETRIES; ++retry_counter)
     {
-        selected_slot = FindOldestUnusedSlot();
+        selected_index = FindOldestUnusedSlot();
 
-        if (!selected_slot.IsValid())
+        if (!selected_index.has_value())
         {
             continue;
         }
 
-        const auto& slot = selected_slot.GetSlot();
-        const auto slot_value =
-            AtomicIndirectorType<EventSlotStatus::value_type>::load(slot, std::memory_order_acquire);
+        const auto slot_value = AtomicIndirectorType<EventSlotStatus::value_type>::load(
+            state_slots_[selected_index.value()], std::memory_order_acquire);
         EventSlotStatus status{slot_value};
 
         // we need to check that this is still the same, since it is possible that is has changed after we found it
@@ -76,7 +76,7 @@ auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::AllocateNextSlot()
 
         auto status_value_type = static_cast<EventSlotStatus::value_type&>(status);
         auto status_new_value_type = static_cast<EventSlotStatus::value_type&>(status_new);
-        if (selected_slot.GetSlot().compare_exchange_weak(
+        if (state_slots_[selected_index.value()].compare_exchange_weak(
                 status_value_type, status_new_value_type, std::memory_order_acq_rel))
         {
             break;
@@ -85,58 +85,33 @@ auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::AllocateNextSlot()
 
     score::cpp::ignore = num_alloc_retries.fetch_add(retry_counter);
 
-    if ((retry_counter >= MAX_ALLOCATE_RETRIES) && (!selected_slot.IsValid()))
+    if ((retry_counter >= MAX_ALLOCATE_RETRIES))
     {
         ++num_alloc_misses;
     }
 
-    return selected_slot;
+    return selected_index;
 }
 
 template <template <class> class AtomicIndirectorType>
 // 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, no way for throwing std::terminate().
 // coverity[autosar_cpp14_a15_5_3_violation : FALSE]
-auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::FindOldestUnusedSlot() noexcept -> ControlSlotIndicator
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::FindOldestUnusedSlot() const noexcept
+    -> std::optional<SlotIndexType>
 {
     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".
-    // There is no C-style cast happening here! "current_index" and "it" are automatically deduced.
-    // Suppress "AUTOSAR C++14 M6-5-5" finding rule. This rule states: "A loop-control-variable other than the
-    // loop-counter shall not be modified within condition or expression".
-    // Both variables (current_index, it) depict exactly the same element once via index addressing and once via
-    // iterator/raw-pointer! The func has to return both, and we want both to be fully in sync, therefore we increment
-    // them both symmetrically, since in this case, it is less error-prone!
-    // Suppress "AUTOSAR C++14 A4-7-1" finding rule. This rule states: "An integer expression shall not lead to data
-    // loss". This can not be the case as the type of current_index is correctly deduced from SlotIndexType and it is
-    // assured, that state_slots_ doesn't contain more elements than SlotIndexType can represent.
-    // Suppress "AUTOSAR C++14 M5-0-15". This rule states:"indexing shall be the only form of pointer arithmetic.".
-    // Rationale: Tolerated due to containers providing pointer-like iterators.
-    // The Coverity tool considers these iterators as raw pointers.
-    // Suppress "AUTOSAR C++14 M5-2-10". This rule states: "The increment (++) and decrement (--) operators shall not be
-    // mixed with other operators in an expression".
-    // Rationale: We are only using increment operators here on separate variables! That we use it on separate variables
-    // is explained above for M6-5-5.
-    // coverity[autosar_cpp14_a5_2_2_violation]
-    for (auto [current_index, it] = std::make_tuple(SlotIndexType{0U}, state_slots_.begin()); it != state_slots_.end();
-         // coverity[autosar_cpp14_m6_5_5_violation]
-         // coverity[autosar_cpp14_a4_7_1_violation]
-         // coverity[autosar_cpp14_m5_0_15_violation]
-         // coverity[autosar_cpp14_m5_2_10_violation]
-         ++it,
-                              // coverity[autosar_cpp14_a4_7_1_violation]
-                              // coverity[autosar_cpp14_m6_5_5_violation]
-         ++current_index)
+    std::size_t current_index = 0U;
+    std::optional<SlotIndexType> selected_index{};
+    for (const auto& slot : state_slots_)
     {
         // coverity[autosar_cpp14_a5_3_2_violation]
         const EventSlotStatus status{
-            AtomicIndirectorType<EventSlotStatus::value_type>::load(*it, std::memory_order_acquire)};
+            AtomicIndirectorType<EventSlotStatus::value_type>::load(slot, std::memory_order_acquire)};
 
         if (status.IsInvalid())
         {
-            selected_slot = {current_index, *it};
+            selected_index = current_index;
             break;
         }
 
@@ -147,38 +122,41 @@ auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::FindOldestUnusedSl
             if (status.GetTimeStamp() < oldest_time_stamp)
             {
                 oldest_time_stamp = status.GetTimeStamp();
-                selected_slot = {current_index, *it};
+                selected_index = current_index;
             }
         }
+        static_assert(std::is_same_v<decltype(state_slots_.size()), decltype(current_index)>,
+                      "FindOldestUnusedSlot: Overflow dangerous.");
+        // Suppress "AUTOSAR C++14 A4-7-1" rule finding. This rule states: "An integer expression shall
+        // not lead to data loss.".
+        // As we are looping on the state slots, and current_index is incremented after handling each slot
+        // so no way for an overflow as long as both variables have same data type.
+        // coverity[autosar_cpp14_a4_7_1_violation : FALSE]
+        ++current_index;
     }
-    return selected_slot;
+    return selected_index;
 }
 
 template <template <class> class AtomicIndirectorType>
-// Suppress "AUTOSAR C++14 A15-5-3" rule findings. This rule states: "The std::terminate() function shall not be called
-// implicitly". std::terminate() is implicitly called from 'state_slots_[]' which might leds to a segmentation fault
-// 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 SkeletonEventDataControlLocalView<AtomicIndirectorType>::EventReady(
-    ControlSlotIndicator slot_indicator,
+    const SlotIndexType slot_index,
     const EventSlotStatus::EventTimeStamp time_stamp) noexcept -> void
 {
     const EventSlotStatus initial{time_stamp, 0U};
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
-    slot_indicator.GetSlot().store(static_cast<EventSlotStatus::value_type>(
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
+    state_slots_[slot_index].store(static_cast<EventSlotStatus::value_type>(
         initial));  // no race-condition can happen, since event sender has to be single-threaded/non-concurrent per AoU
 }
 
 template <template <class> class AtomicIndirectorType>
-auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::Discard(ControlSlotIndicator slot_indicator) -> void
+auto SkeletonEventDataControlLocalView<AtomicIndirectorType>::Discard(const SlotIndexType slot_index) -> void
 {
-    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(slot_indicator.IsValid());
-    auto slot = static_cast<EventSlotStatus>(slot_indicator.GetSlot().load(std::memory_order_acquire));
+    SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(static_cast<std::size_t>(slot_index) < state_slots_.size());
+    auto slot = static_cast<EventSlotStatus>(state_slots_[slot_index].load(std::memory_order_acquire));
     if (slot.IsInWriting())
     {
         slot.MarkInvalid();
-        slot_indicator.GetSlot().store(static_cast<EventSlotStatus::value_type>(slot), std::memory_order_release);
+        state_slots_[slot_index].store(static_cast<EventSlotStatus::value_type>(slot), std::memory_order_release);
     }
 }
 
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h
index 8900ac477..190d5ea13 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h
@@ -13,7 +13,6 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_DATA_CONTROL_LOCAL_VIEW_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SKELETON_EVENT_DATA_CONTROL_LOCAL_VIEW_H
 
-#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
 #include "score/mw/com/impl/bindings/lola/control_slot_types.h"
 #include "score/mw/com/impl/bindings/lola/event_data_control.h"
 #include "score/mw/com/impl/bindings/lola/event_slot_status.h"
@@ -93,14 +92,13 @@ class SkeletonEventDataControlLocalView final
     /// * enough retries are performed (currently max number of parallel actions is restricted to 50 (number of
     /// possible transactions (2) * number of parallel actions = number of retries))
     ///
-    /// \return reserved slot for writing in the form of a valid ControlSlotIndicator if found, invalid
-    ///         ControlSlotIndicator otherwise
+    /// \return reserved slot for writing if found, empty otherwise
     /// \post EventReady() is invoked to withdraw write-ownership
-    ControlSlotIndicator AllocateNextSlot() noexcept;
+    std::optional<SlotIndexType> AllocateNextSlot() noexcept;
 
     /// \brief Indicates that a slot is ready for reading - writing has finished. (thread-safe, wait-free)
     /// \pre AllocateNextSlot() was invoked to obtain write-ownership
-    void EventReady(ControlSlotIndicator slot_indicator, const EventSlotStatus::EventTimeStamp time_stamp) noexcept;
+    void EventReady(const SlotIndexType slot_index, const EventSlotStatus::EventTimeStamp time_stamp) noexcept;
 
     /// \brief Marks selected slot as invalid, if it was not yet marked as ready
     ///
@@ -108,7 +106,7 @@ class SkeletonEventDataControlLocalView final
     /// read them. This just might be the case if a SampleAllocateePtr is destroyed after invoking Send().
     ///
     /// \pre AllocateNextSlot() was invoked to obtain write-ownership
-    void Discard(ControlSlotIndicator slot_indicator);
+    void Discard(const SlotIndexType slot_index);
 
     /// \brief Increments refcount of given slot by one (given it is in the correct state i.e. being accessible/
     ///        readable)
@@ -160,9 +158,8 @@ class SkeletonEventDataControlLocalView final
 
   private:
     /// \brief Finds oldest unused slot within control slots, if there is any.
-    /// \return if an unused slot is found, returns a ControlSlotIndicator, which is valid, otherwise an invalid
-    ///         ControlSlotIndicator is returned.
-    ControlSlotIndicator FindOldestUnusedSlot() noexcept;
+    /// \return if an unused slot is found, returns its index, otherwise, an empty optional is returned.
+    std::optional<SlotIndexType> FindOldestUnusedSlot() const noexcept;
 
     LocalEventControlSlots state_slots_;
 
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp
index ea219795b..06bb2c231 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view_test.cpp
@@ -11,6 +11,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
+#include "score/mw/com/impl/bindings/lola/control_slot_types.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/test_doubles/fake_memory_resource.h"
@@ -101,9 +102,9 @@ class SkeletonEventDataControlLocalViewFixture : public ::testing::Test
     {
         SCORE_LANGUAGE_FUTURECPP_ASSERT(unit_ != nullptr);
         auto slot = unit_->AllocateNextSlot();
-        EXPECT_TRUE(slot.IsValid());
-        unit_->EventReady(slot, timestamp);
-        return slot.GetIndex();
+        EXPECT_TRUE(slot.has_value());
+        unit_->EventReady(slot.value(), timestamp);
+        return slot.value();
     }
 
     FakeMemoryResource memory_{};
@@ -128,9 +129,9 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateOneSlotWithoutConten
     // When allocating a slot
     auto slot = unit_->AllocateNextSlot();
 
-    EXPECT_TRUE(slot.IsValid());
+    EXPECT_TRUE(slot.has_value());
     // The expected (first) slot is returned
-    EXPECT_EQ(slot.GetIndex(), 0);
+    EXPECT_EQ(slot.value(), 0);
 }
 
 TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateOneSlotWhenReferenceCountChanges)
@@ -174,9 +175,9 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateOneSlotWhenReference
     // When allocating a slot
     const auto slot = unit_mock_->AllocateNextSlot();
 
-    EXPECT_TRUE(slot.IsValid());
+    EXPECT_TRUE(slot.has_value());
     // The expected (second) slot is returned
-    EXPECT_EQ(slot.GetIndex(), 1);
+    EXPECT_EQ(slot.value(), 1);
 }
 
 TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateMultipleSlotWithoutContention)
@@ -189,7 +190,7 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateMultipleSlotWithoutC
     const auto slot = unit_->AllocateNextSlot();
 
     // Then the second possible slot is returned
-    EXPECT_EQ(slot.GetIndex(), 1);
+    EXPECT_EQ(slot.value(), 1);
 }
 
 TEST_F(SkeletonEventDataControlLocalViewFixture, DiscardedElementOnWritingWillBeInvalid)
@@ -199,13 +200,10 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, DiscardedElementOnWritingWillBe
     auto slot = unit_->AllocateNextSlot();
 
     // When discarding that slot
-    unit_->Discard(slot);
+    unit_->Discard(slot.value());
 
     // Then the slot is marked as invalid
-    // either accessed via EventDataControl array-elem-access-op
-    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInvalid());
-    // or via raw-pointer
-    EXPECT_TRUE(EventSlotStatus(slot.GetSlot().load()).IsInvalid());
+    EXPECT_TRUE((*unit_)[slot.value()].IsInvalid());
 }
 
 TEST_F(SkeletonEventDataControlLocalViewFixture, DiscardedElementAfterWritingIsNotTouched)
@@ -213,14 +211,14 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, DiscardedElementAfterWritingIsN
     // Given an initialized EventDataControl structure where already a slot is written
     GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
     const auto slot = unit_->AllocateNextSlot();
-    unit_->EventReady(slot, 0x42);
+    unit_->EventReady(slot.value(), 0x42);
 
     // When discarding that slot
-    unit_->Discard(slot);
+    unit_->Discard(slot.value());
 
     // Then the slot is not touched
-    EXPECT_EQ((*unit_)[slot.GetIndex()].GetTimeStamp(), 0x42);
-    EXPECT_EQ((*unit_)[slot.GetIndex()].GetReferenceCount(), 0);
+    EXPECT_EQ((*unit_)[slot.value()].GetTimeStamp(), 0x42);
+    EXPECT_EQ((*unit_)[slot.value()].GetReferenceCount(), 0);
 }
 
 TEST_F(SkeletonEventDataControlLocalViewFixture, CanNotAllocateSlotIfAllSlotsAllocated)
@@ -236,44 +234,42 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, CanNotAllocateSlotIfAllSlotsAll
     const auto slot = unit_->AllocateNextSlot();
 
     // Then this is not possible
-    EXPECT_FALSE(slot.IsValid());
+    EXPECT_FALSE(slot.has_value());
 }
 
 TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateSlotAfterOneSlotReady)
 {
     // Given an initialized EventDataControl structure where all slots are allocated
     GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
-    std::array<ControlSlotIndicator, 5U> slot_indicators{};
     for (auto counter = 0U; counter < 5U; ++counter)
     {
-        slot_indicators[counter] = unit_->AllocateNextSlot();
+        unit_->AllocateNextSlot();
     }
 
     // When trying freeing one slot and trying to allocate another one
-    unit_->EventReady(slot_indicators[3], 1);
+    unit_->EventReady(3, 1);
     const auto slot = unit_->AllocateNextSlot();
 
     // Then the freed slot is allocated
-    EXPECT_EQ(slot.GetIndex(), 3);
+    EXPECT_EQ(slot.value(), 3);
 }
 
 TEST_F(SkeletonEventDataControlLocalViewFixture, CanAllocateOldestSlotAfterOneSlotReady)
 {
     // Given an initialized EventDataControl structure where all slots are allocated
     GivenARealSkeletonEventDataControlLocalView(kMaxSlots, kMaxSubscribers);
-    std::array<ControlSlotIndicator, 5U> slot_indicators{};
     for (auto counter = 0U; counter < 5U; ++counter)
     {
-        slot_indicators[counter] = unit_->AllocateNextSlot();
+        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);
+    unit_->EventReady(4, 3);
+    unit_->EventReady(2, 2);
     const auto slot = unit_->AllocateNextSlot();
 
     // Then the oldest (lowest timestamp) slot is allocated
-    EXPECT_EQ(slot.GetIndex(), 2);
+    EXPECT_EQ(slot.value(), 2);
 }
 
 // Initially we had a 'randomized allocate or free logic'.
@@ -288,16 +284,16 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, MultithreadedSlotAllocationDeal
     std::atomic<EventSlotStatus::EventTimeStamp> time_stamp{1};
     auto fuzzer = [this, &time_stamp]() {
         // Worker that alternates between slot allocation and deallocation, ensuring an increasing time stamp
-        std::vector<ControlSlotIndicator> allocated_events{};
+        std::vector<SlotIndexType> allocated_events{};
         bool allocate{false};
         for (int i = 0; i < 1000; i++)
         {
             if ((allocate = !allocate))
             {
                 const auto slot = unit_->AllocateNextSlot();
-                if (slot.IsValid())
+                if (slot.has_value())
                 {
-                    allocated_events.push_back(slot);
+                    allocated_events.push_back(slot.value());
                 }
             }
             else
@@ -371,8 +367,8 @@ TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_S
     // Given an EventDataControl with one in_writing slot
     GivenARealSkeletonEventDataControlLocalView(1, kMaxSubscribers);
     auto slot = unit_->AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
-    EXPECT_TRUE((*unit_)[slot.GetIndex()].IsInWriting());
+    ASSERT_TRUE(slot.has_value());
+    EXPECT_TRUE((*unit_)[slot.value()].IsInWriting());
 
     const auto transaction_log_index =
         unit_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
@@ -397,7 +393,7 @@ TEST_F(EventDataControlReferenceSpecificEventDeathTest, ReferenceSpecificEvent_R
     // Given an EventDataControl with one slot
     GivenAMockedEventDataControl(1, kMaxSubscribers);
     auto slot = unit_mock_->AllocateNextSlot();
-    ASSERT_TRUE(slot.IsValid());
+    ASSERT_TRUE(slot.has_value());
 
     const auto transaction_log_index =
         unit_mock_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value();
@@ -420,8 +416,8 @@ TEST_F(SkeletonEventDataControlLocalViewFixture, AllocatedSlotsCanBeCleanedUp)
     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.value()].IsInWriting());
+    EXPECT_FALSE((*unit_)[second_slot.value()].IsInWriting());
 }
 
 using EventDataControlDeathTest = SkeletonEventDataControlLocalViewFixture;
diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp
index 574bba521..02ebafe47 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp
@@ -12,11 +12,13 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/skeleton_event.h"
 #include "score/mw/com/impl/bindings/lola/event_data_control_test_resources.h"
+#include "score/mw/com/impl/bindings/lola/skeleton_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/test/skeleton_event_test_resources.h"
 #include "score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h"
 
 #include "score/filesystem/filesystem.h"
 
+#include "score/mw/com/impl/configuration/quality_type.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <memory>
@@ -371,13 +373,15 @@ TEST_F(SkeletonEventTimestampFixture, SendUpdatesTimestampInControlData)
 
     const impl::SampleAllocateePtrView<test::TestSampleType> first_view{first_allocated_slot};
     auto* first_lola_ptr = first_view.template As<lola::SampleAllocateePtr<test::TestSampleType>>();
-    auto first_slot_indicator = first_lola_ptr->GetReferencedSlot();
+    auto first_slot_index = first_lola_ptr->GetReferencedSlot();
 
     auto first_send_result = skeleton_event_->Send(std::move(first_allocated_slot), score::cpp::nullopt);
     ASSERT_TRUE(first_send_result.has_value());
 
     // THEN its timestamp should be a valid, non-zero value
-    const EventSlotStatus first_final_slot_status{first_slot_indicator.GetSlotQM().load()};
+    auto* event_control = GetEventControl(fake_element_fq_id_, QualityType::kASIL_QM);
+    SkeletonEventDataControlLocalView<> skeleton_event_data_control_local{event_control->data_control};
+    const EventSlotStatus first_final_slot_status{skeleton_event_data_control_local[first_slot_index]};
     // AND the first timestamp should be 2, as it's the first one after initialization.
     const auto first_timestamp = first_final_slot_status.GetTimeStamp();
     EXPECT_EQ(first_timestamp, 2U);
@@ -389,12 +393,12 @@ TEST_F(SkeletonEventTimestampFixture, SendUpdatesTimestampInControlData)
 
     const impl::SampleAllocateePtrView<test::TestSampleType> second_view{second_allocated_slot};
     auto* second_lola_ptr = second_view.template As<lola::SampleAllocateePtr<test::TestSampleType>>();
-    auto second_slot_indicator = second_lola_ptr->GetReferencedSlot();
+    auto second_slot_index = second_lola_ptr->GetReferencedSlot();
     auto second_send_result = skeleton_event_->Send(std::move(second_allocated_slot), score::cpp::nullopt);
     ASSERT_TRUE(second_send_result.has_value());
 
     // THEN its timestamp should be exactly one greater than the first one
-    const EventSlotStatus second_final_slot_status{second_slot_indicator.GetSlotQM().load()};
+    const EventSlotStatus second_final_slot_status{skeleton_event_data_control_local[second_slot_index]};
     const auto second_timestamp = second_final_slot_status.GetTimeStamp();
     EXPECT_EQ(second_timestamp, first_timestamp + 1U)
         << "The second timestamp should be exactly one greater than the first.";
diff --git a/score/mw/com/impl/bindings/lola/skeleton_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_test.cpp
index c29f40e10..7a6d3514b 100644
--- a/score/mw/com/impl/bindings/lola/skeleton_test.cpp
+++ b/score/mw/com/impl/bindings/lola/skeleton_test.cpp
@@ -400,10 +400,10 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferOpensAndCleansExistingSharedMemo
 
     // and given that QM and ASIL B control segments contain (previously) allocated slots that are in writing
     auto first_allocation_qm = event_control_qm_local.data_control.AllocateNextSlot();
-    ASSERT_TRUE(first_allocation_qm.IsValid());
+    ASSERT_TRUE(first_allocation_qm.has_value());
 
     auto first_allocation_asil_b = event_control_asil_b_local.data_control.AllocateNextSlot();
-    ASSERT_TRUE(first_allocation_asil_b.IsValid());
+    ASSERT_TRUE(first_allocation_asil_b.has_value());
 
     EXPECT_CALL(shared_memory_factory_mock_, Open(test::kControlChannelPathQm, true, _));
     EXPECT_CALL(shared_memory_factory_mock_, Open(test::kControlChannelPathAsilB, true, _));
@@ -415,12 +415,12 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferOpensAndCleansExistingSharedMemo
 
     // And a new allocation will return the same slot as before, as it was cleaned up
     auto second_allocation_qm = event_control_qm_local.data_control.AllocateNextSlot();
-    ASSERT_TRUE(second_allocation_qm.IsValid());
-    EXPECT_EQ(first_allocation_qm.GetIndex(), second_allocation_qm.GetIndex());
+    ASSERT_TRUE(second_allocation_qm.has_value());
+    EXPECT_EQ(first_allocation_qm.value(), second_allocation_qm.value());
 
     auto second_allocation_asil_b = event_control_asil_b_local.data_control.AllocateNextSlot();
-    ASSERT_TRUE(second_allocation_asil_b.IsValid());
-    EXPECT_EQ(first_allocation_asil_b.GetIndex(), second_allocation_asil_b.GetIndex());
+    ASSERT_TRUE(second_allocation_asil_b.has_value());
+    EXPECT_EQ(first_allocation_asil_b.value(), second_allocation_asil_b.value());
 }
 
 TEST_F(SkeletonPrepareOfferFixture, PrepareOfferFailsIfOpeningExistingSharedMemoryDataFails)
@@ -800,7 +800,7 @@ TEST_P(SkeletonRegisterParamaterisedFixture, RegisterWillCreateEventDataIfShmReg
     // Then the Register call should return pointers to the created control and data sections which can be used to
     // allocate slots
     auto allocation = event_data_control_composite.AllocateNextSlot();
-    ASSERT_TRUE(allocation.IsValidQmAndAsilB());
+    ASSERT_TRUE(allocation.allocated_slot_index.has_value());
 
     EXPECT_NE(typed_event_data_storage_ptr, nullptr);
 }
@@ -1049,8 +1049,8 @@ TEST_P(SkeletonRegisterParamaterisedFixture, CanAllocateSlotAfterEventIsRegister
 
     // Then we can allocate and free slots on that event
     auto allocation = event_reg_result.second.AllocateNextSlot();
-    ASSERT_TRUE(allocation.IsValidQM());
-    EXPECT_EQ(allocation.GetIndex(), 0);
+    ASSERT_TRUE(allocation.allocated_slot_index.has_value());
+    EXPECT_EQ(allocation.allocated_slot_index.value(), 0);
 
     CleanUpSkeleton();
 }
@@ -1090,8 +1090,8 @@ TEST_P(SkeletonRegisterParamaterisedFixture, AllocateAfterCleanUp)
 
     // Then the same slot can get allocated
     auto allocation_after_cleanup = event_reg_result.second.AllocateNextSlot();
-    ASSERT_TRUE(allocation_after_cleanup.IsValidQM());
-    EXPECT_EQ(allocation.GetIndex(), allocation_after_cleanup.GetIndex());
+    ASSERT_TRUE(allocation_after_cleanup.allocated_slot_index.has_value());
+    EXPECT_EQ(allocation.allocated_slot_index.value(), allocation_after_cleanup.allocated_slot_index.value());
 
     CleanUpSkeleton();
 }
diff --git a/score/mw/com/impl/bindings/lola/slot_collector.cpp b/score/mw/com/impl/bindings/lola/slot_collector.cpp
index e1f7483fc..63098cbc9 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_collector.cpp
@@ -35,27 +35,28 @@ std::size_t SlotCollector::GetNumNewSamplesAvailable() const noexcept
     return event_data_control_local_.get().GetNumNewEvents(last_ts_);
 }
 
-SlotCollector::SlotIndicators SlotCollector::GetNewSamplesSlotIndices(const std::size_t max_count) noexcept
+SlotCollector::SlotIndices SlotCollector::GetNewSamplesSlotIndices(const std::size_t max_count) noexcept
 {
     // CollectSlots() returns an iterator pointing to one past the end (end being the oldest collected slot, begin being
     // the newest/youngest collected slot)
-    auto collected_slots_end_iterator = CollectSlots(max_count);
+    const auto collected_slots_end_const_iterator = CollectSlots(max_count);
 
     EventSlotStatus::EventTimeStamp newest_delivered{last_ts_};
     // we are iterating the collected slots from the oldest event (smallest timestamp) to the newest event
     // (largest timestamp) here.
-    for (auto slot = std::make_reverse_iterator(collected_slots_end_iterator); slot != collected_slots_.crend(); ++slot)
+    for (auto slot = std::make_reverse_iterator(collected_slots_end_const_iterator); slot != collected_slots_.crend();
+         ++slot)
     {
-        const EventSlotStatus slot_status{slot->GetSlot().load()};
+        const EventSlotStatus slot_status{event_data_control_local_.get()[*slot]};
         newest_delivered = std::max(newest_delivered, slot_status.GetTimeStamp());
     }
 
     last_ts_ = newest_delivered;
 
-    return {std::make_reverse_iterator(collected_slots_end_iterator), collected_slots_.rend()};
+    return {std::make_reverse_iterator(collected_slots_end_const_iterator), collected_slots_.crend()};
 }
 
-SlotCollector::SlotIndicatorVector::iterator SlotCollector::CollectSlots(const std::size_t max_count) noexcept
+SlotCollector::SlotIndexVector::const_iterator SlotCollector::CollectSlots(const std::size_t max_count) noexcept
 {
     EventSlotStatus::EventTimeStamp current_highest = EventSlotStatus::TIMESTAMP_MAX;
     auto collected_slot = collected_slots_.begin();
@@ -64,15 +65,15 @@ SlotCollector::SlotIndicatorVector::iterator SlotCollector::CollectSlots(const s
     SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(collected_slot != collected_slots_.cend());
     for (std::size_t count = 0U; count < max_count; ++count)
     {
-        ControlSlotIndicator slot =
+        const std::optional<SlotIndexType> slot =
             event_data_control_local_.get().ReferenceNextEvent(last_ts_, transaction_log_index_, current_highest);
-        if (!(slot.IsValid()))
+        if (!(slot.has_value()))
         {
             break;
         }
-        const EventSlotStatus event_status{slot.GetSlot().load()};
+        const EventSlotStatus event_status{event_data_control_local_.get()[*slot]};
         current_highest = event_status.GetTimeStamp();
-        *collected_slot = slot;
+        *collected_slot = *slot;
         ++collected_slot;
 
         if (collected_slot == collected_slots_.end())
diff --git a/score/mw/com/impl/bindings/lola/slot_collector.h b/score/mw/com/impl/bindings/lola/slot_collector.h
index 02b3b9785..b29b03743 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector.h
+++ b/score/mw/com/impl/bindings/lola/slot_collector.h
@@ -29,18 +29,18 @@ namespace score::mw::com::impl::lola
 class SlotCollector final
 {
   public:
-    using SlotIndicatorVector = std::vector<ControlSlotIndicator>;
+    using SlotIndexVector = std::vector<SlotIndexType>;
 
-    class SlotIndicators
+    class SlotIndices
     {
       public:
         // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall
         // be private.". There are no class invariants to maintain which could be violated by directly accessing member
         // variables.
         // coverity[autosar_cpp14_m11_0_1_violation]
-        SlotCollector::SlotIndicatorVector::reverse_iterator begin;
+        SlotCollector::SlotIndexVector::const_reverse_iterator begin;
         // coverity[autosar_cpp14_m11_0_1_violation]
-        SlotCollector::SlotIndicatorVector::reverse_iterator end;
+        SlotCollector::SlotIndexVector::const_reverse_iterator end;
     };
 
     /// Create a SlotCollector for the specified service instance and event.
@@ -71,19 +71,18 @@ class SlotCollector final
     ///
     /// \param max_count The maximum number of callbacks that shall be executed.
     /// \return Number of samples received.
-    SlotIndicators GetNewSamplesSlotIndices(const std::size_t max_count) noexcept;
+    SlotIndices GetNewSamplesSlotIndices(const std::size_t max_count) noexcept;
 
   private:
     /// \brief Collects up to max_count slots (events) in collected_slots_, which have a timestamp > last_ts_
     ///        (are younger than last_ts_) and returns an iterator to one past the last collected (oldest) slot
     /// \param max_count maximum number of slots to collect.
     /// \return an iterator to one past the oldest collected slot (smallest timestamp).
-    SlotIndicatorVector::iterator CollectSlots(const std::size_t max_count) noexcept;
+    SlotIndexVector::const_iterator CollectSlots(const std::size_t max_count) noexcept;
 
     std::reference_wrapper<ProxyEventDataControlLocalView<>> event_data_control_local_;
     EventSlotStatus::EventTimeStamp last_ts_;
-    SlotIndicatorVector
-        collected_slots_;  // Pre-allocated scratchpad memory to present the events in-order to the user.
+    SlotIndexVector collected_slots_;  // Pre-allocated scratchpad memory to present the events in-order to the user.
     TransactionLogSet::TransactionLogIndex transaction_log_index_;
 };
 
diff --git a/score/mw/com/impl/bindings/lola/slot_collector_test.cpp b/score/mw/com/impl/bindings/lola/slot_collector_test.cpp
index 8351e8756..2550eec87 100644
--- a/score/mw/com/impl/bindings/lola/slot_collector_test.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_collector_test.cpp
@@ -33,13 +33,13 @@ class SlotCollectorWithFakeMem : public ::testing::Test
   protected:
     SlotIndexType AllocateSlot(const EventSlotStatus::EventTimeStamp timestamp = 1)
     {
-        const auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-        EXPECT_TRUE(slot.IsValid());
-        skeleton_event_data_control_local_.EventReady(slot, timestamp);
-        return slot.GetIndex();
+        const auto allocated_slot = skeleton_event_data_control_local_.AllocateNextSlot();
+        EXPECT_TRUE(allocated_slot.has_value());
+        skeleton_event_data_control_local_.EventReady(allocated_slot.value(), timestamp);
+        return allocated_slot.value();
     }
 
-    std::size_t CalculateNumberOfCollectedSlots(const SlotCollector::SlotIndicators& indices)
+    std::size_t CalculateNumberOfCollectedSlots(const SlotCollector::SlotIndices& indices)
     {
         return static_cast<std::size_t>(std::distance(indices.begin, indices.end));
     }
@@ -62,7 +62,7 @@ TEST_F(SlotCollectorWithFakeMem, TestProperEventAcquisition)
     const auto slot_indices = slot_collector.GetNewSamplesSlotIndices(max_count);
 
     EXPECT_EQ(CalculateNumberOfCollectedSlots(slot_indices), 1);
-    EXPECT_EQ(slot_indices.begin->GetIndex(), 0);
+    EXPECT_EQ(*slot_indices.begin, 0);
 }
 
 TEST_F(SlotCollectorWithFakeMem, ReceiveEventsInOrder)
@@ -86,7 +86,7 @@ TEST_F(SlotCollectorWithFakeMem, ReceiveEventsInOrder)
     SlotIndexType current_slot_index = 0;
     for (auto it = slot_indices.begin; it != slot_indices.end; ++it)
     {
-        EXPECT_EQ(it->GetIndex(), current_slot_index);
+        EXPECT_EQ(*it, current_slot_index);
         current_slot_index++;
     }
 
diff --git a/score/mw/com/impl/bindings/lola/slot_decrementer.cpp b/score/mw/com/impl/bindings/lola/slot_decrementer.cpp
index 6c372c02a..e5f75cad9 100644
--- a/score/mw/com/impl/bindings/lola/slot_decrementer.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_decrementer.cpp
@@ -12,14 +12,16 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/slot_decrementer.h"
 
+#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
+
 namespace score::mw::com::impl::lola
 {
 
 SlotDecrementer::SlotDecrementer(ProxyEventDataControlLocalView<>& event_data_control_local,
-                                 ControlSlotIndicator control_slot_indicator,
+                                 const SlotIndexType event_slot_index,
                                  const TransactionLogSet::TransactionLogIndex transaction_log_idx) noexcept
     : event_data_control_local_{&event_data_control_local},
-      control_slot_indicator_{control_slot_indicator},
+      event_slot_index_{event_slot_index},
       transaction_log_idx_{transaction_log_idx}
 {
 }
@@ -34,9 +36,9 @@ SlotDecrementer::SlotDecrementer(SlotDecrementer&& other) noexcept
       // Suppress "AUTOSAR C++14 A12-8-4" rule finding. This rule states: "Move constructor shall not initialize its
       // class members and base classes using copy semantics."
       // Rationale: False positive - std::move is used which will result in the move constructor of
-      // control_slot_indicator_ being called.
+      // event_slot_index_ being called.
       // coverity[autosar_cpp14_a12_8_4_violation : FALSE]
-      control_slot_indicator_{std::move(other.control_slot_indicator_)},
+      event_slot_index_{std::move(other.event_slot_index_)},
       transaction_log_idx_{other.transaction_log_idx_}
 {
     other.event_data_control_local_ = nullptr;
@@ -53,7 +55,7 @@ SlotDecrementer& SlotDecrementer::operator=(SlotDecrementer&& other) noexcept
     {
         internal_delete();
         event_data_control_local_ = other.event_data_control_local_;
-        control_slot_indicator_ = other.control_slot_indicator_;
+        event_slot_index_ = other.event_slot_index_;
         transaction_log_idx_ = other.transaction_log_idx_;
 
         other.event_data_control_local_ = nullptr;
@@ -65,7 +67,7 @@ void SlotDecrementer::internal_delete() noexcept
 {
     if (event_data_control_local_ != nullptr)
     {
-        event_data_control_local_->DereferenceEvent(control_slot_indicator_, transaction_log_idx_);
+        event_data_control_local_->DereferenceEvent(event_slot_index_, transaction_log_idx_);
     }
 }
 
diff --git a/score/mw/com/impl/bindings/lola/slot_decrementer.h b/score/mw/com/impl/bindings/lola/slot_decrementer.h
index ccc4cba3c..9f65c9bd9 100644
--- a/score/mw/com/impl/bindings/lola/slot_decrementer.h
+++ b/score/mw/com/impl/bindings/lola/slot_decrementer.h
@@ -13,7 +13,7 @@
 #ifndef SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_DECREMENTER_H
 #define SCORE_MW_COM_IMPL_BINDINGS_LOLA_SLOT_DECREMENTER_H
 
-#include "score/mw/com/impl/bindings/lola/control_slot_indicator.h"
+#include "score/mw/com/impl/bindings/lola/control_slot_types.h"
 #include "score/mw/com/impl/bindings/lola/proxy_event_data_control_local_view.h"
 #include "score/mw/com/impl/bindings/lola/transaction_log_set.h"
 
@@ -24,7 +24,7 @@ class SlotDecrementer
 {
   public:
     SlotDecrementer(ProxyEventDataControlLocalView<>& event_data_control,
-                    ControlSlotIndicator control_slot_indicator,
+                    const SlotIndexType event_slot_index,
                     const TransactionLogSet::TransactionLogIndex transaction_log_idx) noexcept;
     ~SlotDecrementer() noexcept;
 
@@ -37,7 +37,7 @@ class SlotDecrementer
     void internal_delete() noexcept;
 
     ProxyEventDataControlLocalView<>* event_data_control_local_;
-    ControlSlotIndicator control_slot_indicator_;
+    SlotIndexType event_slot_index_;
     TransactionLogSet::TransactionLogIndex transaction_log_idx_;
 };
 
diff --git a/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp b/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp
index 4c8ad8ff3..8cf9bb259 100644
--- a/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp
+++ b/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp
@@ -12,6 +12,7 @@
  ********************************************************************************/
 #include "score/mw/com/impl/bindings/lola/slot_decrementer.h"
 
+#include "score/mw/com/impl/bindings/lola/control_slot_types.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_event_data_control_local_view.h"
@@ -39,28 +40,28 @@ class SlotDecrementerFixture : public ::testing::Test
   public:
     SlotDecrementerFixture& WithASlotDecrementer()
     {
-        const auto slot_indicator = AllocateSlotAndReferenceEvent();
-        control_slot_indicator_ = slot_indicator;
-        slot_decrementer_ = SlotDecrementer{proxy_event_data_control_local_, slot_indicator, transaction_log_index_};
+        const auto slot_index = AllocateSlotAndReferenceEvent();
+        score::cpp::ignore = event_slot_index_.emplace(slot_index);
+        slot_decrementer_ = SlotDecrementer{proxy_event_data_control_local_, slot_index, transaction_log_index_};
         return *this;
     }
 
-    ControlSlotIndicator AllocateSlotAndReferenceEvent(EventSlotStatus::EventTimeStamp timestamp = 1)
+    SlotIndexType AllocateSlotAndReferenceEvent(EventSlotStatus::EventTimeStamp timestamp = 1)
     {
         // Allocate a slot which will acquire it for writing
         auto slot = skeleton_event_data_control_local_.AllocateNextSlot();
-        EXPECT_TRUE(slot.IsValid());
+        EXPECT_TRUE(slot.has_value());
 
         // Mark the slot as ready which allows it to be read
-        skeleton_event_data_control_local_.EventReady(slot, timestamp);
+        skeleton_event_data_control_local_.EventReady(slot.value(), timestamp);
 
         // Reference the slot which indicates that a consumer is currently reading it. Use timestamp - 1 to ensure that
         // we find the slot that we just marked as ready first.
-        auto current_slot_indicator =
+        auto client_slot_result =
             proxy_event_data_control_local_.ReferenceNextEvent(timestamp - 1, transaction_log_index_);
-        EXPECT_TRUE(current_slot_indicator.IsValid());
+        EXPECT_TRUE(client_slot_result.has_value());
 
-        return current_slot_indicator;
+        return client_slot_result.value();
     }
 
     EventSlotStatus::SubscriberCount GetSlotReferenceCount(const SlotIndexType event_slot_index)
@@ -75,7 +76,7 @@ class SlotDecrementerFixture : public ::testing::Test
     TransactionLogSet::TransactionLogIndex transaction_log_index_{
         proxy_event_data_control_local_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value()};
 
-    ControlSlotIndicator control_slot_indicator_{};
+    std::optional<SlotIndexType> event_slot_index_{};
     score::cpp::optional<SlotDecrementer> slot_decrementer_{};
 };
 
@@ -85,7 +86,7 @@ TEST_F(SlotDecrementerFixture, CreatingSlotDecrementerWithReferencedSlotMaintain
     WithASlotDecrementer();
 
     // Then the reference count of the slot managed by the SlotDecrementer will be 1
-    EXPECT_EQ(GetSlotReferenceCount(control_slot_indicator_.GetIndex()), 1U);
+    EXPECT_EQ(GetSlotReferenceCount(event_slot_index_.value()), 1U);
 }
 
 TEST_F(SlotDecrementerFixture, DestroyingSlotDecrementerDereferencesSlot)
@@ -97,7 +98,7 @@ TEST_F(SlotDecrementerFixture, DestroyingSlotDecrementerDereferencesSlot)
     slot_decrementer_.reset();
 
     // Then the reference count of the slot managed by the SlotDecrementer will be decremented
-    EXPECT_EQ(GetSlotReferenceCount(control_slot_indicator_.GetIndex()), 0U);
+    EXPECT_EQ(GetSlotReferenceCount(event_slot_index_.value()), 0U);
 }
 
 TEST_F(SlotDecrementerFixture, MoveConstructingWillNotDereferenceSlot)
@@ -109,7 +110,7 @@ TEST_F(SlotDecrementerFixture, MoveConstructingWillNotDereferenceSlot)
     const auto new_slot_decrementer{std::move(slot_decrementer_.value())};
 
     // Then the reference count of the slot managed by the SlotDecrementer will still be 1
-    EXPECT_EQ(GetSlotReferenceCount(control_slot_indicator_.GetIndex()), 1U);
+    EXPECT_EQ(GetSlotReferenceCount(event_slot_index_.value()), 1U);
 }
 
 TEST_F(SlotDecrementerFixture, MoveAssigningWillDecrementSlotOfMovedToSlotDecrementer)
@@ -118,17 +119,16 @@ TEST_F(SlotDecrementerFixture, MoveAssigningWillDecrementSlotOfMovedToSlotDecrem
     WithASlotDecrementer();
 
     // and a second SlotDecrementer referencing a different slot
-    const auto second_slot_indicator = AllocateSlotAndReferenceEvent(2);
-    SlotDecrementer second_slot_decrementer{
-        proxy_event_data_control_local_, second_slot_indicator, transaction_log_index_};
+    const auto second_slot_index = AllocateSlotAndReferenceEvent(2);
+    SlotDecrementer second_slot_decrementer{proxy_event_data_control_local_, second_slot_index, transaction_log_index_};
 
     // When move assigning the second SlotDecrementer to the first
     slot_decrementer_.value() = std::move(second_slot_decrementer);
 
     // Then the reference count of the moved to slot will be decremented
-    EXPECT_EQ(GetSlotReferenceCount(control_slot_indicator_.GetIndex()), 0U);
+    EXPECT_EQ(GetSlotReferenceCount(event_slot_index_.value()), 0U);
     // and the reference count of the moved from slot will not be decremented
-    EXPECT_EQ(GetSlotReferenceCount(second_slot_indicator.GetIndex()), 1U);
+    EXPECT_EQ(GetSlotReferenceCount(second_slot_index), 1U);
 }
 
 TEST_F(SlotDecrementerFixture, SelfMoveAssigningWillNotDereferenceSlot)
@@ -140,7 +140,7 @@ TEST_F(SlotDecrementerFixture, SelfMoveAssigningWillNotDereferenceSlot)
     slot_decrementer_.value() = std::move(slot_decrementer_.value());
 
     // Then the reference count of the slot managed by the SlotDecrementer will still be 1
-    EXPECT_EQ(GetSlotReferenceCount(control_slot_indicator_.GetIndex()), 1U);
+    EXPECT_EQ(GetSlotReferenceCount(event_slot_index_.value()), 1U);
 }
 
 }  // namespace
diff --git a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp
index 2e9ef62b4..105c31cb1 100644
--- a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp
+++ b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp
@@ -187,10 +187,10 @@ SlotIndexType LolaProxyEventResources::PutData(const std::uint32_t value,
 {
     SCORE_LANGUAGE_FUTURECPP_ASSERT(skeleton_event_control_local_.has_value());
     auto slot_result = skeleton_event_control_local_->data_control.AllocateNextSlot();
-    EXPECT_TRUE(slot_result.IsValid());
-    auto slot_index = slot_result.GetIndex();
+    EXPECT_TRUE(slot_result.has_value());
+    auto slot_index = slot_result.value();
     event_data_storage_->at(slot_index) = value;
-    skeleton_event_control_local_->data_control.EventReady(slot_result, timestamp);
+    skeleton_event_control_local_->data_control.EventReady(slot_index, timestamp);
     return slot_index;
 }
 
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 d8a2c1a4e..2dbfc6ce2 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
@@ -147,10 +147,10 @@ class SkeletonEventComponentTestTemplateFixture : public ::testing::Test
         auto& event_data_control = control_storage->event_controls_.find(fake_element_fq_id_)->second.data_control;
         ProxyEventDataControlLocalView<> proxy_event_data_control_local{event_data_control};
         proxy_event_data_control_local.GetTransactionLogSet().RegisterSkeletonTracingElement();
-        auto slot_indicator =
+        auto slot_index =
             proxy_event_data_control_local.ReferenceNextEvent(0, TransactionLogSet::kSkeletonIndexSentinel);
-        EXPECT_TRUE(slot_indicator.IsValid());
-        return values->at(slot_indicator.GetIndex());
+        EXPECT_TRUE(slot_index.has_value());
+        return values->at(slot_index.value());
     }
 
     std::size_t GetFreeSampleSlots() const
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 f9532a4bc..b926e170d 100644
--- a/score/mw/com/impl/plumbing/rust/sample_allocatee_ptr.rs
+++ b/score/mw/com/impl/plumbing/rust/sample_allocatee_ptr.rs
@@ -17,14 +17,7 @@
 use core::fmt::Debug;
 use std::mem::ManuallyDrop;
 
-use common_rs::{BlankBinding, ControlSlotType, CxxOptional, EventDataControl, SlotIndexType};
-
-#[repr(C)]
-struct ControlSlotCompositeIndicator {
-    _slot_index: SlotIndexType,
-    _slot_pointer_qm: *mut ControlSlotType,
-    _slot_pointer_asil_b: *mut ControlSlotType,
-}
+use common_rs::{BlankBinding, CxxOptional, EventDataControl, SlotIndexType};
 
 #[repr(C)]
 struct EventDataControlComposite {
@@ -36,7 +29,7 @@ struct EventDataControlComposite {
 #[repr(C)]
 struct LolaSampleAllocateePtrBinding<T> {
     _managed_object: *mut T,
-    _event_slot_indicator: ControlSlotCompositeIndicator,
+    _event_slot_index: SlotIndexType,
     _event_data_control: CxxOptional<EventDataControlComposite<>>,
 }
 
@@ -126,16 +119,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn test_control_slot_composite_indicator_size() {
-        let cpp_size = SampleAllocateePtrLola::get_control_slot_composite_indicator_size();
-        verify_size_and_align!(
-            ControlSlotCompositeIndicator,
-            cpp_size,
-            "ControlSlotCompositeIndicator"
-        );
-    }
-
     #[test]
     fn test_event_data_control_composite_size() {
         let cpp_size = SampleAllocateePtrLola::get_event_data_control_composite_size();
diff --git a/score/mw/com/impl/plumbing/rust/sample_ptr.rs b/score/mw/com/impl/plumbing/rust/sample_ptr.rs
index ef06f9ece..764549baa 100644
--- a/score/mw/com/impl/plumbing/rust/sample_ptr.rs
+++ b/score/mw/com/impl/plumbing/rust/sample_ptr.rs
@@ -13,10 +13,7 @@
 use core::fmt::Debug;
 use std::mem::ManuallyDrop;
 
-use common_rs::{
-    BlankBinding, ControlSlotType, CxxOptional, EventDataControl, SlotIndexType,
-    TransactionLogIndex,
-};
+use common_rs::{BlankBinding, CxxOptional, EventDataControl, SlotIndexType, TransactionLogIndex};
 
 #[cfg(target_os = "nto")]
 mod util_nto {
@@ -74,16 +71,10 @@ union MockVariant<T> {
     _variant: ManuallyDrop<MockBinding<T>>,
 }
 
-#[repr(C)]
-struct ControlSlotIndicator {
-    _slot_index: SlotIndexType,
-    _slot_pointer: *mut ControlSlotType,
-}
-
 #[repr(C)]
 struct SlotDecrementer {
     _event_data_control: *mut EventDataControl,
-    _control_slot_indicator: ControlSlotIndicator,
+    _event_slot_index: SlotIndexType,
     _transaction_log_idx: TransactionLogIndex,
 }
 
@@ -167,12 +158,6 @@ mod tests {
         verify_size_and_align!(SamplePtr<UserType>, cpp_size, "SamplePtr<UserType>");
     }
 
-    #[test]
-    fn test_control_slot_indicator_size() {
-        let cpp_size = SamplePtrLola::get_control_slot_indicator_size();
-        verify_size_and_align!(ControlSlotIndicator, cpp_size, "ControlSlotIndicator");
-    }
-
     #[test]
     fn test_sample_ptr_lolabinding_size() {
         let cpp_size = SamplePtrLola::get_sample_ptr_size();
diff --git a/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_ffi.rs b/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_ffi.rs
index d4f6cfdff..9df5a8aba 100644
--- a/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_ffi.rs
+++ b/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_ffi.rs
@@ -22,7 +22,6 @@ unsafe extern "C" {
     safe fn ffi_get_sample_ptr_variant_u8_size() -> SizeInfo;
     safe fn ffi_get_sample_ptr_variant_u64_size() -> SizeInfo;
     safe fn ffi_get_sample_ptr_variant_user_defined_type_size() -> SizeInfo;
-    safe fn ffi_get_control_slot_indicator_size() -> SizeInfo;
     safe fn ffi_get_slot_decrementer_size() -> SizeInfo;
     safe fn ffi_get_sample_ptr_size() -> SizeInfo;
     safe fn ffi_get_mock_binding_sample_ptr_size() -> SizeInfo;
@@ -34,7 +33,6 @@ unsafe extern "C" {
     safe fn ffi_get_sample_allocatee_variant_ptr_u8_size() -> SizeInfo;
     safe fn ffi_get_sample_allocatee_variant_ptr_u64_size() -> SizeInfo;
     safe fn ffi_get_sample_allocatee_variant_ptr_user_defined_type_size() -> SizeInfo;
-    safe fn ffi_get_control_slot_composite_indicator_size() -> SizeInfo;
     safe fn ffi_get_event_data_control_composite_size() -> SizeInfo;
     safe fn ffi_get_std_unique_ptr_size() -> SizeInfo;
     safe fn ffi_get_sample_allocatee_ptr_size() -> SizeInfo;
@@ -60,10 +58,6 @@ impl SampleAllocateePtrLola {
         ffi_get_sample_allocatee_variant_ptr_user_defined_type_size()
     }
 
-    pub fn get_control_slot_composite_indicator_size() -> SizeInfo {
-        ffi_get_control_slot_composite_indicator_size()
-    }
-
     pub fn get_event_data_control_composite_size() -> SizeInfo {
         ffi_get_event_data_control_composite_size()
     }
@@ -97,10 +91,6 @@ impl SamplePtrLola {
         ffi_get_sample_ptr_variant_user_defined_type_size()
     }
 
-    pub fn get_control_slot_indicator_size() -> SizeInfo {
-        ffi_get_control_slot_indicator_size()
-    }
-
     pub fn get_slot_decrementer_size() -> SizeInfo {
         ffi_get_slot_decrementer_size()
     }
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 d5e3a4e48..e3375223d 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
@@ -67,23 +67,11 @@ SizeInfo TestSizeProvider::GetSamplePtrVariantUserDefinedTypeSize() noexcept
     return {sizeof(score::mw::com::impl::SamplePtr<UserType>), alignof(score::mw::com::impl::SamplePtr<UserType>)};
 }
 
-SizeInfo TestSizeProvider::GetControlSlotIndicatorSize() noexcept
-{
-    return {sizeof(score::mw::com::impl::lola::ControlSlotIndicator),
-            alignof(score::mw::com::impl::lola::ControlSlotIndicator)};
-}
-
 SizeInfo TestSizeProvider::GetSlotDecrementerSize() noexcept
 {
     return {sizeof(score::mw::com::impl::lola::SlotDecrementer), alignof(score::mw::com::impl::lola::SlotDecrementer)};
 }
 
-SizeInfo TestSizeProvider::GetControlSlotCompositeIndicatorSize() noexcept
-{
-    return {sizeof(score::mw::com::impl::lola::ControlSlotCompositeIndicator),
-            alignof(score::mw::com::impl::lola::ControlSlotCompositeIndicator)};
-}
-
 SizeInfo TestSizeProvider::GetEventDataControlCompositeSize() noexcept
 {
     return {sizeof(score::mw::com::impl::lola::EventDataControlComposite<>),
@@ -158,21 +146,11 @@ score::mw::com::impl::SizeInfo ffi_get_sample_ptr_variant_user_defined_type_size
     return score::mw::com::impl::TestSizeProvider::GetSamplePtrVariantUserDefinedTypeSize();
 }
 
-score::mw::com::impl::SizeInfo ffi_get_control_slot_indicator_size() noexcept
-{
-    return score::mw::com::impl::TestSizeProvider::GetControlSlotIndicatorSize();
-}
-
 score::mw::com::impl::SizeInfo ffi_get_slot_decrementer_size() noexcept
 {
     return score::mw::com::impl::TestSizeProvider::GetSlotDecrementerSize();
 }
 
-score::mw::com::impl::SizeInfo ffi_get_control_slot_composite_indicator_size() noexcept
-{
-    return score::mw::com::impl::TestSizeProvider::GetControlSlotCompositeIndicatorSize();
-}
-
 score::mw::com::impl::SizeInfo ffi_get_event_data_control_composite_size() noexcept
 {
     return score::mw::com::impl::TestSizeProvider::GetEventDataControlCompositeSize();
diff --git a/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.h b/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.h
index f31c476c9..9573a9337 100644
--- a/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.h
+++ b/score/mw/com/impl/plumbing/rust/test_support/test_helper_size_provider.h
@@ -61,15 +61,9 @@ class TestSizeProvider
     /// Get size info for SamplePtr<UserType> variant
     static SizeInfo GetSamplePtrVariantUserDefinedTypeSize() noexcept;
 
-    /// Get size info for ControlSlotIndicator struct
-    static SizeInfo GetControlSlotIndicatorSize() noexcept;
-
     /// Get size info for SlotDecrementer struct
     static SizeInfo GetSlotDecrementerSize() noexcept;
 
-    /// Get size info for ControlSlotCompositeIndicator struct
-    static SizeInfo GetControlSlotCompositeIndicatorSize() noexcept;
-
     /// Get size info for EventDataControlComposite struct
     static SizeInfo GetEventDataControlCompositeSize() 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 a036a6c98..00b05aaad 100644
--- a/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
+++ b/score/mw/com/impl/plumbing/sample_allocatee_ptr_test.cpp
@@ -56,7 +56,7 @@ class SampleAllocateePtrFixture : public ::testing::Test
     lola::SkeletonEventDataControlLocalView<> skeleton_event_data_ctrl_qm_local_{event_data_ctrl_qm_};
     lola::EventDataControlComposite<> event_data_ctrl_{skeleton_event_data_ctrl_qm_local_, nullptr};
     lola::SlotIndexType event_data_slot_index_{std::numeric_limits<lola::SlotIndexType>::max()};
-    lola::SampleAllocateePtr<std::uint8_t> lola_allocatee_ptr_{&value_, event_data_ctrl_, {}};
+    lola::SampleAllocateePtr<std::uint8_t> lola_allocatee_ptr_{&value_, event_data_ctrl_, event_data_slot_index_};
     SampleAllocateePtr<std::uint8_t> valid_unit_{MakeSampleAllocateePtr(std::move(lola_allocatee_ptr_))};
 
     SampleAllocateePtr<std::uint8_t> unit_with_unique_ptr_{MakeSampleAllocateePtr(
@@ -101,7 +101,7 @@ TEST_F(SampleAllocateePtrFixture, CanSwap)
     RecordProperty("DerivationTechnique", "Analysis of requirements");
     // Given a valid_unit and a second SampleAllocateePtr
     std::uint8_t value{0x43};
-    lola::SampleAllocateePtr<std::uint8_t> foo{&value, event_data_ctrl_, {}};
+    lola::SampleAllocateePtr<std::uint8_t> foo{&value, event_data_ctrl_, event_data_slot_index_};
     auto unit = MakeSampleAllocateePtr(std::move(foo));
 
     // When swapping both classes
@@ -254,7 +254,7 @@ TEST_F(SampleAllocateePtrFixture, ValidLolaSampleAllocateePtrConvertsToTrue)
     } value;
 
     // Given a valid lola::SampleAllocateePtr
-    lola::SampleAllocateePtr<Foo> valid_lola_ptr{&value, event_data_ctrl_, {}};
+    lola::SampleAllocateePtr<Foo> valid_lola_ptr{&value, event_data_ctrl_, event_data_slot_index_};
 
     // When creating an impl::SampleAllocateePtr from the lola::SampleAllocateePtr
     const auto ptr = MakeSampleAllocateePtr(std::move(valid_lola_ptr));
@@ -308,7 +308,7 @@ TEST_F(SampleAllocateePtrFixture, CanDereferenceUsingArrow)
 
     value.bar = 0x42;
 
-    lola::SampleAllocateePtr<Foo> foo{&value, event_data_ctrl_, {}};
+    lola::SampleAllocateePtr<Foo> foo{&value, event_data_ctrl_, event_data_slot_index_};
     const auto unit = MakeSampleAllocateePtr(std::move(foo));
 
     EXPECT_EQ(value.bar, unit->bar);
@@ -321,7 +321,7 @@ TEST_F(SampleAllocateePtrFixture, CanAccessUnderlyingSlot)
     {
         std::uint8_t bar{};
     } value;
-    lola::SampleAllocateePtr<Foo> foo{&value, event_data_ctrl_, {}};
+    lola::SampleAllocateePtr<Foo> foo{&value, event_data_ctrl_, event_data_slot_index_};
     const auto ptr = MakeSampleAllocateePtr(std::move(foo));
     const auto unit = SampleAllocateePtrView<Foo>{ptr};
 
@@ -529,7 +529,7 @@ TEST_F(SampleAllocateePtrFixture, UnderlyingLolaPtrIsFreedOnDestruction)
     bool is_destructed{false};
     ObjectDestructionNotifier object_destruction_notifier(is_destructed);
     lola::SampleAllocateePtr<ObjectDestructionNotifier> lola_allocatee_ptr{
-        &object_destruction_notifier, event_data_ctrl, {}};
+        &object_destruction_notifier, event_data_ctrl, event_data_slot_index_};
     {
         SampleAllocateePtr<ObjectDestructionNotifier> unit_with_lola_sample_allocatee_ptr{
             MakeSampleAllocateePtr(std::move(lola_allocatee_ptr))};
diff --git a/score/mw/com/impl/tracing/skeleton_event_tracing.h b/score/mw/com/impl/tracing/skeleton_event_tracing.h
index a20c9af7d..1318aac7a 100644
--- a/score/mw/com/impl/tracing/skeleton_event_tracing.h
+++ b/score/mw/com/impl/tracing/skeleton_event_tracing.h
@@ -68,8 +68,7 @@ TracingData ExtractBindingTracingData(const impl::SampleAllocateePtr<SampleType>
                 lola::SampleAllocateePtrView{lola_ptr}.GetEventDataControlComposite();
             SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(event_data_control_composite.has_value());
             const auto referenced_slot = lola_ptr.GetReferencedSlot();
-            const auto sample_timestamp =
-                event_data_control_composite->GetEventSlotTimestamp(referenced_slot.GetIndex());
+            const auto sample_timestamp = event_data_control_composite->GetEventSlotTimestamp(referenced_slot);
             static_assert(
                 sizeof(lola::EventSlotStatus::EventTimeStamp) ==
                     sizeof(impl::tracing::ITracingRuntime::TracePointDataId),
@@ -116,16 +115,15 @@ TypeErasedSamplePtr CreateTypeErasedSamplePtr(impl::SampleAllocateePtr<SampleTyp
             auto& proxy_event_data_control_local =
                 event_data_control_composite_result->GetProxyEventDataControlLocalView();
 
-            auto slot_indicator = lola_ptr.GetReferencedSlot();
-            proxy_event_data_control_local.ReferenceSpecificEvent(slot_indicator.GetIndex(),
+            const auto event_slot_index = lola_ptr.GetReferencedSlot();
+            proxy_event_data_control_local.ReferenceSpecificEvent(event_slot_index,
                                                                   lola::TransactionLogSet::kSkeletonIndexSentinel);
             const auto* const managed_object = lola::SampleAllocateePtrView{lola_ptr}.GetManagedObject();
 
-            lola::SamplePtr<SampleType> sample_ptr{
-                managed_object,
-                proxy_event_data_control_local,
-                lola::ControlSlotIndicator(slot_indicator.GetIndex(), slot_indicator.GetSlotQM()),
-                lola::TransactionLogSet::kSkeletonIndexSentinel};
+            lola::SamplePtr<SampleType> sample_ptr{managed_object,
+                                                   proxy_event_data_control_local,
+                                                   event_slot_index,
+                                                   lola::TransactionLogSet::kSkeletonIndexSentinel};
             return impl::tracing::TypeErasedSamplePtr{std::move(sample_ptr)};
         },
         [](mock_binding::SampleAllocateePtr<SampleType>& ptr) -> TypeErasedSamplePtr {