diff --git a/include/SimCore/Messages/Protos/Control.pb.cc b/include/SimCore/Messages/Protos/Control.pb.cc
index 6b8153c..e552edc 100644
--- a/include/SimCore/Messages/Protos/Control.pb.cc
+++ b/include/SimCore/Messages/Protos/Control.pb.cc
@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: Control.proto
+// Protobuf C++ Version: 4.26.0-dev
 
 #include "Control.pb.h"
 
@@ -127,9 +128,6 @@ const ::_pbi::DescriptorTable descriptor_table_Control_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_Control_2eproto_getter() {
   return &descriptor_table_Control_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_Control_2eproto(&descriptor_table_Control_2eproto);
 namespace messages {
 namespace control {
 // ===================================================================
@@ -139,18 +137,8 @@ class control::_Internal {
   using HasBits = decltype(std::declval<control>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(control, _impl_._has_bits_);
-  static const ::messages::track::Identifier& identifier(const control* msg);
-  static void set_has_identifier(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_timestamp(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
 };
 
-const ::messages::track::Identifier& control::_Internal::identifier(const control* msg) {
-  return *msg->_impl_.identifier_;
-}
 void control::clear_identifier() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.identifier_ != nullptr) _impl_.identifier_->Clear();
@@ -178,9 +166,9 @@ control::control(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.identifier_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::messages::track::Identifier>(arena, *from._impl_.identifier_)
-                : nullptr;
+  _impl_.identifier_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(
+                              arena, *from._impl_.identifier_)
+                        : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, timestamp_),
            reinterpret_cast<const char *>(&from._impl_) +
@@ -220,12 +208,15 @@ inline void control::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 control::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          control::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(control, _impl_._cached_size_),
+              false,
+          },
+          &control::MergeImpl,
+          &control::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -269,6 +260,9 @@ const ::_pbi::TcParseTable<2, 4, 1, 37, 2> control::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_control_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::control::control>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // optional uint64 timestamp = 4;
     {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(control, _impl_.timestamp_), 1>(),
@@ -317,8 +311,7 @@ const ::_pbi::TcParseTable<2, 4, 1, 37, 2> control::_table_ = {
   // .messages.track.Identifier Identifier = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::identifier(this),
-        _Internal::identifier(this).GetCachedSize(), target, stream);
+        1, *_impl_.identifier_, _impl_.identifier_->GetCachedSize(), target, stream);
   }
 
   // uint32 type = 2;
@@ -391,9 +384,10 @@ const ::_pbi::TcParseTable<2, 4, 1, 37, 2> control::_table_ = {
 }
 
 
-void control::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void control::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<control*>(&to_msg);
   auto& from = static_cast<const control&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.control.control)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -405,17 +399,22 @@ void control::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pro
   cached_has_bits = from._impl_._has_bits_[0];
   if (cached_has_bits & 0x00000003u) {
     if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_identifier()->::messages::track::Identifier::MergeFrom(
-          from._internal_identifier());
+      ABSL_DCHECK(from._impl_.identifier_ != nullptr);
+      if (_this->_impl_.identifier_ == nullptr) {
+        _this->_impl_.identifier_ =
+            ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(arena, *from._impl_.identifier_);
+      } else {
+        _this->_impl_.identifier_->MergeFrom(*from._impl_.identifier_);
+      }
     }
     if (cached_has_bits & 0x00000002u) {
       _this->_impl_.timestamp_ = from._impl_.timestamp_;
     }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
   }
   if (from._internal_type() != 0) {
-    _this->_internal_set_type(from._internal_type());
+    _this->_impl_.type_ = from._impl_.type_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -446,9 +445,9 @@ void control::InternalSwap(control* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata control::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_Control_2eproto_getter, &descriptor_table_Control_2eproto_once,
-      file_level_metadata_Control_2eproto[0]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_Control_2eproto_getter,
+                                   &descriptor_table_Control_2eproto_once,
+                                   file_level_metadata_Control_2eproto[0]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace control
@@ -458,4 +457,8 @@ namespace protobuf {
 }  // namespace protobuf
 }  // namespace google
 // @@protoc_insertion_point(global_scope)
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::std::false_type _static_init_ PROTOBUF_UNUSED =
+    (::_pbi::AddDescriptors(&descriptor_table_Control_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"
diff --git a/include/SimCore/Messages/Protos/Control.pb.h b/include/SimCore/Messages/Protos/Control.pb.h
index e0edf23..52b136e 100644
--- a/include/SimCore/Messages/Protos/Control.pb.h
+++ b/include/SimCore/Messages/Protos/Control.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: Control.proto
-// Protobuf C++ Version: 4.24.0-main
+// Protobuf C++ Version: 4.26.0-dev
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_Control_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_Control_2eproto_2epb_2eh
@@ -11,17 +11,11 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#if PROTOBUF_VERSION != 4026000
+#error "Protobuf C++ gencode is built with an incompatible version of"
+#error "Protobuf C++ headers/runtime. See"
+#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp"
+#endif
 #include "google/protobuf/port_undef.inc"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/arena.h"
@@ -76,21 +70,18 @@ namespace control {
 
 // -------------------------------------------------------------------
 
-class control final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.control.control) */ {
+class control final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.control.control) */ {
  public:
   inline control() : control(nullptr) {}
   ~control() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR control(::google::protobuf::internal::ConstantInitialized);
-
-  inline control(const control& from)
-      : control(nullptr, from) {}
-  control(control&& from) noexcept
-    : control() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR control(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline control(const control& from) : control(nullptr, from) {}
+  inline control(control&& from) noexcept
+      : control(nullptr, std::move(from)) {}
   inline control& operator=(const control& from) {
     CopyFrom(from);
     return *this;
@@ -98,9 +89,9 @@ class control final :
   inline control& operator=(control&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -132,22 +123,17 @@ class control final :
   }
   static inline const control* internal_default_instance() {
     return reinterpret_cast<const control*>(
-               &_control_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(control& a, control& b) {
-    a.Swap(&b);
+        &_control_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 0;
+  friend void swap(control& a, control& b) { a.Swap(&b); }
   inline void Swap(control* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -162,16 +148,18 @@ class control final :
   // implements Message ----------------------------------------------
 
   control* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<control>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<control>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const control& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const control& from) {
-    control::MergeImpl(*this, from);
-  }
+  void MergeFrom(const control& from) { control::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -179,31 +167,33 @@ class control final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(control* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.control.control";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.control.control"; }
+
+ protected:
   explicit control(::google::protobuf::Arena* arena);
   control(::google::protobuf::Arena* arena, const control& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  control(::google::protobuf::Arena* arena, control&& from) noexcept
+      : control(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kDataFieldNumber = 3,
     kIdentifierFieldNumber = 1,
@@ -265,7 +255,6 @@ class control final :
   // @@protoc_insertion_point(class_scope:messages.control.control)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       2, 4, 1,
@@ -278,13 +267,12 @@ class control final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::internal::ArenaStringPtr data_;
@@ -371,14 +359,14 @@ inline ::messages::track::Identifier* control::unsafe_arena_release_identifier()
 }
 inline ::messages::track::Identifier* control::_internal_mutable_identifier() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.identifier_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::Identifier>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::Identifier>(GetArena());
     _impl_.identifier_ = reinterpret_cast<::messages::track::Identifier*>(p);
   }
   return _impl_.identifier_;
 }
 inline ::messages::track::Identifier* control::mutable_identifier() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000001u;
   ::messages::track::Identifier* _msg = _internal_mutable_identifier();
   // @@protoc_insertion_point(field_mutable:messages.control.control.Identifier)
   return _msg;
@@ -423,7 +411,6 @@ inline ::uint32_t control::_internal_type() const {
 }
 inline void control::_internal_set_type(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.type_ = value;
 }
 
@@ -441,7 +428,6 @@ template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void control::set_data(Arg_&& arg,
                                                      Args_... args) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.data_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.control.control.data)
 }
@@ -456,12 +442,10 @@ inline const std::string& control::_internal_data() const {
 }
 inline void control::_internal_set_data(const std::string& value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.data_.Set(value, GetArena());
 }
 inline std::string* control::_internal_mutable_data() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   return _impl_.data_.Mutable( GetArena());
 }
 inline std::string* control::release_data() {
@@ -496,6 +480,7 @@ inline ::uint64_t control::timestamp() const {
 }
 inline void control::set_timestamp(::uint64_t value) {
   _internal_set_timestamp(value);
+  _impl_._has_bits_[0] |= 0x00000002u;
   // @@protoc_insertion_point(field_set:messages.control.control.timestamp)
 }
 inline ::uint64_t control::_internal_timestamp() const {
@@ -504,7 +489,6 @@ inline ::uint64_t control::_internal_timestamp() const {
 }
 inline void control::_internal_set_timestamp(::uint64_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.timestamp_ = value;
 }
 
diff --git a/include/SimCore/Messages/Protos/GeocentricPosition.pb.cc b/include/SimCore/Messages/Protos/GeocentricPosition.pb.cc
index 0bd3db5..fe56e95 100644
--- a/include/SimCore/Messages/Protos/GeocentricPosition.pb.cc
+++ b/include/SimCore/Messages/Protos/GeocentricPosition.pb.cc
@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: GeocentricPosition.proto
+// Protobuf C++ Version: 4.26.0-dev
 
 #include "GeocentricPosition.pb.h"
 
@@ -113,9 +114,6 @@ const ::_pbi::DescriptorTable descriptor_table_GeocentricPosition_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_GeocentricPosition_2eproto_getter() {
   return &descriptor_table_GeocentricPosition_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_GeocentricPosition_2eproto(&descriptor_table_GeocentricPosition_2eproto);
 namespace messages {
 namespace track {
 // ===================================================================
@@ -160,12 +158,15 @@ inline void EntityGeocentricPosition::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 EntityGeocentricPosition::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          EntityGeocentricPosition::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(EntityGeocentricPosition, _impl_._cached_size_),
+              false,
+          },
+          &EntityGeocentricPosition::MergeImpl,
+          &EntityGeocentricPosition::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -203,6 +204,9 @@ const ::_pbi::TcParseTable<2, 3, 0, 0, 2> EntityGeocentricPosition::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_EntityGeocentricPosition_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::track::EntityGeocentricPosition>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // double X = 1;
@@ -326,7 +330,7 @@ const ::_pbi::TcParseTable<2, 3, 0, 0, 2> EntityGeocentricPosition::_table_ = {
 }
 
 
-void EntityGeocentricPosition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void EntityGeocentricPosition::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<EntityGeocentricPosition*>(&to_msg);
   auto& from = static_cast<const EntityGeocentricPosition&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.track.EntityGeocentricPosition)
@@ -340,7 +344,7 @@ void EntityGeocentricPosition::MergeImpl(::google::protobuf::Message& to_msg, co
   ::uint64_t raw_x;
   memcpy(&raw_x, &tmp_x, sizeof(tmp_x));
   if (raw_x != 0) {
-    _this->_internal_set_x(from._internal_x());
+    _this->_impl_.x_ = from._impl_.x_;
   }
   static_assert(sizeof(::uint64_t) == sizeof(double),
                 "Code assumes ::uint64_t and double are the same size.");
@@ -348,7 +352,7 @@ void EntityGeocentricPosition::MergeImpl(::google::protobuf::Message& to_msg, co
   ::uint64_t raw_y;
   memcpy(&raw_y, &tmp_y, sizeof(tmp_y));
   if (raw_y != 0) {
-    _this->_internal_set_y(from._internal_y());
+    _this->_impl_.y_ = from._impl_.y_;
   }
   static_assert(sizeof(::uint64_t) == sizeof(double),
                 "Code assumes ::uint64_t and double are the same size.");
@@ -356,7 +360,7 @@ void EntityGeocentricPosition::MergeImpl(::google::protobuf::Message& to_msg, co
   ::uint64_t raw_z;
   memcpy(&raw_z, &tmp_z, sizeof(tmp_z));
   if (raw_z != 0) {
-    _this->_internal_set_z(from._internal_z());
+    _this->_impl_.z_ = from._impl_.z_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -384,9 +388,9 @@ void EntityGeocentricPosition::InternalSwap(EntityGeocentricPosition* PROTOBUF_R
 }
 
 ::google::protobuf::Metadata EntityGeocentricPosition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_GeocentricPosition_2eproto_getter, &descriptor_table_GeocentricPosition_2eproto_once,
-      file_level_metadata_GeocentricPosition_2eproto[0]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_GeocentricPosition_2eproto_getter,
+                                   &descriptor_table_GeocentricPosition_2eproto_once,
+                                   file_level_metadata_GeocentricPosition_2eproto[0]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace track
@@ -396,4 +400,8 @@ namespace protobuf {
 }  // namespace protobuf
 }  // namespace google
 // @@protoc_insertion_point(global_scope)
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::std::false_type _static_init_ PROTOBUF_UNUSED =
+    (::_pbi::AddDescriptors(&descriptor_table_GeocentricPosition_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"
diff --git a/include/SimCore/Messages/Protos/GeocentricPosition.pb.h b/include/SimCore/Messages/Protos/GeocentricPosition.pb.h
index 6227968..3c5e56b 100644
--- a/include/SimCore/Messages/Protos/GeocentricPosition.pb.h
+++ b/include/SimCore/Messages/Protos/GeocentricPosition.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: GeocentricPosition.proto
-// Protobuf C++ Version: 4.24.0-main
+// Protobuf C++ Version: 4.26.0-dev
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_GeocentricPosition_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_GeocentricPosition_2eproto_2epb_2eh
@@ -11,17 +11,11 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#if PROTOBUF_VERSION != 4026000
+#error "Protobuf C++ gencode is built with an incompatible version of"
+#error "Protobuf C++ headers/runtime. See"
+#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp"
+#endif
 #include "google/protobuf/port_undef.inc"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/arena.h"
@@ -75,21 +69,18 @@ namespace track {
 
 // -------------------------------------------------------------------
 
-class EntityGeocentricPosition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.track.EntityGeocentricPosition) */ {
+class EntityGeocentricPosition final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.track.EntityGeocentricPosition) */ {
  public:
   inline EntityGeocentricPosition() : EntityGeocentricPosition(nullptr) {}
   ~EntityGeocentricPosition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR EntityGeocentricPosition(::google::protobuf::internal::ConstantInitialized);
-
-  inline EntityGeocentricPosition(const EntityGeocentricPosition& from)
-      : EntityGeocentricPosition(nullptr, from) {}
-  EntityGeocentricPosition(EntityGeocentricPosition&& from) noexcept
-    : EntityGeocentricPosition() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR EntityGeocentricPosition(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline EntityGeocentricPosition(const EntityGeocentricPosition& from) : EntityGeocentricPosition(nullptr, from) {}
+  inline EntityGeocentricPosition(EntityGeocentricPosition&& from) noexcept
+      : EntityGeocentricPosition(nullptr, std::move(from)) {}
   inline EntityGeocentricPosition& operator=(const EntityGeocentricPosition& from) {
     CopyFrom(from);
     return *this;
@@ -97,9 +88,9 @@ class EntityGeocentricPosition final :
   inline EntityGeocentricPosition& operator=(EntityGeocentricPosition&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -131,22 +122,17 @@ class EntityGeocentricPosition final :
   }
   static inline const EntityGeocentricPosition* internal_default_instance() {
     return reinterpret_cast<const EntityGeocentricPosition*>(
-               &_EntityGeocentricPosition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(EntityGeocentricPosition& a, EntityGeocentricPosition& b) {
-    a.Swap(&b);
+        &_EntityGeocentricPosition_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 0;
+  friend void swap(EntityGeocentricPosition& a, EntityGeocentricPosition& b) { a.Swap(&b); }
   inline void Swap(EntityGeocentricPosition* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -161,16 +147,18 @@ class EntityGeocentricPosition final :
   // implements Message ----------------------------------------------
 
   EntityGeocentricPosition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EntityGeocentricPosition>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<EntityGeocentricPosition>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const EntityGeocentricPosition& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const EntityGeocentricPosition& from) {
-    EntityGeocentricPosition::MergeImpl(*this, from);
-  }
+  void MergeFrom(const EntityGeocentricPosition& from) { EntityGeocentricPosition::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -178,31 +166,33 @@ class EntityGeocentricPosition final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(EntityGeocentricPosition* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.track.EntityGeocentricPosition";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.track.EntityGeocentricPosition"; }
+
+ protected:
   explicit EntityGeocentricPosition(::google::protobuf::Arena* arena);
   EntityGeocentricPosition(::google::protobuf::Arena* arena, const EntityGeocentricPosition& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  EntityGeocentricPosition(::google::protobuf::Arena* arena, EntityGeocentricPosition&& from) noexcept
+      : EntityGeocentricPosition(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kXFieldNumber = 1,
     kYFieldNumber = 2,
@@ -241,7 +231,6 @@ class EntityGeocentricPosition final :
   // @@protoc_insertion_point(class_scope:messages.track.EntityGeocentricPosition)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       2, 3, 0,
@@ -254,13 +243,12 @@ class EntityGeocentricPosition final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     double x_;
     double y_;
     double z_;
@@ -306,7 +294,6 @@ inline double EntityGeocentricPosition::_internal_x() const {
 }
 inline void EntityGeocentricPosition::_internal_set_x(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.x_ = value;
 }
 
@@ -329,7 +316,6 @@ inline double EntityGeocentricPosition::_internal_y() const {
 }
 inline void EntityGeocentricPosition::_internal_set_y(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.y_ = value;
 }
 
@@ -352,7 +338,6 @@ inline double EntityGeocentricPosition::_internal_z() const {
 }
 inline void EntityGeocentricPosition::_internal_set_z(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.z_ = value;
 }
 
diff --git a/include/SimCore/Messages/Protos/Identifier.pb.cc b/include/SimCore/Messages/Protos/Identifier.pb.cc
index 3c4f111..d26326a 100644
--- a/include/SimCore/Messages/Protos/Identifier.pb.cc
+++ b/include/SimCore/Messages/Protos/Identifier.pb.cc
@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: Identifier.proto
+// Protobuf C++ Version: 4.26.0-dev
 
 #include "Identifier.pb.h"
 
@@ -113,9 +114,6 @@ const ::_pbi::DescriptorTable descriptor_table_Identifier_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_Identifier_2eproto_getter() {
   return &descriptor_table_Identifier_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_Identifier_2eproto(&descriptor_table_Identifier_2eproto);
 namespace messages {
 namespace track {
 // ===================================================================
@@ -171,12 +169,15 @@ inline void Identifier::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Identifier::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Identifier::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Identifier, _impl_._cached_size_),
+              false,
+          },
+          &Identifier::MergeImpl,
+          &Identifier::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -213,6 +214,9 @@ const ::_pbi::TcParseTable<1, 2, 0, 38, 2> Identifier::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_Identifier_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::track::Identifier>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // string uuid = 2;
     {::_pbi::TcParser::FastUS1,
@@ -292,7 +296,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 38, 2> Identifier::_table_ = {
 }
 
 
-void Identifier::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Identifier::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<Identifier*>(&to_msg);
   auto& from = static_cast<const Identifier&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.track.Identifier)
@@ -304,7 +308,7 @@ void Identifier::MergeImpl(::google::protobuf::Message& to_msg, const ::google::
     _this->_internal_set_uuid(from._internal_uuid());
   }
   if (from._internal_external() != 0) {
-    _this->_internal_set_external(from._internal_external());
+    _this->_impl_.external_ = from._impl_.external_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -330,9 +334,9 @@ void Identifier::InternalSwap(Identifier* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata Identifier::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_Identifier_2eproto_getter, &descriptor_table_Identifier_2eproto_once,
-      file_level_metadata_Identifier_2eproto[0]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_Identifier_2eproto_getter,
+                                   &descriptor_table_Identifier_2eproto_once,
+                                   file_level_metadata_Identifier_2eproto[0]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace track
@@ -342,4 +346,8 @@ namespace protobuf {
 }  // namespace protobuf
 }  // namespace google
 // @@protoc_insertion_point(global_scope)
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::std::false_type _static_init_ PROTOBUF_UNUSED =
+    (::_pbi::AddDescriptors(&descriptor_table_Identifier_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"
diff --git a/include/SimCore/Messages/Protos/Identifier.pb.h b/include/SimCore/Messages/Protos/Identifier.pb.h
index 0702eb0..559e642 100644
--- a/include/SimCore/Messages/Protos/Identifier.pb.h
+++ b/include/SimCore/Messages/Protos/Identifier.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: Identifier.proto
-// Protobuf C++ Version: 4.24.0-main
+// Protobuf C++ Version: 4.26.0-dev
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_Identifier_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_Identifier_2eproto_2epb_2eh
@@ -11,17 +11,11 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#if PROTOBUF_VERSION != 4026000
+#error "Protobuf C++ gencode is built with an incompatible version of"
+#error "Protobuf C++ headers/runtime. See"
+#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp"
+#endif
 #include "google/protobuf/port_undef.inc"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/arena.h"
@@ -75,21 +69,18 @@ namespace track {
 
 // -------------------------------------------------------------------
 
-class Identifier final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.track.Identifier) */ {
+class Identifier final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.track.Identifier) */ {
  public:
   inline Identifier() : Identifier(nullptr) {}
   ~Identifier() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Identifier(::google::protobuf::internal::ConstantInitialized);
-
-  inline Identifier(const Identifier& from)
-      : Identifier(nullptr, from) {}
-  Identifier(Identifier&& from) noexcept
-    : Identifier() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR Identifier(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline Identifier(const Identifier& from) : Identifier(nullptr, from) {}
+  inline Identifier(Identifier&& from) noexcept
+      : Identifier(nullptr, std::move(from)) {}
   inline Identifier& operator=(const Identifier& from) {
     CopyFrom(from);
     return *this;
@@ -97,9 +88,9 @@ class Identifier final :
   inline Identifier& operator=(Identifier&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -131,22 +122,17 @@ class Identifier final :
   }
   static inline const Identifier* internal_default_instance() {
     return reinterpret_cast<const Identifier*>(
-               &_Identifier_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Identifier& a, Identifier& b) {
-    a.Swap(&b);
+        &_Identifier_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 0;
+  friend void swap(Identifier& a, Identifier& b) { a.Swap(&b); }
   inline void Swap(Identifier* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -161,16 +147,18 @@ class Identifier final :
   // implements Message ----------------------------------------------
 
   Identifier* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Identifier>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<Identifier>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Identifier& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Identifier& from) {
-    Identifier::MergeImpl(*this, from);
-  }
+  void MergeFrom(const Identifier& from) { Identifier::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -178,31 +166,33 @@ class Identifier final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(Identifier* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.track.Identifier";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.track.Identifier"; }
+
+ protected:
   explicit Identifier(::google::protobuf::Arena* arena);
   Identifier(::google::protobuf::Arena* arena, const Identifier& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  Identifier(::google::protobuf::Arena* arena, Identifier&& from) noexcept
+      : Identifier(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kUuidFieldNumber = 2,
     kExternalFieldNumber = 1,
@@ -236,7 +226,6 @@ class Identifier final :
   // @@protoc_insertion_point(class_scope:messages.track.Identifier)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       1, 2, 0,
@@ -249,13 +238,12 @@ class Identifier final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::ArenaStringPtr uuid_;
     bool external_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
@@ -300,7 +288,6 @@ inline bool Identifier::_internal_external() const {
 }
 inline void Identifier::_internal_set_external(bool value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.external_ = value;
 }
 
@@ -318,7 +305,6 @@ template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void Identifier::set_uuid(Arg_&& arg,
                                                      Args_... args) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.uuid_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.track.Identifier.uuid)
 }
@@ -333,12 +319,10 @@ inline const std::string& Identifier::_internal_uuid() const {
 }
 inline void Identifier::_internal_set_uuid(const std::string& value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.uuid_.Set(value, GetArena());
 }
 inline std::string* Identifier::_internal_mutable_uuid() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   return _impl_.uuid_.Mutable( GetArena());
 }
 inline std::string* Identifier::release_uuid() {
diff --git a/include/SimCore/Messages/Protos/SimTrack.pb.cc b/include/SimCore/Messages/Protos/SimTrack.pb.cc
index 11153fd..51a1d73 100644
--- a/include/SimCore/Messages/Protos/SimTrack.pb.cc
+++ b/include/SimCore/Messages/Protos/SimTrack.pb.cc
@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: SimTrack.proto
+// Protobuf C++ Version: 4.26.0-dev
 
 #include "SimTrack.pb.h"
 
@@ -234,9 +235,6 @@ const ::_pbi::DescriptorTable descriptor_table_SimTrack_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_SimTrack_2eproto_getter() {
   return &descriptor_table_SimTrack_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_SimTrack_2eproto(&descriptor_table_SimTrack_2eproto);
 namespace messages {
 namespace SimTrack {
 // ===================================================================
@@ -246,43 +244,8 @@ class SimTrack::_Internal {
   using HasBits = decltype(std::declval<SimTrack>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(SimTrack, _impl_._has_bits_);
-  static const ::messages::track::Identifier& entityidentifier(const SimTrack* msg);
-  static void set_has_entityidentifier(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_contactsourcetype(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static const ::messages::track::EntityGeocentricPosition& geocentricposition(const SimTrack* msg);
-  static void set_has_geocentricposition(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_contactspeed(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_contactcourse(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static void set_has_conactpitch(HasBits* has_bits) {
-    (*has_bits)[0] |= 64u;
-  }
-  static void set_has_contactkind(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_contactside(HasBits* has_bits) {
-    (*has_bits)[0] |= 256u;
-  }
-  static void set_has_contactrcs(HasBits* has_bits) {
-    (*has_bits)[0] |= 128u;
-  }
 };
 
-const ::messages::track::Identifier& SimTrack::_Internal::entityidentifier(const SimTrack* msg) {
-  return *msg->_impl_.entityidentifier_;
-}
-const ::messages::track::EntityGeocentricPosition& SimTrack::_Internal::geocentricposition(const SimTrack* msg) {
-  return *msg->_impl_.geocentricposition_;
-}
 void SimTrack::clear_entityidentifier() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.entityidentifier_ != nullptr) _impl_.entityidentifier_->Clear();
@@ -316,12 +279,12 @@ SimTrack::SimTrack(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.entityidentifier_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::messages::track::Identifier>(arena, *from._impl_.entityidentifier_)
-                : nullptr;
-  _impl_.geocentricposition_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::messages::track::EntityGeocentricPosition>(arena, *from._impl_.geocentricposition_)
-                : nullptr;
+  _impl_.entityidentifier_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(
+                              arena, *from._impl_.entityidentifier_)
+                        : nullptr;
+  _impl_.geocentricposition_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::EntityGeocentricPosition>(
+                              arena, *from._impl_.geocentricposition_)
+                        : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, contactspeed_),
            reinterpret_cast<const char *>(&from._impl_) +
@@ -363,12 +326,15 @@ inline void SimTrack::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 SimTrack::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          SimTrack::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(SimTrack, _impl_._cached_size_),
+              false,
+          },
+          &SimTrack::MergeImpl,
+          &SimTrack::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -423,6 +389,9 @@ const ::_pbi::TcParseTable<4, 11, 3, 55, 2> SimTrack::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_SimTrack_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::SimTrack::SimTrack>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // .messages.track.Identifier EntityIdentifier = 1;
@@ -520,8 +489,7 @@ const ::_pbi::TcParseTable<4, 11, 3, 55, 2> SimTrack::_table_ = {
   // .messages.track.Identifier EntityIdentifier = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::entityidentifier(this),
-        _Internal::entityidentifier(this).GetCachedSize(), target, stream);
+        1, *_impl_.entityidentifier_, _impl_.entityidentifier_->GetCachedSize(), target, stream);
   }
 
   // string ConatactName = 2;
@@ -542,8 +510,7 @@ const ::_pbi::TcParseTable<4, 11, 3, 55, 2> SimTrack::_table_ = {
   // optional .messages.track.EntityGeocentricPosition GeocentricPosition = 4;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::geocentricposition(this),
-        _Internal::geocentricposition(this).GetCachedSize(), target, stream);
+        4, *_impl_.geocentricposition_, _impl_.geocentricposition_->GetCachedSize(), target, stream);
   }
 
   // optional double ContactSpeed = 5;
@@ -682,9 +649,10 @@ const ::_pbi::TcParseTable<4, 11, 3, 55, 2> SimTrack::_table_ = {
 }
 
 
-void SimTrack::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void SimTrack::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<SimTrack*>(&to_msg);
   auto& from = static_cast<const SimTrack&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.SimTrack.SimTrack)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -698,12 +666,22 @@ void SimTrack::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
   cached_has_bits = from._impl_._has_bits_[0];
   if (cached_has_bits & 0x000000ffu) {
     if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_entityidentifier()->::messages::track::Identifier::MergeFrom(
-          from._internal_entityidentifier());
+      ABSL_DCHECK(from._impl_.entityidentifier_ != nullptr);
+      if (_this->_impl_.entityidentifier_ == nullptr) {
+        _this->_impl_.entityidentifier_ =
+            ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(arena, *from._impl_.entityidentifier_);
+      } else {
+        _this->_impl_.entityidentifier_->MergeFrom(*from._impl_.entityidentifier_);
+      }
     }
     if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_geocentricposition()->::messages::track::EntityGeocentricPosition::MergeFrom(
-          from._internal_geocentricposition());
+      ABSL_DCHECK(from._impl_.geocentricposition_ != nullptr);
+      if (_this->_impl_.geocentricposition_ == nullptr) {
+        _this->_impl_.geocentricposition_ =
+            ::google::protobuf::Message::CopyConstruct<::messages::track::EntityGeocentricPosition>(arena, *from._impl_.geocentricposition_);
+      } else {
+        _this->_impl_.geocentricposition_->MergeFrom(*from._impl_.geocentricposition_);
+      }
     }
     if (cached_has_bits & 0x00000004u) {
       _this->_impl_.contactspeed_ = from._impl_.contactspeed_;
@@ -723,11 +701,11 @@ void SimTrack::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
     if (cached_has_bits & 0x00000080u) {
       _this->_impl_.contactrcs_ = from._impl_.contactrcs_;
     }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
   }
   if (cached_has_bits & 0x00000100u) {
-    _this->_internal_set_contactside(from._internal_contactside());
+    _this->_impl_.contactside_ = from._impl_.contactside_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -759,9 +737,9 @@ void SimTrack::InternalSwap(SimTrack* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata SimTrack::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_SimTrack_2eproto_getter, &descriptor_table_SimTrack_2eproto_once,
-      file_level_metadata_SimTrack_2eproto[0]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_SimTrack_2eproto_getter,
+                                   &descriptor_table_SimTrack_2eproto_once,
+                                   file_level_metadata_SimTrack_2eproto[0]);
 }
 // ===================================================================
 
@@ -770,33 +748,8 @@ class Emission::_Internal {
   using HasBits = decltype(std::declval<Emission>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(Emission, _impl_._has_bits_);
-  static const ::messages::track::Identifier& identifier(const Emission* msg);
-  static void set_has_identifier(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_bandwidth(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_pulsewidth(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_pulserepitition(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_radiatedpower(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_numberofbeams(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static void set_has_searchinterval(HasBits* has_bits) {
-    (*has_bits)[0] |= 64u;
-  }
 };
 
-const ::messages::track::Identifier& Emission::_Internal::identifier(const Emission* msg) {
-  return *msg->_impl_.identifier_;
-}
 void Emission::clear_identifier() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.identifier_ != nullptr) _impl_.identifier_->Clear();
@@ -824,9 +777,9 @@ Emission::Emission(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.identifier_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::messages::track::Identifier>(arena, *from._impl_.identifier_)
-                : nullptr;
+  _impl_.identifier_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(
+                              arena, *from._impl_.identifier_)
+                        : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, frequency_),
            reinterpret_cast<const char *>(&from._impl_) +
@@ -866,12 +819,15 @@ inline void Emission::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Emission::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Emission::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Emission, _impl_._cached_size_),
+              false,
+          },
+          &Emission::MergeImpl,
+          &Emission::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -921,6 +877,9 @@ const ::_pbi::TcParseTable<4, 10, 1, 47, 2> Emission::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_Emission_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::SimTrack::Emission>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // .messages.track.Identifier Identifier = 1;
@@ -1011,8 +970,7 @@ const ::_pbi::TcParseTable<4, 10, 1, 47, 2> Emission::_table_ = {
   // .messages.track.Identifier Identifier = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::identifier(this),
-        _Internal::identifier(this).GetCachedSize(), target, stream);
+        1, *_impl_.identifier_, _impl_.identifier_->GetCachedSize(), target, stream);
   }
 
   // string name = 2;
@@ -1181,9 +1139,10 @@ const ::_pbi::TcParseTable<4, 10, 1, 47, 2> Emission::_table_ = {
 }
 
 
-void Emission::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Emission::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<Emission*>(&to_msg);
   auto& from = static_cast<const Emission&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.SimTrack.Emission)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -1192,9 +1151,15 @@ void Emission::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
   if (!from._internal_name().empty()) {
     _this->_internal_set_name(from._internal_name());
   }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_identifier()->::messages::track::Identifier::MergeFrom(
-        from._internal_identifier());
+  cached_has_bits = from._impl_._has_bits_[0];
+  if (cached_has_bits & 0x00000001u) {
+    ABSL_DCHECK(from._impl_.identifier_ != nullptr);
+    if (_this->_impl_.identifier_ == nullptr) {
+      _this->_impl_.identifier_ =
+          ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(arena, *from._impl_.identifier_);
+    } else {
+      _this->_impl_.identifier_->MergeFrom(*from._impl_.identifier_);
+    }
   }
   static_assert(sizeof(::uint64_t) == sizeof(double),
                 "Code assumes ::uint64_t and double are the same size.");
@@ -1202,7 +1167,7 @@ void Emission::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
   ::uint64_t raw_frequency;
   memcpy(&raw_frequency, &tmp_frequency, sizeof(tmp_frequency));
   if (raw_frequency != 0) {
-    _this->_internal_set_frequency(from._internal_frequency());
+    _this->_impl_.frequency_ = from._impl_.frequency_;
   }
   static_assert(sizeof(::uint64_t) == sizeof(double),
                 "Code assumes ::uint64_t and double are the same size.");
@@ -1210,9 +1175,8 @@ void Emission::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
   ::uint64_t raw_range;
   memcpy(&raw_range, &tmp_range, sizeof(tmp_range));
   if (raw_range != 0) {
-    _this->_internal_set_range(from._internal_range());
+    _this->_impl_.range_ = from._impl_.range_;
   }
-  cached_has_bits = from._impl_._has_bits_[0];
   if (cached_has_bits & 0x0000007eu) {
     if (cached_has_bits & 0x00000002u) {
       _this->_impl_.bandwidth_ = from._impl_.bandwidth_;
@@ -1232,8 +1196,8 @@ void Emission::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
     if (cached_has_bits & 0x00000040u) {
       _this->_impl_.searchinterval_ = from._impl_.searchinterval_;
     }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1264,9 +1228,9 @@ void Emission::InternalSwap(Emission* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata Emission::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_SimTrack_2eproto_getter, &descriptor_table_SimTrack_2eproto_once,
-      file_level_metadata_SimTrack_2eproto[1]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_SimTrack_2eproto_getter,
+                                   &descriptor_table_SimTrack_2eproto_once,
+                                   file_level_metadata_SimTrack_2eproto[1]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace SimTrack
@@ -1276,4 +1240,8 @@ namespace protobuf {
 }  // namespace protobuf
 }  // namespace google
 // @@protoc_insertion_point(global_scope)
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::std::false_type _static_init_ PROTOBUF_UNUSED =
+    (::_pbi::AddDescriptors(&descriptor_table_SimTrack_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"
diff --git a/include/SimCore/Messages/Protos/SimTrack.pb.h b/include/SimCore/Messages/Protos/SimTrack.pb.h
index 9ba94b1..ff9812f 100644
--- a/include/SimCore/Messages/Protos/SimTrack.pb.h
+++ b/include/SimCore/Messages/Protos/SimTrack.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: SimTrack.proto
-// Protobuf C++ Version: 4.24.0-main
+// Protobuf C++ Version: 4.26.0-dev
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_SimTrack_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_SimTrack_2eproto_2epb_2eh
@@ -11,17 +11,11 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#if PROTOBUF_VERSION != 4026000
+#error "Protobuf C++ gencode is built with an incompatible version of"
+#error "Protobuf C++ headers/runtime. See"
+#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp"
+#endif
 #include "google/protobuf/port_undef.inc"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/arena.h"
@@ -82,21 +76,18 @@ namespace SimTrack {
 
 // -------------------------------------------------------------------
 
-class Emission final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.SimTrack.Emission) */ {
+class Emission final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.SimTrack.Emission) */ {
  public:
   inline Emission() : Emission(nullptr) {}
   ~Emission() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Emission(::google::protobuf::internal::ConstantInitialized);
-
-  inline Emission(const Emission& from)
-      : Emission(nullptr, from) {}
-  Emission(Emission&& from) noexcept
-    : Emission() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR Emission(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline Emission(const Emission& from) : Emission(nullptr, from) {}
+  inline Emission(Emission&& from) noexcept
+      : Emission(nullptr, std::move(from)) {}
   inline Emission& operator=(const Emission& from) {
     CopyFrom(from);
     return *this;
@@ -104,9 +95,9 @@ class Emission final :
   inline Emission& operator=(Emission&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -138,22 +129,17 @@ class Emission final :
   }
   static inline const Emission* internal_default_instance() {
     return reinterpret_cast<const Emission*>(
-               &_Emission_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(Emission& a, Emission& b) {
-    a.Swap(&b);
+        &_Emission_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 1;
+  friend void swap(Emission& a, Emission& b) { a.Swap(&b); }
   inline void Swap(Emission* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -168,16 +154,18 @@ class Emission final :
   // implements Message ----------------------------------------------
 
   Emission* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Emission>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<Emission>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Emission& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Emission& from) {
-    Emission::MergeImpl(*this, from);
-  }
+  void MergeFrom(const Emission& from) { Emission::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -185,31 +173,33 @@ class Emission final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(Emission* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.SimTrack.Emission";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.SimTrack.Emission"; }
+
+ protected:
   explicit Emission(::google::protobuf::Arena* arena);
   Emission(::google::protobuf::Arena* arena, const Emission& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  Emission(::google::protobuf::Arena* arena, Emission&& from) noexcept
+      : Emission(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kNameFieldNumber = 2,
     kIdentifierFieldNumber = 1,
@@ -342,7 +332,6 @@ class Emission final :
   // @@protoc_insertion_point(class_scope:messages.SimTrack.Emission)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       4, 10, 1,
@@ -355,13 +344,12 @@ class Emission final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::internal::ArenaStringPtr name_;
@@ -378,23 +366,21 @@ class Emission final :
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_SimTrack_2eproto;
-};// -------------------------------------------------------------------
+};
+// -------------------------------------------------------------------
 
-class SimTrack final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.SimTrack.SimTrack) */ {
+class SimTrack final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.SimTrack.SimTrack) */ {
  public:
   inline SimTrack() : SimTrack(nullptr) {}
   ~SimTrack() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SimTrack(::google::protobuf::internal::ConstantInitialized);
-
-  inline SimTrack(const SimTrack& from)
-      : SimTrack(nullptr, from) {}
-  SimTrack(SimTrack&& from) noexcept
-    : SimTrack() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR SimTrack(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline SimTrack(const SimTrack& from) : SimTrack(nullptr, from) {}
+  inline SimTrack(SimTrack&& from) noexcept
+      : SimTrack(nullptr, std::move(from)) {}
   inline SimTrack& operator=(const SimTrack& from) {
     CopyFrom(from);
     return *this;
@@ -402,9 +388,9 @@ class SimTrack final :
   inline SimTrack& operator=(SimTrack&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -436,22 +422,17 @@ class SimTrack final :
   }
   static inline const SimTrack* internal_default_instance() {
     return reinterpret_cast<const SimTrack*>(
-               &_SimTrack_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(SimTrack& a, SimTrack& b) {
-    a.Swap(&b);
+        &_SimTrack_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 0;
+  friend void swap(SimTrack& a, SimTrack& b) { a.Swap(&b); }
   inline void Swap(SimTrack* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -466,16 +447,18 @@ class SimTrack final :
   // implements Message ----------------------------------------------
 
   SimTrack* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SimTrack>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<SimTrack>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const SimTrack& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SimTrack& from) {
-    SimTrack::MergeImpl(*this, from);
-  }
+  void MergeFrom(const SimTrack& from) { SimTrack::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -483,31 +466,33 @@ class SimTrack final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(SimTrack* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.SimTrack.SimTrack";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.SimTrack.SimTrack"; }
+
+ protected:
   explicit SimTrack(::google::protobuf::Arena* arena);
   SimTrack(::google::protobuf::Arena* arena, const SimTrack& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  SimTrack(::google::protobuf::Arena* arena, SimTrack&& from) noexcept
+      : SimTrack(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kContactEmissionsFieldNumber = 11,
     kConatactNameFieldNumber = 2,
@@ -529,16 +514,15 @@ class SimTrack final :
   public:
   void clear_contactemissions() ;
   ::messages::SimTrack::Emission* mutable_contactemissions(int index);
-  ::google::protobuf::RepeatedPtrField< ::messages::SimTrack::Emission >*
-      mutable_contactemissions();
+  ::google::protobuf::RepeatedPtrField<::messages::SimTrack::Emission>* mutable_contactemissions();
+
   private:
   const ::google::protobuf::RepeatedPtrField<::messages::SimTrack::Emission>& _internal_contactemissions() const;
   ::google::protobuf::RepeatedPtrField<::messages::SimTrack::Emission>* _internal_mutable_contactemissions();
   public:
   const ::messages::SimTrack::Emission& contactemissions(int index) const;
   ::messages::SimTrack::Emission* add_contactemissions();
-  const ::google::protobuf::RepeatedPtrField< ::messages::SimTrack::Emission >&
-      contactemissions() const;
+  const ::google::protobuf::RepeatedPtrField<::messages::SimTrack::Emission>& contactemissions() const;
   // string ConatactName = 2;
   void clear_conatactname() ;
   const std::string& conatactname() const;
@@ -665,7 +649,6 @@ class SimTrack final :
   // @@protoc_insertion_point(class_scope:messages.SimTrack.SimTrack)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       4, 11, 3,
@@ -678,13 +661,12 @@ class SimTrack final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::RepeatedPtrField< ::messages::SimTrack::Emission > contactemissions_;
@@ -778,14 +760,14 @@ inline ::messages::track::Identifier* SimTrack::unsafe_arena_release_entityident
 }
 inline ::messages::track::Identifier* SimTrack::_internal_mutable_entityidentifier() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.entityidentifier_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::Identifier>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::Identifier>(GetArena());
     _impl_.entityidentifier_ = reinterpret_cast<::messages::track::Identifier*>(p);
   }
   return _impl_.entityidentifier_;
 }
 inline ::messages::track::Identifier* SimTrack::mutable_entityidentifier() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000001u;
   ::messages::track::Identifier* _msg = _internal_mutable_entityidentifier();
   // @@protoc_insertion_point(field_mutable:messages.SimTrack.SimTrack.EntityIdentifier)
   return _msg;
@@ -825,7 +807,6 @@ template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void SimTrack::set_conatactname(Arg_&& arg,
                                                      Args_... args) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.conatactname_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ConatactName)
 }
@@ -840,12 +821,10 @@ inline const std::string& SimTrack::_internal_conatactname() const {
 }
 inline void SimTrack::_internal_set_conatactname(const std::string& value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.conatactname_.Set(value, GetArena());
 }
 inline std::string* SimTrack::_internal_mutable_conatactname() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   return _impl_.conatactname_.Mutable( GetArena());
 }
 inline std::string* SimTrack::release_conatactname() {
@@ -880,6 +859,7 @@ inline ::uint32_t SimTrack::contactsourcetype() const {
 }
 inline void SimTrack::set_contactsourcetype(::uint32_t value) {
   _internal_set_contactsourcetype(value);
+  _impl_._has_bits_[0] |= 0x00000008u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ContactSourceType)
 }
 inline ::uint32_t SimTrack::_internal_contactsourcetype() const {
@@ -888,7 +868,6 @@ inline ::uint32_t SimTrack::_internal_contactsourcetype() const {
 }
 inline void SimTrack::_internal_set_contactsourcetype(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.contactsourcetype_ = value;
 }
 
@@ -950,14 +929,14 @@ inline ::messages::track::EntityGeocentricPosition* SimTrack::unsafe_arena_relea
 }
 inline ::messages::track::EntityGeocentricPosition* SimTrack::_internal_mutable_geocentricposition() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.geocentricposition_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::EntityGeocentricPosition>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::EntityGeocentricPosition>(GetArena());
     _impl_.geocentricposition_ = reinterpret_cast<::messages::track::EntityGeocentricPosition*>(p);
   }
   return _impl_.geocentricposition_;
 }
 inline ::messages::track::EntityGeocentricPosition* SimTrack::mutable_geocentricposition() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000002u;
   ::messages::track::EntityGeocentricPosition* _msg = _internal_mutable_geocentricposition();
   // @@protoc_insertion_point(field_mutable:messages.SimTrack.SimTrack.GeocentricPosition)
   return _msg;
@@ -999,6 +978,7 @@ inline double SimTrack::contactspeed() const {
 }
 inline void SimTrack::set_contactspeed(double value) {
   _internal_set_contactspeed(value);
+  _impl_._has_bits_[0] |= 0x00000004u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ContactSpeed)
 }
 inline double SimTrack::_internal_contactspeed() const {
@@ -1007,7 +987,6 @@ inline double SimTrack::_internal_contactspeed() const {
 }
 inline void SimTrack::_internal_set_contactspeed(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.contactspeed_ = value;
 }
 
@@ -1027,6 +1006,7 @@ inline double SimTrack::contactcourse() const {
 }
 inline void SimTrack::set_contactcourse(double value) {
   _internal_set_contactcourse(value);
+  _impl_._has_bits_[0] |= 0x00000020u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ContactCourse)
 }
 inline double SimTrack::_internal_contactcourse() const {
@@ -1035,7 +1015,6 @@ inline double SimTrack::_internal_contactcourse() const {
 }
 inline void SimTrack::_internal_set_contactcourse(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.contactcourse_ = value;
 }
 
@@ -1055,6 +1034,7 @@ inline double SimTrack::conactpitch() const {
 }
 inline void SimTrack::set_conactpitch(double value) {
   _internal_set_conactpitch(value);
+  _impl_._has_bits_[0] |= 0x00000040u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ConactPitch)
 }
 inline double SimTrack::_internal_conactpitch() const {
@@ -1063,7 +1043,6 @@ inline double SimTrack::_internal_conactpitch() const {
 }
 inline void SimTrack::_internal_set_conactpitch(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.conactpitch_ = value;
 }
 
@@ -1083,6 +1062,7 @@ inline ::uint32_t SimTrack::contactkind() const {
 }
 inline void SimTrack::set_contactkind(::uint32_t value) {
   _internal_set_contactkind(value);
+  _impl_._has_bits_[0] |= 0x00000010u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ContactKind)
 }
 inline ::uint32_t SimTrack::_internal_contactkind() const {
@@ -1091,7 +1071,6 @@ inline ::uint32_t SimTrack::_internal_contactkind() const {
 }
 inline void SimTrack::_internal_set_contactkind(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.contactkind_ = value;
 }
 
@@ -1111,6 +1090,7 @@ inline ::uint32_t SimTrack::contactside() const {
 }
 inline void SimTrack::set_contactside(::uint32_t value) {
   _internal_set_contactside(value);
+  _impl_._has_bits_[0] |= 0x00000100u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ContactSide)
 }
 inline ::uint32_t SimTrack::_internal_contactside() const {
@@ -1119,7 +1099,6 @@ inline ::uint32_t SimTrack::_internal_contactside() const {
 }
 inline void SimTrack::_internal_set_contactside(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000100u;
   _impl_.contactside_ = value;
 }
 
@@ -1139,6 +1118,7 @@ inline double SimTrack::contactrcs() const {
 }
 inline void SimTrack::set_contactrcs(double value) {
   _internal_set_contactrcs(value);
+  _impl_._has_bits_[0] |= 0x00000080u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.SimTrack.ContactRCS)
 }
 inline double SimTrack::_internal_contactrcs() const {
@@ -1147,7 +1127,6 @@ inline double SimTrack::_internal_contactrcs() const {
 }
 inline void SimTrack::_internal_set_contactrcs(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000080u;
   _impl_.contactrcs_ = value;
 }
 
@@ -1262,14 +1241,14 @@ inline ::messages::track::Identifier* Emission::unsafe_arena_release_identifier(
 }
 inline ::messages::track::Identifier* Emission::_internal_mutable_identifier() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.identifier_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::Identifier>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::Identifier>(GetArena());
     _impl_.identifier_ = reinterpret_cast<::messages::track::Identifier*>(p);
   }
   return _impl_.identifier_;
 }
 inline ::messages::track::Identifier* Emission::mutable_identifier() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000001u;
   ::messages::track::Identifier* _msg = _internal_mutable_identifier();
   // @@protoc_insertion_point(field_mutable:messages.SimTrack.Emission.Identifier)
   return _msg;
@@ -1309,7 +1288,6 @@ template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void Emission::set_name(Arg_&& arg,
                                                      Args_... args) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.SimTrack.Emission.name)
 }
@@ -1324,12 +1302,10 @@ inline const std::string& Emission::_internal_name() const {
 }
 inline void Emission::_internal_set_name(const std::string& value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.name_.Set(value, GetArena());
 }
 inline std::string* Emission::_internal_mutable_name() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   return _impl_.name_.Mutable( GetArena());
 }
 inline std::string* Emission::release_name() {
@@ -1367,7 +1343,6 @@ inline double Emission::_internal_frequency() const {
 }
 inline void Emission::_internal_set_frequency(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.frequency_ = value;
 }
 
@@ -1390,7 +1365,6 @@ inline double Emission::_internal_range() const {
 }
 inline void Emission::_internal_set_range(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.range_ = value;
 }
 
@@ -1410,6 +1384,7 @@ inline ::uint32_t Emission::bandwidth() const {
 }
 inline void Emission::set_bandwidth(::uint32_t value) {
   _internal_set_bandwidth(value);
+  _impl_._has_bits_[0] |= 0x00000002u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.Emission.Bandwidth)
 }
 inline ::uint32_t Emission::_internal_bandwidth() const {
@@ -1418,7 +1393,6 @@ inline ::uint32_t Emission::_internal_bandwidth() const {
 }
 inline void Emission::_internal_set_bandwidth(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.bandwidth_ = value;
 }
 
@@ -1438,6 +1412,7 @@ inline ::uint32_t Emission::pulsewidth() const {
 }
 inline void Emission::set_pulsewidth(::uint32_t value) {
   _internal_set_pulsewidth(value);
+  _impl_._has_bits_[0] |= 0x00000004u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.Emission.pulseWidth)
 }
 inline ::uint32_t Emission::_internal_pulsewidth() const {
@@ -1446,7 +1421,6 @@ inline ::uint32_t Emission::_internal_pulsewidth() const {
 }
 inline void Emission::_internal_set_pulsewidth(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.pulsewidth_ = value;
 }
 
@@ -1466,6 +1440,7 @@ inline ::uint32_t Emission::pulserepitition() const {
 }
 inline void Emission::set_pulserepitition(::uint32_t value) {
   _internal_set_pulserepitition(value);
+  _impl_._has_bits_[0] |= 0x00000008u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.Emission.pulseRepitition)
 }
 inline ::uint32_t Emission::_internal_pulserepitition() const {
@@ -1474,7 +1449,6 @@ inline ::uint32_t Emission::_internal_pulserepitition() const {
 }
 inline void Emission::_internal_set_pulserepitition(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.pulserepitition_ = value;
 }
 
@@ -1494,6 +1468,7 @@ inline ::uint32_t Emission::radiatedpower() const {
 }
 inline void Emission::set_radiatedpower(::uint32_t value) {
   _internal_set_radiatedpower(value);
+  _impl_._has_bits_[0] |= 0x00000010u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.Emission.radiatedPower)
 }
 inline ::uint32_t Emission::_internal_radiatedpower() const {
@@ -1502,7 +1477,6 @@ inline ::uint32_t Emission::_internal_radiatedpower() const {
 }
 inline void Emission::_internal_set_radiatedpower(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.radiatedpower_ = value;
 }
 
@@ -1522,6 +1496,7 @@ inline ::uint32_t Emission::numberofbeams() const {
 }
 inline void Emission::set_numberofbeams(::uint32_t value) {
   _internal_set_numberofbeams(value);
+  _impl_._has_bits_[0] |= 0x00000020u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.Emission.numberOfBeams)
 }
 inline ::uint32_t Emission::_internal_numberofbeams() const {
@@ -1530,7 +1505,6 @@ inline ::uint32_t Emission::_internal_numberofbeams() const {
 }
 inline void Emission::_internal_set_numberofbeams(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.numberofbeams_ = value;
 }
 
@@ -1550,6 +1524,7 @@ inline ::uint32_t Emission::searchinterval() const {
 }
 inline void Emission::set_searchinterval(::uint32_t value) {
   _internal_set_searchinterval(value);
+  _impl_._has_bits_[0] |= 0x00000040u;
   // @@protoc_insertion_point(field_set:messages.SimTrack.Emission.searchInterval)
 }
 inline ::uint32_t Emission::_internal_searchinterval() const {
@@ -1558,7 +1533,6 @@ inline ::uint32_t Emission::_internal_searchinterval() const {
 }
 inline void Emission::_internal_set_searchinterval(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.searchinterval_ = value;
 }
 
diff --git a/include/SimCore/Messages/Protos/SystemStateUpdate.pb.cc b/include/SimCore/Messages/Protos/SystemStateUpdate.pb.cc
index 7cfebb2..cb70b34 100644
--- a/include/SimCore/Messages/Protos/SystemStateUpdate.pb.cc
+++ b/include/SimCore/Messages/Protos/SystemStateUpdate.pb.cc
@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: SystemStateUpdate.proto
+// Protobuf C++ Version: 4.26.0-dev
 
 #include "SystemStateUpdate.pb.h"
 
@@ -222,9 +223,6 @@ const ::_pbi::DescriptorTable descriptor_table_SystemStateUpdate_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_SystemStateUpdate_2eproto_getter() {
   return &descriptor_table_SystemStateUpdate_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_SystemStateUpdate_2eproto(&descriptor_table_SystemStateUpdate_2eproto);
 namespace messages {
 namespace data {
 // ===================================================================
@@ -234,15 +232,8 @@ class SystemStateUpdate::_Internal {
   using HasBits = decltype(std::declval<SystemStateUpdate>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(SystemStateUpdate, _impl_._has_bits_);
-  static const ::messages::track::Identifier& ownid(const SystemStateUpdate* msg);
-  static void set_has_ownid(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::messages::track::Identifier& SystemStateUpdate::_Internal::ownid(const SystemStateUpdate* msg) {
-  return *msg->_impl_.ownid_;
-}
 void SystemStateUpdate::clear_ownid() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.ownid_ != nullptr) _impl_.ownid_->Clear();
@@ -271,9 +262,9 @@ SystemStateUpdate::SystemStateUpdate(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.ownid_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::messages::track::Identifier>(arena, *from._impl_.ownid_)
-                : nullptr;
+  _impl_.ownid_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(
+                              arena, *from._impl_.ownid_)
+                        : nullptr;
 
   // @@protoc_insertion_point(copy_constructor:messages.data.SystemStateUpdate)
 }
@@ -301,12 +292,15 @@ inline void SystemStateUpdate::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 SystemStateUpdate::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          SystemStateUpdate::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(SystemStateUpdate, _impl_._cached_size_),
+              false,
+          },
+          &SystemStateUpdate::MergeImpl,
+          &SystemStateUpdate::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -349,6 +343,9 @@ const ::_pbi::TcParseTable<2, 3, 3, 0, 2> SystemStateUpdate::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_SystemStateUpdate_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::data::SystemStateUpdate>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // .messages.track.Identifier OwnID = 1;
@@ -391,8 +388,7 @@ const ::_pbi::TcParseTable<2, 3, 3, 0, 2> SystemStateUpdate::_table_ = {
   // .messages.track.Identifier OwnID = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::ownid(this),
-        _Internal::ownid(this).GetCachedSize(), target, stream);
+        1, *_impl_.ownid_, _impl_.ownid_->GetCachedSize(), target, stream);
   }
 
   // repeated .messages.data.Sensor sensors = 2;
@@ -451,9 +447,10 @@ const ::_pbi::TcParseTable<2, 3, 3, 0, 2> SystemStateUpdate::_table_ = {
 }
 
 
-void SystemStateUpdate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void SystemStateUpdate::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<SystemStateUpdate*>(&to_msg);
   auto& from = static_cast<const SystemStateUpdate&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.data.SystemStateUpdate)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -463,10 +460,17 @@ void SystemStateUpdate::MergeImpl(::google::protobuf::Message& to_msg, const ::g
       from._internal_sensors());
   _this->_internal_mutable_effectors()->MergeFrom(
       from._internal_effectors());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_ownid()->::messages::track::Identifier::MergeFrom(
-        from._internal_ownid());
+  cached_has_bits = from._impl_._has_bits_[0];
+  if (cached_has_bits & 0x00000001u) {
+    ABSL_DCHECK(from._impl_.ownid_ != nullptr);
+    if (_this->_impl_.ownid_ == nullptr) {
+      _this->_impl_.ownid_ =
+          ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(arena, *from._impl_.ownid_);
+    } else {
+      _this->_impl_.ownid_->MergeFrom(*from._impl_.ownid_);
+    }
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -491,9 +495,9 @@ void SystemStateUpdate::InternalSwap(SystemStateUpdate* PROTOBUF_RESTRICT other)
 }
 
 ::google::protobuf::Metadata SystemStateUpdate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_SystemStateUpdate_2eproto_getter, &descriptor_table_SystemStateUpdate_2eproto_once,
-      file_level_metadata_SystemStateUpdate_2eproto[0]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_SystemStateUpdate_2eproto_getter,
+                                   &descriptor_table_SystemStateUpdate_2eproto_once,
+                                   file_level_metadata_SystemStateUpdate_2eproto[0]);
 }
 // ===================================================================
 
@@ -502,15 +506,8 @@ class Sensor::_Internal {
   using HasBits = decltype(std::declval<Sensor>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(Sensor, _impl_._has_bits_);
-  static const ::messages::track::Identifier& id(const Sensor* msg);
-  static void set_has_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::messages::track::Identifier& Sensor::_Internal::id(const Sensor* msg) {
-  return *msg->_impl_.id_;
-}
 void Sensor::clear_id() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.id_ != nullptr) _impl_.id_->Clear();
@@ -538,9 +535,9 @@ Sensor::Sensor(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::messages::track::Identifier>(arena, *from._impl_.id_)
-                : nullptr;
+  _impl_.id_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(
+                              arena, *from._impl_.id_)
+                        : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, range_),
            reinterpret_cast<const char *>(&from._impl_) +
@@ -580,12 +577,15 @@ inline void Sensor::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Sensor::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Sensor::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Sensor, _impl_._cached_size_),
+              false,
+          },
+          &Sensor::MergeImpl,
+          &Sensor::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -630,6 +630,9 @@ const ::_pbi::TcParseTable<3, 5, 1, 33, 2> Sensor::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_Sensor_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::data::Sensor>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // .messages.track.Identifier ID = 1;
@@ -687,8 +690,7 @@ const ::_pbi::TcParseTable<3, 5, 1, 33, 2> Sensor::_table_ = {
   // .messages.track.Identifier ID = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::id(this),
-        _Internal::id(this).GetCachedSize(), target, stream);
+        1, *_impl_.id_, _impl_.id_->GetCachedSize(), target, stream);
   }
 
   // string name = 2;
@@ -781,9 +783,10 @@ const ::_pbi::TcParseTable<3, 5, 1, 33, 2> Sensor::_table_ = {
 }
 
 
-void Sensor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Sensor::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<Sensor*>(&to_msg);
   auto& from = static_cast<const Sensor&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.data.Sensor)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -792,9 +795,15 @@ void Sensor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::prot
   if (!from._internal_name().empty()) {
     _this->_internal_set_name(from._internal_name());
   }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_id()->::messages::track::Identifier::MergeFrom(
-        from._internal_id());
+  cached_has_bits = from._impl_._has_bits_[0];
+  if (cached_has_bits & 0x00000001u) {
+    ABSL_DCHECK(from._impl_.id_ != nullptr);
+    if (_this->_impl_.id_ == nullptr) {
+      _this->_impl_.id_ =
+          ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(arena, *from._impl_.id_);
+    } else {
+      _this->_impl_.id_->MergeFrom(*from._impl_.id_);
+    }
   }
   static_assert(sizeof(::uint64_t) == sizeof(double),
                 "Code assumes ::uint64_t and double are the same size.");
@@ -802,14 +811,15 @@ void Sensor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::prot
   ::uint64_t raw_range;
   memcpy(&raw_range, &tmp_range, sizeof(tmp_range));
   if (raw_range != 0) {
-    _this->_internal_set_range(from._internal_range());
+    _this->_impl_.range_ = from._impl_.range_;
   }
   if (from._internal_kind() != 0) {
-    _this->_internal_set_kind(from._internal_kind());
+    _this->_impl_.kind_ = from._impl_.kind_;
   }
   if (from._internal_status() != 0) {
-    _this->_internal_set_status(from._internal_status());
+    _this->_impl_.status_ = from._impl_.status_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -840,9 +850,9 @@ void Sensor::InternalSwap(Sensor* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata Sensor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_SystemStateUpdate_2eproto_getter, &descriptor_table_SystemStateUpdate_2eproto_once,
-      file_level_metadata_SystemStateUpdate_2eproto[1]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_SystemStateUpdate_2eproto_getter,
+                                   &descriptor_table_SystemStateUpdate_2eproto_once,
+                                   file_level_metadata_SystemStateUpdate_2eproto[1]);
 }
 // ===================================================================
 
@@ -851,15 +861,8 @@ class Effector::_Internal {
   using HasBits = decltype(std::declval<Effector>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(Effector, _impl_._has_bits_);
-  static const ::messages::track::Identifier& id(const Effector* msg);
-  static void set_has_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::messages::track::Identifier& Effector::_Internal::id(const Effector* msg) {
-  return *msg->_impl_.id_;
-}
 void Effector::clear_id() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.id_ != nullptr) _impl_.id_->Clear();
@@ -887,9 +890,9 @@ Effector::Effector(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::messages::track::Identifier>(arena, *from._impl_.id_)
-                : nullptr;
+  _impl_.id_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(
+                              arena, *from._impl_.id_)
+                        : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, range_),
            reinterpret_cast<const char *>(&from._impl_) +
@@ -929,12 +932,15 @@ inline void Effector::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 Effector::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          Effector::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(Effector, _impl_._cached_size_),
+              false,
+          },
+          &Effector::MergeImpl,
+          &Effector::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -979,6 +985,9 @@ const ::_pbi::TcParseTable<3, 6, 1, 35, 2> Effector::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_Effector_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::data::Effector>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // .messages.track.Identifier ID = 1;
@@ -1041,8 +1050,7 @@ const ::_pbi::TcParseTable<3, 6, 1, 35, 2> Effector::_table_ = {
   // .messages.track.Identifier ID = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::id(this),
-        _Internal::id(this).GetCachedSize(), target, stream);
+        1, *_impl_.id_, _impl_.id_->GetCachedSize(), target, stream);
   }
 
   // string name = 2;
@@ -1148,9 +1156,10 @@ const ::_pbi::TcParseTable<3, 6, 1, 35, 2> Effector::_table_ = {
 }
 
 
-void Effector::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Effector::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<Effector*>(&to_msg);
   auto& from = static_cast<const Effector&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.data.Effector)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -1159,9 +1168,15 @@ void Effector::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
   if (!from._internal_name().empty()) {
     _this->_internal_set_name(from._internal_name());
   }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_id()->::messages::track::Identifier::MergeFrom(
-        from._internal_id());
+  cached_has_bits = from._impl_._has_bits_[0];
+  if (cached_has_bits & 0x00000001u) {
+    ABSL_DCHECK(from._impl_.id_ != nullptr);
+    if (_this->_impl_.id_ == nullptr) {
+      _this->_impl_.id_ =
+          ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(arena, *from._impl_.id_);
+    } else {
+      _this->_impl_.id_->MergeFrom(*from._impl_.id_);
+    }
   }
   static_assert(sizeof(::uint64_t) == sizeof(double),
                 "Code assumes ::uint64_t and double are the same size.");
@@ -1169,17 +1184,18 @@ void Effector::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
   ::uint64_t raw_range;
   memcpy(&raw_range, &tmp_range, sizeof(tmp_range));
   if (raw_range != 0) {
-    _this->_internal_set_range(from._internal_range());
+    _this->_impl_.range_ = from._impl_.range_;
   }
   if (from._internal_ammunition() != 0) {
-    _this->_internal_set_ammunition(from._internal_ammunition());
+    _this->_impl_.ammunition_ = from._impl_.ammunition_;
   }
   if (from._internal_maxammunition() != 0) {
-    _this->_internal_set_maxammunition(from._internal_maxammunition());
+    _this->_impl_.maxammunition_ = from._impl_.maxammunition_;
   }
   if (from._internal_status() != 0) {
-    _this->_internal_set_status(from._internal_status());
+    _this->_impl_.status_ = from._impl_.status_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1210,9 +1226,9 @@ void Effector::InternalSwap(Effector* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata Effector::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_SystemStateUpdate_2eproto_getter, &descriptor_table_SystemStateUpdate_2eproto_once,
-      file_level_metadata_SystemStateUpdate_2eproto[2]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_SystemStateUpdate_2eproto_getter,
+                                   &descriptor_table_SystemStateUpdate_2eproto_once,
+                                   file_level_metadata_SystemStateUpdate_2eproto[2]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace data
@@ -1222,4 +1238,8 @@ namespace protobuf {
 }  // namespace protobuf
 }  // namespace google
 // @@protoc_insertion_point(global_scope)
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::std::false_type _static_init_ PROTOBUF_UNUSED =
+    (::_pbi::AddDescriptors(&descriptor_table_SystemStateUpdate_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"
diff --git a/include/SimCore/Messages/Protos/SystemStateUpdate.pb.h b/include/SimCore/Messages/Protos/SystemStateUpdate.pb.h
index d4de216..7497a60 100644
--- a/include/SimCore/Messages/Protos/SystemStateUpdate.pb.h
+++ b/include/SimCore/Messages/Protos/SystemStateUpdate.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: SystemStateUpdate.proto
-// Protobuf C++ Version: 4.24.0-main
+// Protobuf C++ Version: 4.26.0-dev
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_SystemStateUpdate_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_SystemStateUpdate_2eproto_2epb_2eh
@@ -11,17 +11,11 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#if PROTOBUF_VERSION != 4026000
+#error "Protobuf C++ gencode is built with an incompatible version of"
+#error "Protobuf C++ headers/runtime. See"
+#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp"
+#endif
 #include "google/protobuf/port_undef.inc"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/arena.h"
@@ -82,21 +76,18 @@ namespace data {
 
 // -------------------------------------------------------------------
 
-class Sensor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.data.Sensor) */ {
+class Sensor final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.data.Sensor) */ {
  public:
   inline Sensor() : Sensor(nullptr) {}
   ~Sensor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Sensor(::google::protobuf::internal::ConstantInitialized);
-
-  inline Sensor(const Sensor& from)
-      : Sensor(nullptr, from) {}
-  Sensor(Sensor&& from) noexcept
-    : Sensor() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR Sensor(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline Sensor(const Sensor& from) : Sensor(nullptr, from) {}
+  inline Sensor(Sensor&& from) noexcept
+      : Sensor(nullptr, std::move(from)) {}
   inline Sensor& operator=(const Sensor& from) {
     CopyFrom(from);
     return *this;
@@ -104,9 +95,9 @@ class Sensor final :
   inline Sensor& operator=(Sensor&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -138,22 +129,17 @@ class Sensor final :
   }
   static inline const Sensor* internal_default_instance() {
     return reinterpret_cast<const Sensor*>(
-               &_Sensor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(Sensor& a, Sensor& b) {
-    a.Swap(&b);
+        &_Sensor_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 1;
+  friend void swap(Sensor& a, Sensor& b) { a.Swap(&b); }
   inline void Swap(Sensor* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -168,16 +154,18 @@ class Sensor final :
   // implements Message ----------------------------------------------
 
   Sensor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Sensor>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<Sensor>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Sensor& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Sensor& from) {
-    Sensor::MergeImpl(*this, from);
-  }
+  void MergeFrom(const Sensor& from) { Sensor::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -185,31 +173,33 @@ class Sensor final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(Sensor* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.data.Sensor";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.data.Sensor"; }
+
+ protected:
   explicit Sensor(::google::protobuf::Arena* arena);
   Sensor(::google::protobuf::Arena* arena, const Sensor& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  Sensor(::google::protobuf::Arena* arena, Sensor&& from) noexcept
+      : Sensor(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kNameFieldNumber = 2,
     kIDFieldNumber = 1,
@@ -281,7 +271,6 @@ class Sensor final :
   // @@protoc_insertion_point(class_scope:messages.data.Sensor)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       3, 5, 1,
@@ -294,13 +283,12 @@ class Sensor final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::internal::ArenaStringPtr name_;
@@ -312,23 +300,21 @@ class Sensor final :
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_SystemStateUpdate_2eproto;
-};// -------------------------------------------------------------------
+};
+// -------------------------------------------------------------------
 
-class Effector final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.data.Effector) */ {
+class Effector final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.data.Effector) */ {
  public:
   inline Effector() : Effector(nullptr) {}
   ~Effector() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Effector(::google::protobuf::internal::ConstantInitialized);
-
-  inline Effector(const Effector& from)
-      : Effector(nullptr, from) {}
-  Effector(Effector&& from) noexcept
-    : Effector() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR Effector(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline Effector(const Effector& from) : Effector(nullptr, from) {}
+  inline Effector(Effector&& from) noexcept
+      : Effector(nullptr, std::move(from)) {}
   inline Effector& operator=(const Effector& from) {
     CopyFrom(from);
     return *this;
@@ -336,9 +322,9 @@ class Effector final :
   inline Effector& operator=(Effector&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -370,22 +356,17 @@ class Effector final :
   }
   static inline const Effector* internal_default_instance() {
     return reinterpret_cast<const Effector*>(
-               &_Effector_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(Effector& a, Effector& b) {
-    a.Swap(&b);
+        &_Effector_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 2;
+  friend void swap(Effector& a, Effector& b) { a.Swap(&b); }
   inline void Swap(Effector* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -400,16 +381,18 @@ class Effector final :
   // implements Message ----------------------------------------------
 
   Effector* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Effector>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<Effector>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Effector& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Effector& from) {
-    Effector::MergeImpl(*this, from);
-  }
+  void MergeFrom(const Effector& from) { Effector::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -417,31 +400,33 @@ class Effector final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(Effector* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.data.Effector";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.data.Effector"; }
+
+ protected:
   explicit Effector(::google::protobuf::Arena* arena);
   Effector(::google::protobuf::Arena* arena, const Effector& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  Effector(::google::protobuf::Arena* arena, Effector&& from) noexcept
+      : Effector(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kNameFieldNumber = 2,
     kIDFieldNumber = 1,
@@ -524,7 +509,6 @@ class Effector final :
   // @@protoc_insertion_point(class_scope:messages.data.Effector)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       3, 6, 1,
@@ -537,13 +521,12 @@ class Effector final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::internal::ArenaStringPtr name_;
@@ -556,23 +539,21 @@ class Effector final :
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_SystemStateUpdate_2eproto;
-};// -------------------------------------------------------------------
+};
+// -------------------------------------------------------------------
 
-class SystemStateUpdate final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.data.SystemStateUpdate) */ {
+class SystemStateUpdate final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.data.SystemStateUpdate) */ {
  public:
   inline SystemStateUpdate() : SystemStateUpdate(nullptr) {}
   ~SystemStateUpdate() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SystemStateUpdate(::google::protobuf::internal::ConstantInitialized);
-
-  inline SystemStateUpdate(const SystemStateUpdate& from)
-      : SystemStateUpdate(nullptr, from) {}
-  SystemStateUpdate(SystemStateUpdate&& from) noexcept
-    : SystemStateUpdate() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR SystemStateUpdate(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline SystemStateUpdate(const SystemStateUpdate& from) : SystemStateUpdate(nullptr, from) {}
+  inline SystemStateUpdate(SystemStateUpdate&& from) noexcept
+      : SystemStateUpdate(nullptr, std::move(from)) {}
   inline SystemStateUpdate& operator=(const SystemStateUpdate& from) {
     CopyFrom(from);
     return *this;
@@ -580,9 +561,9 @@ class SystemStateUpdate final :
   inline SystemStateUpdate& operator=(SystemStateUpdate&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -614,22 +595,17 @@ class SystemStateUpdate final :
   }
   static inline const SystemStateUpdate* internal_default_instance() {
     return reinterpret_cast<const SystemStateUpdate*>(
-               &_SystemStateUpdate_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(SystemStateUpdate& a, SystemStateUpdate& b) {
-    a.Swap(&b);
+        &_SystemStateUpdate_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 0;
+  friend void swap(SystemStateUpdate& a, SystemStateUpdate& b) { a.Swap(&b); }
   inline void Swap(SystemStateUpdate* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -644,16 +620,18 @@ class SystemStateUpdate final :
   // implements Message ----------------------------------------------
 
   SystemStateUpdate* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SystemStateUpdate>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<SystemStateUpdate>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const SystemStateUpdate& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SystemStateUpdate& from) {
-    SystemStateUpdate::MergeImpl(*this, from);
-  }
+  void MergeFrom(const SystemStateUpdate& from) { SystemStateUpdate::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -661,31 +639,33 @@ class SystemStateUpdate final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(SystemStateUpdate* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.data.SystemStateUpdate";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.data.SystemStateUpdate"; }
+
+ protected:
   explicit SystemStateUpdate(::google::protobuf::Arena* arena);
   SystemStateUpdate(::google::protobuf::Arena* arena, const SystemStateUpdate& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  SystemStateUpdate(::google::protobuf::Arena* arena, SystemStateUpdate&& from) noexcept
+      : SystemStateUpdate(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kSensorsFieldNumber = 2,
     kEffectorsFieldNumber = 3,
@@ -699,16 +679,15 @@ class SystemStateUpdate final :
   public:
   void clear_sensors() ;
   ::messages::data::Sensor* mutable_sensors(int index);
-  ::google::protobuf::RepeatedPtrField< ::messages::data::Sensor >*
-      mutable_sensors();
+  ::google::protobuf::RepeatedPtrField<::messages::data::Sensor>* mutable_sensors();
+
   private:
   const ::google::protobuf::RepeatedPtrField<::messages::data::Sensor>& _internal_sensors() const;
   ::google::protobuf::RepeatedPtrField<::messages::data::Sensor>* _internal_mutable_sensors();
   public:
   const ::messages::data::Sensor& sensors(int index) const;
   ::messages::data::Sensor* add_sensors();
-  const ::google::protobuf::RepeatedPtrField< ::messages::data::Sensor >&
-      sensors() const;
+  const ::google::protobuf::RepeatedPtrField<::messages::data::Sensor>& sensors() const;
   // repeated .messages.data.Effector effectors = 3;
   int effectors_size() const;
   private:
@@ -717,16 +696,15 @@ class SystemStateUpdate final :
   public:
   void clear_effectors() ;
   ::messages::data::Effector* mutable_effectors(int index);
-  ::google::protobuf::RepeatedPtrField< ::messages::data::Effector >*
-      mutable_effectors();
+  ::google::protobuf::RepeatedPtrField<::messages::data::Effector>* mutable_effectors();
+
   private:
   const ::google::protobuf::RepeatedPtrField<::messages::data::Effector>& _internal_effectors() const;
   ::google::protobuf::RepeatedPtrField<::messages::data::Effector>* _internal_mutable_effectors();
   public:
   const ::messages::data::Effector& effectors(int index) const;
   ::messages::data::Effector* add_effectors();
-  const ::google::protobuf::RepeatedPtrField< ::messages::data::Effector >&
-      effectors() const;
+  const ::google::protobuf::RepeatedPtrField<::messages::data::Effector>& effectors() const;
   // .messages.track.Identifier OwnID = 1;
   bool has_ownid() const;
   void clear_ownid() ;
@@ -745,7 +723,6 @@ class SystemStateUpdate final :
   // @@protoc_insertion_point(class_scope:messages.data.SystemStateUpdate)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       2, 3, 3,
@@ -758,13 +735,12 @@ class SystemStateUpdate final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::RepeatedPtrField< ::messages::data::Sensor > sensors_;
@@ -850,14 +826,14 @@ inline ::messages::track::Identifier* SystemStateUpdate::unsafe_arena_release_ow
 }
 inline ::messages::track::Identifier* SystemStateUpdate::_internal_mutable_ownid() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.ownid_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::Identifier>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::Identifier>(GetArena());
     _impl_.ownid_ = reinterpret_cast<::messages::track::Identifier*>(p);
   }
   return _impl_.ownid_;
 }
 inline ::messages::track::Identifier* SystemStateUpdate::mutable_ownid() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000001u;
   ::messages::track::Identifier* _msg = _internal_mutable_ownid();
   // @@protoc_insertion_point(field_mutable:messages.data.SystemStateUpdate.OwnID)
   return _msg;
@@ -1043,14 +1019,14 @@ inline ::messages::track::Identifier* Sensor::unsafe_arena_release_id() {
 }
 inline ::messages::track::Identifier* Sensor::_internal_mutable_id() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::Identifier>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::Identifier>(GetArena());
     _impl_.id_ = reinterpret_cast<::messages::track::Identifier*>(p);
   }
   return _impl_.id_;
 }
 inline ::messages::track::Identifier* Sensor::mutable_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000001u;
   ::messages::track::Identifier* _msg = _internal_mutable_id();
   // @@protoc_insertion_point(field_mutable:messages.data.Sensor.ID)
   return _msg;
@@ -1090,7 +1066,6 @@ template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void Sensor::set_name(Arg_&& arg,
                                                      Args_... args) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.data.Sensor.name)
 }
@@ -1105,12 +1080,10 @@ inline const std::string& Sensor::_internal_name() const {
 }
 inline void Sensor::_internal_set_name(const std::string& value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.name_.Set(value, GetArena());
 }
 inline std::string* Sensor::_internal_mutable_name() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   return _impl_.name_.Mutable( GetArena());
 }
 inline std::string* Sensor::release_name() {
@@ -1148,7 +1121,6 @@ inline double Sensor::_internal_range() const {
 }
 inline void Sensor::_internal_set_range(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.range_ = value;
 }
 
@@ -1171,7 +1143,6 @@ inline ::uint32_t Sensor::_internal_kind() const {
 }
 inline void Sensor::_internal_set_kind(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.kind_ = value;
 }
 
@@ -1194,7 +1165,6 @@ inline ::uint32_t Sensor::_internal_status() const {
 }
 inline void Sensor::_internal_set_status(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.status_ = value;
 }
 
@@ -1260,14 +1230,14 @@ inline ::messages::track::Identifier* Effector::unsafe_arena_release_id() {
 }
 inline ::messages::track::Identifier* Effector::_internal_mutable_id() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::Identifier>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::Identifier>(GetArena());
     _impl_.id_ = reinterpret_cast<::messages::track::Identifier*>(p);
   }
   return _impl_.id_;
 }
 inline ::messages::track::Identifier* Effector::mutable_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000001u;
   ::messages::track::Identifier* _msg = _internal_mutable_id();
   // @@protoc_insertion_point(field_mutable:messages.data.Effector.ID)
   return _msg;
@@ -1307,7 +1277,6 @@ template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void Effector::set_name(Arg_&& arg,
                                                      Args_... args) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.data.Effector.name)
 }
@@ -1322,12 +1291,10 @@ inline const std::string& Effector::_internal_name() const {
 }
 inline void Effector::_internal_set_name(const std::string& value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.name_.Set(value, GetArena());
 }
 inline std::string* Effector::_internal_mutable_name() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   return _impl_.name_.Mutable( GetArena());
 }
 inline std::string* Effector::release_name() {
@@ -1365,7 +1332,6 @@ inline double Effector::_internal_range() const {
 }
 inline void Effector::_internal_set_range(double value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.range_ = value;
 }
 
@@ -1388,7 +1354,6 @@ inline ::int32_t Effector::_internal_ammunition() const {
 }
 inline void Effector::_internal_set_ammunition(::int32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.ammunition_ = value;
 }
 
@@ -1411,7 +1376,6 @@ inline ::int32_t Effector::_internal_maxammunition() const {
 }
 inline void Effector::_internal_set_maxammunition(::int32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.maxammunition_ = value;
 }
 
@@ -1434,7 +1398,6 @@ inline ::uint32_t Effector::_internal_status() const {
 }
 inline void Effector::_internal_set_status(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.status_ = value;
 }
 
diff --git a/include/SimCore/Messages/Protos/TracklistUpdate.pb.cc b/include/SimCore/Messages/Protos/TracklistUpdate.pb.cc
index ea7ab35..5e0ca28 100644
--- a/include/SimCore/Messages/Protos/TracklistUpdate.pb.cc
+++ b/include/SimCore/Messages/Protos/TracklistUpdate.pb.cc
@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: TracklistUpdate.proto
+// Protobuf C++ Version: 4.26.0-dev
 
 #include "TracklistUpdate.pb.h"
 
@@ -130,9 +131,6 @@ const ::_pbi::DescriptorTable descriptor_table_TracklistUpdate_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_TracklistUpdate_2eproto_getter() {
   return &descriptor_table_TracklistUpdate_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_TracklistUpdate_2eproto(&descriptor_table_TracklistUpdate_2eproto);
 namespace messages {
 namespace data {
 // ===================================================================
@@ -142,22 +140,8 @@ class TracklistUpdate::_Internal {
   using HasBits = decltype(std::declval<TracklistUpdate>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(TracklistUpdate, _impl_._has_bits_);
-  static const ::messages::track::Identifier& ownid(const TracklistUpdate* msg);
-  static void set_has_ownid(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::google::protobuf::Timestamp& timestamp(const TracklistUpdate* msg);
-  static void set_has_timestamp(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
 };
 
-const ::messages::track::Identifier& TracklistUpdate::_Internal::ownid(const TracklistUpdate* msg) {
-  return *msg->_impl_.ownid_;
-}
-const ::google::protobuf::Timestamp& TracklistUpdate::_Internal::timestamp(const TracklistUpdate* msg) {
-  return *msg->_impl_.timestamp_;
-}
 void TracklistUpdate::clear_ownid() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.ownid_ != nullptr) _impl_.ownid_->Clear();
@@ -194,12 +178,12 @@ TracklistUpdate::TracklistUpdate(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.ownid_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::messages::track::Identifier>(arena, *from._impl_.ownid_)
-                : nullptr;
-  _impl_.timestamp_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::google::protobuf::Timestamp>(arena, *from._impl_.timestamp_)
-                : nullptr;
+  _impl_.ownid_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(
+                              arena, *from._impl_.ownid_)
+                        : nullptr;
+  _impl_.timestamp_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::google::protobuf::Timestamp>(
+                              arena, *from._impl_.timestamp_)
+                        : nullptr;
   _impl_.trackscount_ = from._impl_.trackscount_;
 
   // @@protoc_insertion_point(copy_constructor:messages.data.TracklistUpdate)
@@ -233,12 +217,15 @@ inline void TracklistUpdate::SharedDtor() {
 
 const ::google::protobuf::MessageLite::ClassData*
 TracklistUpdate::GetClassData() const {
-  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
-      _data_ = {
-          TracklistUpdate::MergeImpl,
-           nullptr,  // OnDemandRegisterArenaDtor
-           &::google::protobuf::Message::kDescriptorMethods,
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
               PROTOBUF_FIELD_OFFSET(TracklistUpdate, _impl_._cached_size_),
+              false,
+          },
+          &TracklistUpdate::MergeImpl,
+          &TracklistUpdate::kDescriptorMethods,
       };
   return &_data_;
 }
@@ -287,6 +274,9 @@ const ::_pbi::TcParseTable<2, 4, 3, 0, 2> TracklistUpdate::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_TracklistUpdate_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::messages::data::TracklistUpdate>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // repeated .messages.SimTrack.SimTrack tracks = 4;
     {::_pbi::TcParser::FastMtR1,
@@ -334,15 +324,13 @@ const ::_pbi::TcParseTable<2, 4, 3, 0, 2> TracklistUpdate::_table_ = {
   // .messages.track.Identifier OwnID = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::ownid(this),
-        _Internal::ownid(this).GetCachedSize(), target, stream);
+        1, *_impl_.ownid_, _impl_.ownid_->GetCachedSize(), target, stream);
   }
 
   // .google.protobuf.Timestamp timestamp = 2;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::timestamp(this),
-        _Internal::timestamp(this).GetCachedSize(), target, stream);
+        2, *_impl_.timestamp_, _impl_.timestamp_->GetCachedSize(), target, stream);
   }
 
   // uint32 TracksCount = 3;
@@ -408,9 +396,10 @@ const ::_pbi::TcParseTable<2, 4, 3, 0, 2> TracklistUpdate::_table_ = {
 }
 
 
-void TracklistUpdate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void TracklistUpdate::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<TracklistUpdate*>(&to_msg);
   auto& from = static_cast<const TracklistUpdate&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.data.TracklistUpdate)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -421,17 +410,28 @@ void TracklistUpdate::MergeImpl(::google::protobuf::Message& to_msg, const ::goo
   cached_has_bits = from._impl_._has_bits_[0];
   if (cached_has_bits & 0x00000003u) {
     if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_ownid()->::messages::track::Identifier::MergeFrom(
-          from._internal_ownid());
+      ABSL_DCHECK(from._impl_.ownid_ != nullptr);
+      if (_this->_impl_.ownid_ == nullptr) {
+        _this->_impl_.ownid_ =
+            ::google::protobuf::Message::CopyConstruct<::messages::track::Identifier>(arena, *from._impl_.ownid_);
+      } else {
+        _this->_impl_.ownid_->MergeFrom(*from._impl_.ownid_);
+      }
     }
     if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_timestamp()->::google::protobuf::Timestamp::MergeFrom(
-          from._internal_timestamp());
+      ABSL_DCHECK(from._impl_.timestamp_ != nullptr);
+      if (_this->_impl_.timestamp_ == nullptr) {
+        _this->_impl_.timestamp_ =
+            ::google::protobuf::Message::CopyConstruct<::google::protobuf::Timestamp>(arena, *from._impl_.timestamp_);
+      } else {
+        _this->_impl_.timestamp_->MergeFrom(*from._impl_.timestamp_);
+      }
     }
   }
   if (from._internal_trackscount() != 0) {
-    _this->_internal_set_trackscount(from._internal_trackscount());
+    _this->_impl_.trackscount_ = from._impl_.trackscount_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -460,9 +460,9 @@ void TracklistUpdate::InternalSwap(TracklistUpdate* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata TracklistUpdate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_TracklistUpdate_2eproto_getter, &descriptor_table_TracklistUpdate_2eproto_once,
-      file_level_metadata_TracklistUpdate_2eproto[0]);
+  return ::_pbi::AssignDescriptors(&descriptor_table_TracklistUpdate_2eproto_getter,
+                                   &descriptor_table_TracklistUpdate_2eproto_once,
+                                   file_level_metadata_TracklistUpdate_2eproto[0]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace data
@@ -472,4 +472,8 @@ namespace protobuf {
 }  // namespace protobuf
 }  // namespace google
 // @@protoc_insertion_point(global_scope)
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::std::false_type _static_init_ PROTOBUF_UNUSED =
+    (::_pbi::AddDescriptors(&descriptor_table_TracklistUpdate_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"
diff --git a/include/SimCore/Messages/Protos/TracklistUpdate.pb.h b/include/SimCore/Messages/Protos/TracklistUpdate.pb.h
index 918f301..50358a4 100644
--- a/include/SimCore/Messages/Protos/TracklistUpdate.pb.h
+++ b/include/SimCore/Messages/Protos/TracklistUpdate.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: TracklistUpdate.proto
-// Protobuf C++ Version: 4.24.0-main
+// Protobuf C++ Version: 4.26.0-dev
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_TracklistUpdate_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_TracklistUpdate_2eproto_2epb_2eh
@@ -11,17 +11,11 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#if PROTOBUF_VERSION != 4026000
+#error "Protobuf C++ gencode is built with an incompatible version of"
+#error "Protobuf C++ headers/runtime. See"
+#error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp"
+#endif
 #include "google/protobuf/port_undef.inc"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/arena.h"
@@ -78,21 +72,18 @@ namespace data {
 
 // -------------------------------------------------------------------
 
-class TracklistUpdate final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.data.TracklistUpdate) */ {
+class TracklistUpdate final : public ::google::protobuf::Message
+/* @@protoc_insertion_point(class_definition:messages.data.TracklistUpdate) */ {
  public:
   inline TracklistUpdate() : TracklistUpdate(nullptr) {}
   ~TracklistUpdate() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TracklistUpdate(::google::protobuf::internal::ConstantInitialized);
-
-  inline TracklistUpdate(const TracklistUpdate& from)
-      : TracklistUpdate(nullptr, from) {}
-  TracklistUpdate(TracklistUpdate&& from) noexcept
-    : TracklistUpdate() {
-    *this = ::std::move(from);
-  }
+  template <typename = void>
+  explicit PROTOBUF_CONSTEXPR TracklistUpdate(
+      ::google::protobuf::internal::ConstantInitialized);
 
+  inline TracklistUpdate(const TracklistUpdate& from) : TracklistUpdate(nullptr, from) {}
+  inline TracklistUpdate(TracklistUpdate&& from) noexcept
+      : TracklistUpdate(nullptr, std::move(from)) {}
   inline TracklistUpdate& operator=(const TracklistUpdate& from) {
     CopyFrom(from);
     return *this;
@@ -100,9 +91,9 @@ class TracklistUpdate final :
   inline TracklistUpdate& operator=(TracklistUpdate&& from) noexcept {
     if (this == &from) return *this;
     if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
+#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
         && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
+#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
     } else {
@@ -134,22 +125,17 @@ class TracklistUpdate final :
   }
   static inline const TracklistUpdate* internal_default_instance() {
     return reinterpret_cast<const TracklistUpdate*>(
-               &_TracklistUpdate_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(TracklistUpdate& a, TracklistUpdate& b) {
-    a.Swap(&b);
+        &_TracklistUpdate_default_instance_);
   }
+  static constexpr int kIndexInFileMessages = 0;
+  friend void swap(TracklistUpdate& a, TracklistUpdate& b) { a.Swap(&b); }
   inline void Swap(TracklistUpdate* other) {
     if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
+#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
+    if (GetArena() != nullptr && GetArena() == other->GetArena()) {
+#else   // PROTOBUF_FORCE_COPY_IN_SWAP
     if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
+#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
       ::google::protobuf::internal::GenericSwap(this, other);
@@ -164,16 +150,18 @@ class TracklistUpdate final :
   // implements Message ----------------------------------------------
 
   TracklistUpdate* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TracklistUpdate>(arena);
+    return ::google::protobuf::Message::DefaultConstruct<TracklistUpdate>(arena);
   }
   using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const TracklistUpdate& from);
   using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TracklistUpdate& from) {
-    TracklistUpdate::MergeImpl(*this, from);
-  }
+  void MergeFrom(const TracklistUpdate& from) { TracklistUpdate::MergeImpl(*this, from); }
+
   private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
+  static void MergeImpl(
+      ::google::protobuf::MessageLite& to_msg,
+      const ::google::protobuf::MessageLite& from_msg);
+
   public:
   ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
@@ -181,31 +169,33 @@ class TracklistUpdate final :
   ::size_t ByteSizeLong() const final;
   const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
   ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+      ::uint8_t* target,
+      ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
   int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
   void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
   void InternalSwap(TracklistUpdate* other);
-
-  private:
+ private:
   friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "messages.data.TracklistUpdate";
-  }
-  protected:
+  static ::absl::string_view FullMessageName() { return "messages.data.TracklistUpdate"; }
+
+ protected:
   explicit TracklistUpdate(::google::protobuf::Arena* arena);
   TracklistUpdate(::google::protobuf::Arena* arena, const TracklistUpdate& from);
-  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
-  public:
+  TracklistUpdate(::google::protobuf::Arena* arena, TracklistUpdate&& from) noexcept
+      : TracklistUpdate(arena) {
+    *this = ::std::move(from);
+  }
+  const ::google::protobuf::MessageLite::ClassData* GetClassData()
+      const final;
 
+ public:
   ::google::protobuf::Metadata GetMetadata() const final;
-
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
-
   enum : int {
     kTracksFieldNumber = 4,
     kOwnIDFieldNumber = 1,
@@ -220,16 +210,15 @@ class TracklistUpdate final :
   public:
   void clear_tracks() ;
   ::messages::SimTrack::SimTrack* mutable_tracks(int index);
-  ::google::protobuf::RepeatedPtrField< ::messages::SimTrack::SimTrack >*
-      mutable_tracks();
+  ::google::protobuf::RepeatedPtrField<::messages::SimTrack::SimTrack>* mutable_tracks();
+
   private:
   const ::google::protobuf::RepeatedPtrField<::messages::SimTrack::SimTrack>& _internal_tracks() const;
   ::google::protobuf::RepeatedPtrField<::messages::SimTrack::SimTrack>* _internal_mutable_tracks();
   public:
   const ::messages::SimTrack::SimTrack& tracks(int index) const;
   ::messages::SimTrack::SimTrack* add_tracks();
-  const ::google::protobuf::RepeatedPtrField< ::messages::SimTrack::SimTrack >&
-      tracks() const;
+  const ::google::protobuf::RepeatedPtrField<::messages::SimTrack::SimTrack>& tracks() const;
   // .messages.track.Identifier OwnID = 1;
   bool has_ownid() const;
   void clear_ownid() ;
@@ -273,7 +262,6 @@ class TracklistUpdate final :
   // @@protoc_insertion_point(class_scope:messages.data.TracklistUpdate)
  private:
   class _Internal;
-
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
       2, 4, 3,
@@ -286,13 +274,12 @@ class TracklistUpdate final :
   using InternalArenaConstructable_ = void;
   using DestructorSkippable_ = void;
   struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
+    inline explicit constexpr Impl_(
+        ::google::protobuf::internal::ConstantInitialized) noexcept;
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena);
+    inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                          ::google::protobuf::Arena* arena, const Impl_& from);
     ::google::protobuf::internal::HasBits<1> _has_bits_;
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::google::protobuf::RepeatedPtrField< ::messages::SimTrack::SimTrack > tracks_;
@@ -379,14 +366,14 @@ inline ::messages::track::Identifier* TracklistUpdate::unsafe_arena_release_owni
 }
 inline ::messages::track::Identifier* TracklistUpdate::_internal_mutable_ownid() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.ownid_ == nullptr) {
-    auto* p = CreateMaybeMessage<::messages::track::Identifier>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::messages::track::Identifier>(GetArena());
     _impl_.ownid_ = reinterpret_cast<::messages::track::Identifier*>(p);
   }
   return _impl_.ownid_;
 }
 inline ::messages::track::Identifier* TracklistUpdate::mutable_ownid() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000001u;
   ::messages::track::Identifier* _msg = _internal_mutable_ownid();
   // @@protoc_insertion_point(field_mutable:messages.data.TracklistUpdate.OwnID)
   return _msg;
@@ -470,14 +457,14 @@ inline ::google::protobuf::Timestamp* TracklistUpdate::unsafe_arena_release_time
 }
 inline ::google::protobuf::Timestamp* TracklistUpdate::_internal_mutable_timestamp() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.timestamp_ == nullptr) {
-    auto* p = CreateMaybeMessage<::google::protobuf::Timestamp>(GetArena());
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::Timestamp>(GetArena());
     _impl_.timestamp_ = reinterpret_cast<::google::protobuf::Timestamp*>(p);
   }
   return _impl_.timestamp_;
 }
 inline ::google::protobuf::Timestamp* TracklistUpdate::mutable_timestamp() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000002u;
   ::google::protobuf::Timestamp* _msg = _internal_mutable_timestamp();
   // @@protoc_insertion_point(field_mutable:messages.data.TracklistUpdate.timestamp)
   return _msg;
@@ -522,7 +509,6 @@ inline ::uint32_t TracklistUpdate::_internal_trackscount() const {
 }
 inline void TracklistUpdate::_internal_set_trackscount(::uint32_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
   _impl_.trackscount_ = value;
 }
 
diff --git a/libs/whisper-com b/libs/whisper-com
index f46706a..8f163b5 160000
--- a/libs/whisper-com
+++ b/libs/whisper-com
@@ -1 +1 @@
-Subproject commit f46706aec7c190713e58576ab89e6c1a2790af96
+Subproject commit 8f163b5791cd570c5feb53732f31be1cd53127d2